- ipv4options match is in xtables-addons

Changed files:
    kernel-patches.config -> 1.12
    kernel.spec -> 1.936

diff --git a/kernel-patches.config b/kernel-patches.config
index 5f8b2d4f33e0d492a446c42c0ee402789cf1d4a4..790f0751491eeb7c02623ee393c923e847dc669d 100644 (file)
--- a/kernel-patches.config
+++ b/kernel-patches.config
@@ -46,7 +46,6 @@ VIRTIOGL=m
 #- *** FILE: net/ipv4/netfilter/Kconfig ***
 #-
 IP_NF_TARGET_IPV4OPTSSTRIP all=m
-IP_NF_MATCH_IPV4OPTIONS all=m
 NF_NAT_MMS all=m
 NF_CONNTRACK_RSH all=m
 IP_NF_MATCH_RPC all=m

diff --git a/kernel.spec b/kernel.spec
index 748bb945e67b4ddf895b32b1b3bd67bbb09ae177..26975df2ed6a7ed98dfde662c6f72f912ebf2283 100644 (file)
--- a/kernel.spec
+++ b/kernel.spec
@@ -183,7 +183,6 @@ Patch5:             linux-wistron-amilo8210.patch
 # were ported to nf_conntrack.
 
 Patch10:       kernel-pom-ng-IPV4OPTSSTRIP.patch
-Patch11:       kernel-pom-ng-ipv4options.patch
 
 Patch16:       kernel-pom-ng-mms-conntrack-nat.patch
 Patch22:       kernel-pom-ng-rsh.patch
@@ -690,9 +689,6 @@ sed -i 's/-Werror//' arch/alpha/kernel/Makefile
 # kernel-pom-ng-IPV4OPTSSTRIP.patch
 %patch10 -p1
 
-# kernel-pom-ng-ipv4options.patch
-%patch11 -p1
-
 # kernel-pom-ng-mms-conntrack-nat.patch
 %patch16 -p1