Commit 0a64b4b8 authored by Pavel Emelyanov's avatar Pavel Emelyanov Committed by David S. Miller

inet: Rename fragmentation sysctl-related functions/variables.

The fragments sysctls also contains some, that are to be
visible, but read-only in net namespaces.

The naming in net/core/sysctl_net_core.c is - tables, that are
to be registered in namespaces have a "ns" word in their names.
So rename ones in ipv4/ip_fragment.c and ipv6/reassembly.c to
fit this.
Signed-off-by: default avatarPavel Emelyanov <xemul@openvz.org>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent d5a4502e
...@@ -598,7 +598,7 @@ int ip_defrag(struct sk_buff *skb, u32 user) ...@@ -598,7 +598,7 @@ int ip_defrag(struct sk_buff *skb, u32 user)
#ifdef CONFIG_SYSCTL #ifdef CONFIG_SYSCTL
static int zero; static int zero;
static struct ctl_table ip4_frags_ctl_table[] = { static struct ctl_table ip4_frags_ns_ctl_table[] = {
{ {
.ctl_name = NET_IPV4_IPFRAG_HIGH_THRESH, .ctl_name = NET_IPV4_IPFRAG_HIGH_THRESH,
.procname = "ipfrag_high_thresh", .procname = "ipfrag_high_thresh",
...@@ -644,14 +644,14 @@ static struct ctl_table ip4_frags_ctl_table[] = { ...@@ -644,14 +644,14 @@ static struct ctl_table ip4_frags_ctl_table[] = {
{ } { }
}; };
static int ip4_frags_ctl_register(struct net *net) static int ip4_frags_ns_ctl_register(struct net *net)
{ {
struct ctl_table *table; struct ctl_table *table;
struct ctl_table_header *hdr; struct ctl_table_header *hdr;
table = ip4_frags_ctl_table; table = ip4_frags_ns_ctl_table;
if (net != &init_net) { if (net != &init_net) {
table = kmemdup(table, sizeof(ip4_frags_ctl_table), GFP_KERNEL); table = kmemdup(table, sizeof(ip4_frags_ns_ctl_table), GFP_KERNEL);
if (table == NULL) if (table == NULL)
goto err_alloc; goto err_alloc;
...@@ -676,7 +676,7 @@ static int ip4_frags_ctl_register(struct net *net) ...@@ -676,7 +676,7 @@ static int ip4_frags_ctl_register(struct net *net)
return -ENOMEM; return -ENOMEM;
} }
static void ip4_frags_ctl_unregister(struct net *net) static void ip4_frags_ns_ctl_unregister(struct net *net)
{ {
struct ctl_table *table; struct ctl_table *table;
...@@ -685,12 +685,12 @@ static void ip4_frags_ctl_unregister(struct net *net) ...@@ -685,12 +685,12 @@ static void ip4_frags_ctl_unregister(struct net *net)
kfree(table); kfree(table);
} }
#else #else
static inline int ip4_frags_ctl_register(struct net *net) static inline int ip4_frags_ns_ctl_register(struct net *net)
{ {
return 0; return 0;
} }
static inline void ip4_frags_ctl_unregister(struct net *net) static inline void ip4_frags_ns_ctl_unregister(struct net *net)
{ {
} }
#endif #endif
...@@ -714,12 +714,12 @@ static int ipv4_frags_init_net(struct net *net) ...@@ -714,12 +714,12 @@ static int ipv4_frags_init_net(struct net *net)
inet_frags_init_net(&net->ipv4.frags); inet_frags_init_net(&net->ipv4.frags);
return ip4_frags_ctl_register(net); return ip4_frags_ns_ctl_register(net);
} }
static void ipv4_frags_exit_net(struct net *net) static void ipv4_frags_exit_net(struct net *net)
{ {
ip4_frags_ctl_unregister(net); ip4_frags_ns_ctl_unregister(net);
inet_frags_exit_net(&net->ipv4.frags, &ip4_frags); inet_frags_exit_net(&net->ipv4.frags, &ip4_frags);
} }
......
...@@ -632,7 +632,7 @@ static struct inet6_protocol frag_protocol = ...@@ -632,7 +632,7 @@ static struct inet6_protocol frag_protocol =
}; };
#ifdef CONFIG_SYSCTL #ifdef CONFIG_SYSCTL
static struct ctl_table ip6_frags_ctl_table[] = { static struct ctl_table ip6_frags_ns_ctl_table[] = {
{ {
.ctl_name = NET_IPV6_IP6FRAG_HIGH_THRESH, .ctl_name = NET_IPV6_IP6FRAG_HIGH_THRESH,
.procname = "ip6frag_high_thresh", .procname = "ip6frag_high_thresh",
...@@ -670,14 +670,14 @@ static struct ctl_table ip6_frags_ctl_table[] = { ...@@ -670,14 +670,14 @@ static struct ctl_table ip6_frags_ctl_table[] = {
{ } { }
}; };
static int ip6_frags_sysctl_register(struct net *net) static int ip6_frags_ns_sysctl_register(struct net *net)
{ {
struct ctl_table *table; struct ctl_table *table;
struct ctl_table_header *hdr; struct ctl_table_header *hdr;
table = ip6_frags_ctl_table; table = ip6_frags_ns_ctl_table;
if (net != &init_net) { if (net != &init_net) {
table = kmemdup(table, sizeof(ip6_frags_ctl_table), GFP_KERNEL); table = kmemdup(table, sizeof(ip6_frags_ns_ctl_table), GFP_KERNEL);
if (table == NULL) if (table == NULL)
goto err_alloc; goto err_alloc;
...@@ -701,7 +701,7 @@ static int ip6_frags_sysctl_register(struct net *net) ...@@ -701,7 +701,7 @@ static int ip6_frags_sysctl_register(struct net *net)
return -ENOMEM; return -ENOMEM;
} }
static void ip6_frags_sysctl_unregister(struct net *net) static void ip6_frags_ns_sysctl_unregister(struct net *net)
{ {
struct ctl_table *table; struct ctl_table *table;
...@@ -710,12 +710,12 @@ static void ip6_frags_sysctl_unregister(struct net *net) ...@@ -710,12 +710,12 @@ static void ip6_frags_sysctl_unregister(struct net *net)
kfree(table); kfree(table);
} }
#else #else
static inline int ip6_frags_sysctl_register(struct net *net) static inline int ip6_frags_ns_sysctl_register(struct net *net)
{ {
return 0; return 0;
} }
static inline void ip6_frags_sysctl_unregister(struct net *net) static inline void ip6_frags_ns_sysctl_unregister(struct net *net)
{ {
} }
#endif #endif
...@@ -728,12 +728,12 @@ static int ipv6_frags_init_net(struct net *net) ...@@ -728,12 +728,12 @@ static int ipv6_frags_init_net(struct net *net)
inet_frags_init_net(&net->ipv6.frags); inet_frags_init_net(&net->ipv6.frags);
return ip6_frags_sysctl_register(net); return ip6_frags_ns_sysctl_register(net);
} }
static void ipv6_frags_exit_net(struct net *net) static void ipv6_frags_exit_net(struct net *net)
{ {
ip6_frags_sysctl_unregister(net); ip6_frags_ns_sysctl_unregister(net);
inet_frags_exit_net(&net->ipv6.frags, &ip6_frags); inet_frags_exit_net(&net->ipv6.frags, &ip6_frags);
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment