diff options
| author | Gabor Juhos <juhosg@openwrt.org> | 2009-02-08 19:16:45 +0000 |
|---|---|---|
| committer | Gabor Juhos <juhosg@openwrt.org> | 2009-02-08 19:16:45 +0000 |
| commit | 09de82989a23c0844422dba103d7534a81cfaeef (patch) | |
| tree | b82a2992141db38036a3058645e8dcadfb7385ef /target/linux/generic-2.6/patches-2.6.24/150-netfilter_imq.patch | |
| parent | 6fbcb132369d914e4a9779f23628490243afe6f6 (diff) | |
| download | master-31e0f0ae-09de82989a23c0844422dba103d7534a81cfaeef.tar.gz master-31e0f0ae-09de82989a23c0844422dba103d7534a81cfaeef.tar.bz2 master-31e0f0ae-09de82989a23c0844422dba103d7534a81cfaeef.zip | |
generic-2.6/2.6.24: refresh patches
SVN-Revision: 14450
Diffstat (limited to 'target/linux/generic-2.6/patches-2.6.24/150-netfilter_imq.patch')
| -rw-r--r-- | target/linux/generic-2.6/patches-2.6.24/150-netfilter_imq.patch | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/target/linux/generic-2.6/patches-2.6.24/150-netfilter_imq.patch b/target/linux/generic-2.6/patches-2.6.24/150-netfilter_imq.patch index ec6dfc682a..a0d65edf5b 100644 --- a/target/linux/generic-2.6/patches-2.6.24/150-netfilter_imq.patch +++ b/target/linux/generic-2.6/patches-2.6.24/150-netfilter_imq.patch @@ -412,7 +412,7 @@ +MODULE_LICENSE("GPL"); --- a/drivers/net/Kconfig +++ b/drivers/net/Kconfig -@@ -112,6 +112,129 @@ +@@ -112,6 +112,129 @@ config EQUALIZER To compile this driver as a module, choose M here: the module will be called eql. If unsure, say N. @@ -544,7 +544,7 @@ select CRC32 --- a/drivers/net/Makefile +++ b/drivers/net/Makefile -@@ -139,6 +139,7 @@ +@@ -139,6 +139,7 @@ obj-$(CONFIG_SLHC) += slhc.o obj-$(CONFIG_XEN_NETDEV_FRONTEND) += xen-netfront.o obj-$(CONFIG_DUMMY) += dummy.o @@ -588,7 +588,7 @@ +#endif /* _IP6T_IMQ_H */ --- a/include/linux/skbuff.h +++ b/include/linux/skbuff.h -@@ -295,6 +295,10 @@ +@@ -295,6 +295,10 @@ struct sk_buff { struct nf_conntrack *nfct; struct sk_buff *nfct_reasm; #endif @@ -599,7 +599,7 @@ #ifdef CONFIG_BRIDGE_NETFILTER struct nf_bridge_info *nf_bridge; #endif -@@ -1728,6 +1732,10 @@ +@@ -1728,6 +1732,10 @@ static inline void __nf_copy(struct sk_b dst->nfct_reasm = src->nfct_reasm; nf_conntrack_get_reasm(src->nfct_reasm); #endif @@ -622,7 +622,7 @@ #include <linux/proc_fs.h> #include <linux/seq_file.h> #include <linux/stat.h> -@@ -1533,7 +1536,11 @@ +@@ -1533,7 +1536,11 @@ static int dev_gso_segment(struct sk_buf int dev_hard_start_xmit(struct sk_buff *skb, struct net_device *dev) { if (likely(!skb->next)) { @@ -709,7 +709,7 @@ +MODULE_LICENSE("GPL"); --- a/net/ipv4/netfilter/Kconfig +++ b/net/ipv4/netfilter/Kconfig -@@ -333,6 +333,17 @@ +@@ -333,6 +333,17 @@ config IP_NF_MANGLE To compile it as a module, choose M here. If unsure, say N. @@ -729,7 +729,7 @@ depends on IP_NF_MANGLE --- a/net/ipv4/netfilter/Makefile +++ b/net/ipv4/netfilter/Makefile -@@ -58,6 +58,7 @@ +@@ -58,6 +58,7 @@ obj-$(CONFIG_IP_NF_MATCH_IPP2P) += ipt_i 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 @@ -811,7 +811,7 @@ +MODULE_LICENSE("GPL"); --- a/net/ipv6/netfilter/Kconfig +++ b/net/ipv6/netfilter/Kconfig -@@ -173,6 +173,15 @@ +@@ -173,6 +173,15 @@ config IP6_NF_MANGLE To compile it as a module, choose M here. If unsure, say N. @@ -839,7 +839,7 @@ --- a/net/sched/sch_generic.c +++ b/net/sched/sch_generic.c -@@ -176,6 +176,11 @@ +@@ -176,6 +176,11 @@ static inline int qdisc_restart(struct n return ret; } @@ -851,7 +851,7 @@ void __qdisc_run(struct net_device *dev) { unsigned long start_time = jiffies; -@@ -650,3 +655,4 @@ +@@ -650,3 +655,4 @@ EXPORT_SYMBOL(qdisc_destroy); EXPORT_SYMBOL(qdisc_reset); EXPORT_SYMBOL(qdisc_lock_tree); EXPORT_SYMBOL(qdisc_unlock_tree); |