[kernel] update to 2.6.32.29

[openwrt/svn-archive/archive.git] / target / linux / generic / patches-2.6.32 / 150-netfilter_imq.patch

diff --git a/target/linux/generic/patches-2.6.32/150-netfilter_imq.patch b/target/linux/generic/patches-2.6.32/150-netfilter_imq.patch
index 8a6cf3e8211a22a2017733ba3d16485af05ccfe2..3b46e25662f6557cf01189f70d38be260bd3a3dd 100644 (file)
--- a/target/linux/generic/patches-2.6.32/150-netfilter_imq.patch
+++ b/target/linux/generic/patches-2.6.32/150-netfilter_imq.patch
@@ -958,7 +958,7 @@
                        dev_queue_xmit_nit(skb, dev);
  
                if (netif_needs_gso(dev, skb)) {
-@@ -1789,8 +1796,7 @@ u16 skb_tx_hash(const struct net_device
+@@ -1797,8 +1804,7 @@ u16 skb_tx_hash(const struct net_device
  }
  EXPORT_SYMBOL(skb_tx_hash);
  
@@ -968,7 +968,7 @@
  {
        const struct net_device_ops *ops = dev->netdev_ops;
        u16 queue_index = 0;
-@@ -1803,6 +1809,7 @@ static struct netdev_queue *dev_pick_tx(
+@@ -1811,6 +1817,7 @@ static struct netdev_queue *dev_pick_tx(
        skb_set_queue_mapping(skb, queue_index);
        return netdev_get_tx_queue(dev, queue_index);
  }