kernel: refresh patches for 2.6.33.2, and drop md5sum for older 2.6.32 kernels

[openwrt/openwrt.git] / target / linux / generic-2.6 / patches-2.6.33 / 150-netfilter_imq.patch

diff --git a/target/linux/generic-2.6/patches-2.6.33/150-netfilter_imq.patch b/target/linux/generic-2.6/patches-2.6.33/150-netfilter_imq.patch
index 510ce704254db1436f4439b98188fb2ee410bdc4..c078e37e614898f85631adf80f62746c10b3ba64 100644 (file)
--- a/target/linux/generic-2.6/patches-2.6.33/150-netfilter_imq.patch
+++ b/target/linux/generic-2.6/patches-2.6.33/150-netfilter_imq.patch
@@ -851,17 +851,18 @@
  
  /* Don't change this without changing skb_csum_unnecessary! */
  #define CHECKSUM_NONE 0
-@@ -327,6 +330,9 @@
-        * first. This is owned by whoever has the skb queued ATM.
-        */
+@@ -323,6 +326,10 @@ struct sk_buff {
        char                    cb[48] __aligned(8);
-+#if defined(CONFIG_IMQ) || defined(CONFIG_IMQ_MODULE)
-+      void                    *cb_next;
-+#endif
  
        unsigned long           _skb_dst;
++#if defined(CONFIG_IMQ) || defined(CONFIG_IMQ_MODULE)
++      void                    *cb_next;
++#endif
++
  #ifdef CONFIG_XFRM
-@@ -363,6 +369,9 @@
+       struct  sec_path        *sp;
+ #endif
+@@ -357,6 +364,9 @@ struct sk_buff {
        struct nf_conntrack     *nfct;
        struct sk_buff          *nfct_reasm;
  #endif
@@ -871,7 +872,7 @@
  #ifdef CONFIG_BRIDGE_NETFILTER
        struct nf_bridge_info   *nf_bridge;
  #endif
-@@ -384,6 +393,10 @@
+@@ -378,6 +388,10 @@ struct sk_buff {
  
        /* 0/14 bit hole */
  
@@ -882,7 +883,7 @@
  #ifdef CONFIG_NET_DMA
        dma_cookie_t            dma_cookie;
  #endif
-@@ -432,6 +445,12 @@
+@@ -426,6 +440,12 @@ static inline struct rtable *skb_rtable(
        return (struct rtable *)skb_dst(skb);
  }
  
@@ -895,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);
-@@ -1976,6 +1995,10 @@
+@@ -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