diff options
| author | hauke <hauke@3c298f89-4303-0410-b956-a3cf2f4a3e73> | 2010-12-22 17:18:11 +0000 |
|---|---|---|
| committer | hauke <hauke@3c298f89-4303-0410-b956-a3cf2f4a3e73> | 2010-12-22 17:18:11 +0000 |
| commit | 70befa402080c2228c8e575744a38b860d6977fc (patch) | |
| tree | 6aae171717a6640c2046914fa8900d32141d9df1 /target/linux/generic/patches-2.6.34/150-netfilter_imq.patch | |
| parent | 81ec835fad3c705b739380fcbb1f5f29b3166254 (diff) | |
kernel: use tab in front of ledtrig-netdev.o and refresh kernel
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@24798 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'target/linux/generic/patches-2.6.34/150-netfilter_imq.patch')
| -rw-r--r-- | target/linux/generic/patches-2.6.34/150-netfilter_imq.patch | 6 |
1 files changed, 3 insertions, 3 deletions
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 6d324d4aa..8441e41cf 100644 --- 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; } @@ -968,7 +968,7 @@ { 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); } |