[Devel] [PATCH RHEL7 COMMIT] ve/net: Delete nf_frags_hdr and ct_frags

Konstantin Khorenko khorenko at virtuozzo.com
Wed Jun 24 02:21:21 PDT 2015


The commit is pushed to "branch-rh7-3.10.0-123.1.2-ovz" and will appear at https://src.openvz.org/scm/ovz/vzkernel.git
after rh7-3.10.0-123.1.2.vz7.5.17
------>
commit 3313f56f0ae48bf9baaa86065b2d9a8177aa4da5
Author: Kirill Tkhai <ktkhai at odin.com>
Date:   Wed Jun 24 13:21:21 2015 +0400

    ve/net: Delete nf_frags_hdr and ct_frags
    
    These are unused (even in 2.6.32) leftovers from earlier versions.
    
    Signed-off-by: Kirill Tkhai <ktkhai at odin.com>
---
 include/net/netns/ipv6.h | 2 --
 1 file changed, 2 deletions(-)

diff --git a/include/net/netns/ipv6.h b/include/net/netns/ipv6.h
index 9defaf6..005e2c2 100644
--- a/include/net/netns/ipv6.h
+++ b/include/net/netns/ipv6.h
@@ -17,7 +17,6 @@ struct netns_sysctl_ipv6 {
 	struct ctl_table_header *icmp_hdr;
 	struct ctl_table_header *frags_hdr;
 	struct ctl_table_header *xfrm6_hdr;
-	struct ctl_table_header *nf_frags_hdr;
 #endif
 	int bindv6only;
 	int flush_delay;
@@ -37,7 +36,6 @@ struct netns_ipv6 {
 	struct ipv6_devconf	*devconf_dflt;
 	struct inet_peer_base	*peers;
 	struct netns_frags	frags;
-	struct netns_frags	ct_frags;
 #ifdef CONFIG_NETFILTER
 	struct xt_table		*ip6table_filter;
 	struct xt_table		*ip6table_mangle;



More information about the Devel mailing list