diff options
author | Gabor Juhos <juhosg@openwrt.org> | 2008-06-02 19:49:28 +0000 |
---|---|---|
committer | Gabor Juhos <juhosg@openwrt.org> | 2008-06-02 19:49:28 +0000 |
commit | 93e8eb8171803d3c4c790e37ca6f6f23a2cff563 (patch) | |
tree | 0cd12d5dcfabdc8212f758bb9724f64ddcf97bd6 /target/linux/generic-2.6/patches-2.6.26/150-netfilter_imq.patch | |
parent | f9518d9a74d4a418e32a48365dde1fc6b1b14387 (diff) | |
download | upstream-93e8eb8171803d3c4c790e37ca6f6f23a2cff563.tar.gz upstream-93e8eb8171803d3c4c790e37ca6f6f23a2cff563.tar.bz2 upstream-93e8eb8171803d3c4c790e37ca6f6f23a2cff563.zip |
refresh generic 2.6.26 patches
SVN-Revision: 11336
Diffstat (limited to 'target/linux/generic-2.6/patches-2.6.26/150-netfilter_imq.patch')
-rw-r--r-- | target/linux/generic-2.6/patches-2.6.26/150-netfilter_imq.patch | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/target/linux/generic-2.6/patches-2.6.26/150-netfilter_imq.patch b/target/linux/generic-2.6/patches-2.6.26/150-netfilter_imq.patch index e5db1d8212..1829d29963 100644 --- a/target/linux/generic-2.6/patches-2.6.26/150-netfilter_imq.patch +++ b/target/linux/generic-2.6/patches-2.6.26/150-netfilter_imq.patch @@ -545,7 +545,7 @@ select CRC32 --- a/drivers/net/Makefile +++ b/drivers/net/Makefile -@@ -143,6 +143,7 @@ +@@ -142,6 +142,7 @@ obj-$(CONFIG_XEN_NETDEV_FRONTEND) += xen-netfront.o obj-$(CONFIG_DUMMY) += dummy.o @@ -589,7 +589,7 @@ +#endif /* _IP6T_IMQ_H */ --- a/include/linux/skbuff.h +++ b/include/linux/skbuff.h -@@ -296,6 +296,10 @@ +@@ -300,6 +300,10 @@ struct nf_conntrack *nfct; struct sk_buff *nfct_reasm; #endif @@ -600,7 +600,7 @@ #ifdef CONFIG_BRIDGE_NETFILTER struct nf_bridge_info *nf_bridge; #endif -@@ -1736,6 +1740,10 @@ +@@ -1633,6 +1637,10 @@ dst->nfct_reasm = src->nfct_reasm; nf_conntrack_get_reasm(src->nfct_reasm); #endif @@ -623,7 +623,7 @@ #include <linux/proc_fs.h> #include <linux/seq_file.h> #include <linux/stat.h> -@@ -1537,7 +1540,11 @@ +@@ -1545,7 +1548,11 @@ int dev_hard_start_xmit(struct sk_buff *skb, struct net_device *dev) { if (likely(!skb->next)) { @@ -730,7 +730,7 @@ depends on IP_NF_FILTER --- a/net/ipv4/netfilter/Makefile +++ b/net/ipv4/netfilter/Makefile -@@ -55,6 +55,7 @@ +@@ -58,6 +58,7 @@ obj-$(CONFIG_IP_NF_TARGET_CLUSTERIP) += ipt_CLUSTERIP.o obj-$(CONFIG_IP_NF_TARGET_ECN) += ipt_ECN.o obj-$(CONFIG_IP_NF_TARGET_LOG) += ipt_LOG.o |