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

[openwrt/svn-archive/archive.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..8441e41cf81d283d89d9fb8d64665807ac807986 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
@@ -945,7 +945,7 @@
  #include <linux/proc_fs.h>
  #include <linux/seq_file.h>
  #include <linux/stat.h>
-@@ -1859,7 +1862,11 @@ int dev_hard_start_xmit(struct sk_buff *
+@@ -1860,7 +1863,11 @@ int dev_hard_start_xmit(struct sk_buff *
        int rc = NETDEV_TX_OK;
  
        if (likely(!skb->next)) {
@@ -958,7 +958,7 @@
                        dev_queue_xmit_nit(skb, dev);
  
                if (netif_needs_gso(dev, skb)) {
-@@ -1969,8 +1976,7 @@ static inline u16 dev_cap_txqueue(struct
+@@ -1970,8 +1977,7 @@ static inline u16 dev_cap_txqueue(struct
        return queue_index;
  }
  
@@ -966,7 +966,7 @@
 -                                      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(
        skb_set_queue_mapping(skb, 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);