- 3.14.32

[packages/kernel.git] / kernel-pom-ng-IPV4OPTSSTRIP.patch

diff --git a/kernel-pom-ng-IPV4OPTSSTRIP.patch b/kernel-pom-ng-IPV4OPTSSTRIP.patch
index 1c72f3d038984337f818b015ca46fc28083f0254..de73b89a4636a375c01fe46b16948781c56c036b 100644 (file)
--- a/kernel-pom-ng-IPV4OPTSSTRIP.patch
+++ b/kernel-pom-ng-IPV4OPTSSTRIP.patch
@@ -17,13 +17,12 @@ diff -NurpP --minimal linux-2.6.21.b/net/ipv4/netfilter/Kconfig linux-2.6.21.a/n
 +
  endmenu
  
-diff -NurpP --minimal linux-2.6.21.b/net/ipv4/netfilter/Makefile linux-2.6.21.a/net/ipv4/netfilter/Makefile
---- linux-2.6.21.b/net/ipv4/netfilter/Makefile 2007-05-30 11:11:52.000000000 +0200
-+++ linux-2.6.21.a/net/ipv4/netfilter/Makefile 2007-05-30 11:18:08.000000000 +0200
+--- linux-3.4/net/ipv4/netfilter/Makefile~     2012-05-21 08:42:02.000000000 +0200
++++ linux-3.4/net/ipv4/netfilter/Makefile      2012-05-21 08:45:09.247956356 +0200
 @@ -54,6 +54,7 @@
+ # targets
  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
 +obj-$(CONFIG_IP_NF_TARGET_IPV4OPTSSTRIP) += ipt_IPV4OPTSSTRIP.o
  obj-$(CONFIG_IP_NF_TARGET_MASQUERADE) += ipt_MASQUERADE.o
  obj-$(CONFIG_IP_NF_TARGET_NETMAP) += ipt_NETMAP.o
@@ -72,7 +71,7 @@ diff -NurpP --minimal linux-2.6.21.b/net/ipv4/netfilter/ipt_IPV4OPTSSTRIP.c linu
 +
 +      /* if no options in packet then nothing to clear. */
 +      if (iph->ihl * 4 == sizeof(struct iphdr))
-+              return IPT_CONTINUE;
++              return XT_CONTINUE;
 +
 +      /* else clear all options */
 +      memset(&(IPCB(skb)->opt), 0, sizeof(struct ip_options));
@@ -80,7 +79,7 @@ diff -NurpP --minimal linux-2.6.21.b/net/ipv4/netfilter/ipt_IPV4OPTSSTRIP.c linu
 +      opt = &(IPCB(skb)->opt);
 +      opt->optlen = l;
 +
-+        return IPT_CONTINUE;
++        return XT_CONTINUE;
 +}
 +
 +static bool
@@ -98,7 +97,7 @@ diff -NurpP --minimal linux-2.6.21.b/net/ipv4/netfilter/ipt_IPV4OPTSSTRIP.c linu
 +      return 1;
 +}
 +
-+static struct ipt_target ipt_ipv4optsstrip_reg = { 
++static struct xt_target ipt_ipv4optsstrip_reg = { 
 +      .name = "IPV4OPTSSTRIP",
 +      .target = target,
 +      .checkentry = checkentry,