[kernel] refresh 2.6.33 patches for 2.6.33.2

git-svn-id: svn://svn.openwrt.org/openwrt/trunk@20803 3c298f89-4303-0410-b956-a3cf2f4a3e73

target/linux/generic-2.6/patches-2.6.33/007-squashfs_make_lzma_available.patch

@@ -65,7 +65,7 @@ Signed-off-by: Phillip Lougher <phillip@lougher.demon.co.uk>
 +#endif
 --- a/include/linux/decompress/mm.h
 +++ b/include/linux/decompress/mm.h
-@@ -53,8 +53,6 @@ static void free(void *where)
+@@ -63,8 +63,6 @@ static void free(void *where)
  
  #define set_error_fn(x)
  
@@ -74,7 +74,7 @@ Signed-off-by: Phillip Lougher <phillip@lougher.demon.co.uk>
  #else /* STATIC */
  
  /* Code active when compiled standalone for use when loading ramdisk: */
-@@ -77,7 +75,6 @@ static void free(void *where)
+@@ -87,7 +85,6 @@ static void free(void *where)
  static void(*error)(char *m);
  #define set_error_fn(x) error = x;
  

target/linux/generic-2.6/patches-2.6.33/030-pci_disable_common_quirks.patch

@@ -33,8 +33,8 @@
  /* Enable 1k I/O space granularity on the Intel P64H2 */
  static void __devinit quirk_p64h2_1k_io(struct pci_dev *dev)
  {
-@@ -2536,6 +2539,7 @@ DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_I
+@@ -2537,6 +2540,7 @@ DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_I
- DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_INTEL, 0x150d, quirk_i82576_sriov);
+ DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_INTEL, 0x1518, quirk_i82576_sriov);
  
  #endif	/* CONFIG_PCI_IOV */
 +#endif /* !CONFIG_PCI_DISABLE_COMMON_QUIRKS */

target/linux/generic-2.6/patches-2.6.33/110-netfilter_match_speedup.patch

@@ -127,10 +127,11 @@
  
  		e = (struct ipt_entry *)(loc_cpu_entry + off);
  		if (copy_to_user(userptr + off
-@@ -1002,6 +1042,14 @@ copy_entries_to_user(unsigned int total_
+@@ -1001,6 +1041,14 @@ copy_entries_to_user(unsigned int total_
+ 			ret = -EFAULT;
  			goto free_counters;
  		}
- 
++
 +		flags = e->ip.flags & ~IPT_F_NO_DEF_MATCH;
 +		if (copy_to_user(userptr + off
 +				 + offsetof(struct ipt_entry, ip.flags),
@@ -138,7 +139,6 @@
 +			ret = -EFAULT;
 +			goto free_counters;
 +		}
-+
+ 
  		for (i = sizeof(struct ipt_entry);
  		     i < e->target_offset;
- 		     i += m->u.match_size) {

target/linux/generic-2.6/patches-2.6.33/150-netfilter_imq.patch

@@ -851,8 +851,8 @@
  
  /* Don't change this without changing skb_csum_unnecessary! */
  #define CHECKSUM_NONE 0
-@@ -320,6 +323,10 @@ struct sk_buff {
+@@ -323,6 +326,10 @@ struct sk_buff {
- 	struct net_device	*dev;
+ 	char			cb[48] __aligned(8);
  
  	unsigned long		_skb_dst;
 +#if defined(CONFIG_IMQ) || defined(CONFIG_IMQ_MODULE)
@@ -862,7 +862,7 @@
  #ifdef CONFIG_XFRM
  	struct	sec_path	*sp;
  #endif
-@@ -362,6 +369,9 @@ struct sk_buff {
+@@ -357,6 +364,9 @@ struct sk_buff {
  	struct nf_conntrack	*nfct;
  	struct sk_buff		*nfct_reasm;
  #endif
@@ -872,7 +872,7 @@
  #ifdef CONFIG_BRIDGE_NETFILTER
  	struct nf_bridge_info	*nf_bridge;
  #endif
-@@ -383,6 +393,10 @@ struct sk_buff {
+@@ -378,6 +388,10 @@ struct sk_buff {
  
  	/* 0/14 bit hole */
  
@@ -883,7 +883,7 @@
  #ifdef CONFIG_NET_DMA
  	dma_cookie_t		dma_cookie;
  #endif
-@@ -431,6 +445,12 @@ static inline struct rtable *skb_rtable(
+@@ -426,6 +440,12 @@ static inline struct rtable *skb_rtable(
  	return (struct rtable *)skb_dst(skb);
  }
  
@@ -896,7 +896,7 @@
  extern void kfree_skb(struct sk_buff *skb);
  extern void consume_skb(struct sk_buff *skb);
  extern void	       __kfree_skb(struct sk_buff *skb);
-@@ -1975,6 +1995,10 @@ static inline void __nf_copy(struct sk_b
+@@ -1970,6 +1990,10 @@ static inline void __nf_copy(struct sk_b
  	dst->nfct_reasm = src->nfct_reasm;
  	nf_conntrack_get_reasm(src->nfct_reasm);
  #endif

target/linux/generic-2.6/patches-2.6.33/205-skb_padding.patch

@@ -1,6 +1,6 @@
 --- a/include/linux/skbuff.h
 +++ b/include/linux/skbuff.h
-@@ -1378,11 +1378,18 @@ static inline int skb_network_offset(con
+@@ -1373,11 +1373,18 @@ static inline int skb_network_offset(con
   *
   * Various parts of the networking layer expect at least 32 bytes of
   * headroom, you should not reduce this.
@@ -19,7 +19,7 @@
  extern int ___pskb_trim(struct sk_buff *skb, unsigned int len);
  
  static inline void __skb_trim(struct sk_buff *skb, unsigned int len)
-@@ -1472,9 +1479,9 @@ static inline void __skb_queue_purge(str
+@@ -1467,9 +1474,9 @@ static inline void __skb_queue_purge(str
  static inline struct sk_buff *__dev_alloc_skb(unsigned int length,
  					      gfp_t gfp_mask)
  {
@@ -31,7 +31,7 @@
  	return skb;
  }
  
-@@ -1557,7 +1564,7 @@ static inline int __skb_cow(struct sk_bu
+@@ -1552,7 +1559,7 @@ static inline int __skb_cow(struct sk_bu
  		delta = headroom - skb_headroom(skb);
  
  	if (delta || cloned)

target/linux/generic-2.6/patches-2.6.33/511-yaffs-cvs-2009-04-24.patch

@@ -11038,14 +11038,14 @@
 +			yaffs_UnpackTags2(tags, &pt);
 +		}
 +	}
- 
++
--	if(tags && retval == -EBADMSG && tags->eccResult == YAFFS_ECC_RESULT_NO_ERROR)
--		tags->eccResult = YAFFS_ECC_RESULT_UNFIXED;
 +	if (localData)
 +		yaffs_ReleaseTempBuffer(dev, data, __LINE__);
  
+-	if(tags && retval == -EBADMSG && tags->eccResult == YAFFS_ECC_RESULT_NO_ERROR)
 +	if (tags && retval == -EBADMSG && tags->eccResult == YAFFS_ECC_RESULT_NO_ERROR)
-+		tags->eccResult = YAFFS_ECC_RESULT_UNFIXED;
+ 		tags->eccResult = YAFFS_ECC_RESULT_UNFIXED;
+-
  	if (retval == 0)
  		return YAFFS_OK;
  	else

target/linux/generic-2.6/patches-2.6.33/940-wireless_mesh_header.patch

@@ -3,7 +3,7 @@
 @@ -137,7 +137,7 @@ static inline bool dev_xmit_complete(int
   */
  
- #if defined(CONFIG_WLAN_80211) || defined(CONFIG_AX25) || defined(CONFIG_AX25_MODULE)
+ #if defined(CONFIG_WLAN) || defined(CONFIG_AX25) || defined(CONFIG_AX25_MODULE)
 -# if defined(CONFIG_MAC80211_MESH)
 +# if 1 || defined(CONFIG_MAC80211_MESH)
  #  define LL_MAX_HEADER 128

target/linux/generic-2.6/patches-2.6.33/980-vm_exports.patch

@@ -76,7 +76,7 @@
   * macro override instead of weak attribute alias, to workaround
 --- a/kernel/sched.c
 +++ b/kernel/sched.c
-@@ -6149,6 +6149,7 @@ int can_nice(const struct task_struct *p
+@@ -6171,6 +6171,7 @@ int can_nice(const struct task_struct *p
  	return (nice_rlim <= p->signal->rlim[RLIMIT_NICE].rlim_cur ||
  		capable(CAP_SYS_NICE));
  }