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 6d324d4aab9a4d061e8a85d04efbe3f9febee13d..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>
  #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)) {
        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)) {
                        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;
  }
  
        return queue_index;
  }
  


@@ -968,7 +968,7 @@
  {
        int queue_index;
        struct sock *sk = skb->sk;
  {
        int queue_index;
        struct sock *sk = skb->sk;

-@@ -1999,6 +2005,7 @@ static struct netdev_queue *dev_pick_tx(
+@@ -2000,6 +2006,7 @@ static struct netdev_queue *dev_pick_tx(

        skb_set_queue_mapping(skb, queue_index);
        return netdev_get_tx_queue(dev, queue_index);
  }
        skb_set_queue_mapping(skb, queue_index);
        return netdev_get_tx_queue(dev, queue_index);
  }