summaryrefslogtreecommitdiff
path: root/target/linux/generic-2.6/patches-2.6.25/110-ipp2p_0.8.1rc1.patch
diff options
context:
space:
mode:
authorImre Kaloz <kaloz@openwrt.org>2008-05-30 16:30:51 +0000
committerImre Kaloz <kaloz@openwrt.org>2008-05-30 16:30:51 +0000
commitf664b7cb17d20e7a32e9bd07e85c9bb7ecb9e2ce (patch)
treeeee31435ae91d4838abf2a566762712522a30f1f /target/linux/generic-2.6/patches-2.6.25/110-ipp2p_0.8.1rc1.patch
parent83072a149a7d7e6faf7276db7a5f6440d7fa0d24 (diff)
downloadmtk-20170518-f664b7cb17d20e7a32e9bd07e85c9bb7ecb9e2ce.zip
mtk-20170518-f664b7cb17d20e7a32e9bd07e85c9bb7ecb9e2ce.tar.gz
mtk-20170518-f664b7cb17d20e7a32e9bd07e85c9bb7ecb9e2ce.tar.bz2
refresh generic 2.6.25 patches to match upstream style
SVN-Revision: 11296
Diffstat (limited to 'target/linux/generic-2.6/patches-2.6.25/110-ipp2p_0.8.1rc1.patch')
-rw-r--r--target/linux/generic-2.6/patches-2.6.25/110-ipp2p_0.8.1rc1.patch24
1 files changed, 8 insertions, 16 deletions
diff --git a/target/linux/generic-2.6/patches-2.6.25/110-ipp2p_0.8.1rc1.patch b/target/linux/generic-2.6/patches-2.6.25/110-ipp2p_0.8.1rc1.patch
index 0ed18b4..cd1abfa 100644
--- a/target/linux/generic-2.6/patches-2.6.25/110-ipp2p_0.8.1rc1.patch
+++ b/target/linux/generic-2.6/patches-2.6.25/110-ipp2p_0.8.1rc1.patch
@@ -1,7 +1,5 @@
-Index: linux-2.6.25.4/include/linux/netfilter_ipv4/ipt_ipp2p.h
-===================================================================
--- /dev/null
-+++ linux-2.6.25.4/include/linux/netfilter_ipv4/ipt_ipp2p.h
++++ b/include/linux/netfilter_ipv4/ipt_ipp2p.h
@@ -0,0 +1,31 @@
+#ifndef __IPT_IPP2P_H
+#define __IPT_IPP2P_H
@@ -34,10 +32,8 @@ Index: linux-2.6.25.4/include/linux/netfilter_ipv4/ipt_ipp2p.h
+#define IPP2P_MUTE (1 << 14)
+#define IPP2P_WASTE (1 << 15)
+#define IPP2P_XDCC (1 << 16)
-Index: linux-2.6.25.4/net/ipv4/netfilter/ipt_ipp2p.c
-===================================================================
--- /dev/null
-+++ linux-2.6.25.4/net/ipv4/netfilter/ipt_ipp2p.c
++++ b/net/ipv4/netfilter/ipt_ipp2p.c
@@ -0,0 +1,856 @@
+#if defined(MODVERSIONS)
+#include <linux/modversions.h>
@@ -895,11 +891,9 @@ Index: linux-2.6.25.4/net/ipv4/netfilter/ipt_ipp2p.c
+module_exit(fini);
+
+
-Index: linux-2.6.25.4/net/ipv4/netfilter/Kconfig
-===================================================================
---- linux-2.6.25.4.orig/net/ipv4/netfilter/Kconfig
-+++ linux-2.6.25.4/net/ipv4/netfilter/Kconfig
-@@ -57,6 +57,12 @@ config IP_NF_IPTABLES
+--- a/net/ipv4/netfilter/Kconfig
++++ b/net/ipv4/netfilter/Kconfig
+@@ -57,6 +57,12 @@
To compile it as a module, choose M here. If unsure, say N.
# The matches.
@@ -912,11 +906,9 @@ Index: linux-2.6.25.4/net/ipv4/netfilter/Kconfig
config IP_NF_MATCH_RECENT
tristate '"recent" match support'
depends on IP_NF_IPTABLES
-Index: linux-2.6.25.4/net/ipv4/netfilter/Makefile
-===================================================================
---- linux-2.6.25.4.orig/net/ipv4/netfilter/Makefile
-+++ linux-2.6.25.4/net/ipv4/netfilter/Makefile
-@@ -47,6 +47,8 @@ obj-$(CONFIG_IP_NF_MATCH_ECN) += ipt_ecn
+--- a/net/ipv4/netfilter/Makefile
++++ b/net/ipv4/netfilter/Makefile
+@@ -47,6 +47,8 @@
obj-$(CONFIG_IP_NF_MATCH_RECENT) += ipt_recent.o
obj-$(CONFIG_IP_NF_MATCH_TTL) += ipt_ttl.o