qos-scripts: drop the use of IMQ, use ifb and act_connmark instead

[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 9540ce0dde630abc2ef22ba15ad391e3fee2965a..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);
  }
@@ -1109,7 +1109,7 @@
        new->csum               = old->csum;
        new->local_df           = old->local_df;
        new->pkt_type           = old->pkt_type;
-@@ -2776,6 +2879,13 @@ void __init skb_init(void)
+@@ -2781,6 +2884,13 @@ void __init skb_init(void)
                                                0,
                                                SLAB_HWCACHE_ALIGN|SLAB_PANIC,
                                                NULL);
@@ -1183,7 +1183,7 @@
  /* return EBUSY when somebody else is registered, return EEXIST if the
   * same handler is registered, return 0 in case of success. */
  int nf_register_queue_handler(u_int8_t pf, const struct nf_queue_handler *qh)
-@@ -80,7 +100,7 @@ void nf_unregister_queue_handlers(const 
+@@ -80,7 +100,7 @@ void nf_unregister_queue_handlers(const
  }
  EXPORT_SYMBOL_GPL(nf_unregister_queue_handlers);