diff options
author | florian <florian@3c298f89-4303-0410-b956-a3cf2f4a3e73> | 2010-08-22 17:08:07 +0000 |
---|---|---|
committer | florian <florian@3c298f89-4303-0410-b956-a3cf2f4a3e73> | 2010-08-22 17:08:07 +0000 |
commit | fa7498e33f24be98526a28ce534663535bf2f745 (patch) | |
tree | 512dd7f74558597fde134ad72b114ac77db5acc8 /target/linux/generic/patches-2.6.33/150-netfilter_imq.patch | |
parent | 66eeee56c145aed1c845985ebec66e2821148c14 (diff) |
[kernel] update to 2.6.33.7
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@22767 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'target/linux/generic/patches-2.6.33/150-netfilter_imq.patch')
-rw-r--r-- | target/linux/generic/patches-2.6.33/150-netfilter_imq.patch | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/target/linux/generic/patches-2.6.33/150-netfilter_imq.patch b/target/linux/generic/patches-2.6.33/150-netfilter_imq.patch index c078e37e6..dfde980de 100644 --- a/target/linux/generic/patches-2.6.33/150-netfilter_imq.patch +++ b/target/linux/generic/patches-2.6.33/150-netfilter_imq.patch @@ -967,9 +967,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; -@@ -1939,6 +1945,7 @@ static struct netdev_queue *dev_pick_tx( +@@ -1938,6 +1944,7 @@ static struct netdev_queue *dev_pick_tx( skb_set_queue_mapping(skb, queue_index); return netdev_get_tx_queue(dev, queue_index); } @@ -1110,7 +1110,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); @@ -1184,7 +1184,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); |