From 0d62d39c21daa3d3ee6f974ccf3e3ab3008d79c2 Mon Sep 17 00:00:00 2001 From: Imre Kaloz Date: Fri, 30 May 2008 16:30:51 +0000 Subject: refresh generic 2.6.25 patches to match upstream style git-svn-id: svn://svn.openwrt.org/openwrt/trunk@11296 3c298f89-4303-0410-b956-a3cf2f4a3e73 --- .../patches-2.6.25/110-ipp2p_0.8.1rc1.patch | 24 ++++++++-------------- 1 file changed, 8 insertions(+), 16 deletions(-) (limited to 'target/linux/generic-2.6/patches-2.6.25/110-ipp2p_0.8.1rc1.patch') 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 0ed18b404c..cd1abfaf6d 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 @@ -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 -- cgit v1.2.3