summaryrefslogtreecommitdiffstats
path: root/target/linux/generic/patches-2.6.32/150-netfilter_imq.patch
diff options
context:
space:
mode:
authorflorian <florian@3c298f89-4303-0410-b956-a3cf2f4a3e73>2010-10-31 13:10:35 +0000
committerflorian <florian@3c298f89-4303-0410-b956-a3cf2f4a3e73>2010-10-31 13:10:35 +0000
commit53da46dce6ff54487ba4c33ac44ddfaf516449b6 (patch)
tree0c72f35ab53bc157a8c9ef79376121e52f8ca28d /target/linux/generic/patches-2.6.32/150-netfilter_imq.patch
parent6437e99fd61addf977aec0aabdd839d49d05c12b (diff)
[kernel] refresh 2.6.32 patches
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@23735 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'target/linux/generic/patches-2.6.32/150-netfilter_imq.patch')
-rw-r--r--target/linux/generic/patches-2.6.32/150-netfilter_imq.patch6
1 files changed, 3 insertions, 3 deletions
diff --git a/target/linux/generic/patches-2.6.32/150-netfilter_imq.patch b/target/linux/generic/patches-2.6.32/150-netfilter_imq.patch
index 9540ce0dd..8a6cf3e82 100644
--- a/target/linux/generic/patches-2.6.32/150-netfilter_imq.patch
+++ b/target/linux/generic/patches-2.6.32/150-netfilter_imq.patch
@@ -958,7 +958,7 @@
dev_queue_xmit_nit(skb, dev);
if (netif_needs_gso(dev, skb)) {
-@@ -1789,8 +1796,7 @@ u16 skb_tx_hash(const struct net_device
+@@ -1789,8 +1796,7 @@ u16 skb_tx_hash(const struct net_device
}
EXPORT_SYMBOL(skb_tx_hash);
@@ -1109,7 +1109,7 @@
new->csum = old->csum;
new->local_df = old->local_df;
new->pkt_type = old->pkt_type;
-@@ -2776,6 +2879,13 @@ void __init skb_init(void)
+@@ -2781,6 +2884,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)
-@@ -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);