diff options
author | Hauke Mehrtens <hauke@openwrt.org> | 2010-08-22 13:26:06 +0000 |
---|---|---|
committer | Hauke Mehrtens <hauke@openwrt.org> | 2010-08-22 13:26:06 +0000 |
commit | 3de7c99eb33717fe6fb84b07b4fed6ec1d341b06 (patch) | |
tree | 108605e2f6ff4e21846d0f69ade88ebb76a890a3 /target/linux/generic/patches-2.6.34/150-netfilter_imq.patch | |
parent | e78e58e4de3a93d64dc04c4cb062a99009c11a22 (diff) | |
download | upstream-3de7c99eb33717fe6fb84b07b4fed6ec1d341b06.tar.gz upstream-3de7c99eb33717fe6fb84b07b4fed6ec1d341b06.tar.bz2 upstream-3de7c99eb33717fe6fb84b07b4fed6ec1d341b06.zip |
kernel: update kernel version to 2.6.34.5
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@22759 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 | 8 |
1 files changed, 4 insertions, 4 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 d595346874..a1fe82c8ef 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 @@ -966,9 +966,9 @@ - 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( +@@ -1999,6 +2005,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; -@@ -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); @@ -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) -@@ -81,7 +101,7 @@ void nf_unregister_queue_handlers(const +@@ -81,7 +101,7 @@ void nf_unregister_queue_handlers(const } EXPORT_SYMBOL_GPL(nf_unregister_queue_handlers); |