linux/generic: add kernel 2.6.36 preliminary support

[oweals/openwrt.git] / target / linux / generic / patches-2.6.34 / 150-netfilter_imq.patch

diff --git a/target/linux/generic/patches-2.6.34/150-netfilter_imq.patch b/target/linux/generic/patches-2.6.34/150-netfilter_imq.patch
index d59534687443e996be171bf740fe854d3ebe1b42..6d324d4aab9a4d061e8a85d04efbe3f9febee13d 100644 (file)
--- a/target/linux/generic/patches-2.6.34/150-netfilter_imq.patch
+++ b/target/linux/generic/patches-2.6.34/150-netfilter_imq.patch
@@ -966,9 +966,9 @@
 -                                      struct sk_buff *skb)
 +struct netdev_queue *dev_pick_tx(struct net_device *dev, struct sk_buff *skb)
  {
-       u16 queue_index;
+       int queue_index;
        struct sock *sk = skb->sk;
-@@ -2000,6 +2006,7 @@ static struct netdev_queue *dev_pick_tx(
+@@ -1999,6 +2005,7 @@ static struct netdev_queue *dev_pick_tx(
        skb_set_queue_mapping(skb, queue_index);
        return netdev_get_tx_queue(dev, queue_index);
  }
@@ -1109,7 +1109,7 @@
        new->csum               = old->csum;
        new->local_df           = old->local_df;
        new->pkt_type           = old->pkt_type;
-@@ -2779,6 +2882,13 @@ void __init skb_init(void)
+@@ -2780,6 +2883,13 @@ void __init skb_init(void)
                                                0,
                                                SLAB_HWCACHE_ALIGN|SLAB_PANIC,
                                                NULL);