Skip to content

Commit

Permalink
inet: Rename fragmentation sysctl-related functions/variables.
Browse files Browse the repository at this point in the history 
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: Pavel Emelyanov <xemul@openvz.org>
Signed-off-by: David S. Miller <davem@davemloft.net>
  • Loading branch information
Pavel Emelyanov authored and David S. Miller committed May 19, 2008
1 parent d5a4502 commit 0a64b4b
Show file tree
Hide file tree
Showing 2 changed files with 18 additions and 18 deletions.
18 changes: 9 additions & 9 deletions net/ipv4/ip_fragment.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -598,7 +598,7 @@ int ip_defrag(struct sk_buff *skb, u32 user)
#ifdef CONFIG_SYSCTL
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,
.procname = "ipfrag_high_thresh",
Expand Down Expand Up @@ -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_header *hdr;

table = ip4_frags_ctl_table;
table = ip4_frags_ns_ctl_table;
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)
goto err_alloc;

Expand All @@ -676,7 +676,7 @@ static int ip4_frags_ctl_register(struct net *net)
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;

Expand All @@ -685,12 +685,12 @@ static void ip4_frags_ctl_unregister(struct net *net)
kfree(table);
}
#else
static inline int ip4_frags_ctl_register(struct net *net)
static inline int ip4_frags_ns_ctl_register(struct net *net)
{
return 0;
}

static inline void ip4_frags_ctl_unregister(struct net *net)
static inline void ip4_frags_ns_ctl_unregister(struct net *net)
{
}
#endif
Expand All @@ -714,12 +714,12 @@ static int ipv4_frags_init_net(struct net *net)

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)
{
ip4_frags_ctl_unregister(net);
ip4_frags_ns_ctl_unregister(net);
inet_frags_exit_net(&net->ipv4.frags, &ip4_frags);
}

Expand Down
18 changes: 9 additions & 9 deletions net/ipv6/reassembly.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -632,7 +632,7 @@ static struct inet6_protocol frag_protocol =
};

#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,
.procname = "ip6frag_high_thresh",
Expand Down Expand Up @@ -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_header *hdr;

table = ip6_frags_ctl_table;
table = ip6_frags_ns_ctl_table;
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)
goto err_alloc;

Expand All @@ -701,7 +701,7 @@ static int ip6_frags_sysctl_register(struct net *net)
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;

Expand All @@ -710,12 +710,12 @@ static void ip6_frags_sysctl_unregister(struct net *net)
kfree(table);
}
#else
static inline int ip6_frags_sysctl_register(struct net *net)
static inline int ip6_frags_ns_sysctl_register(struct net *net)
{
return 0;
}

static inline void ip6_frags_sysctl_unregister(struct net *net)
static inline void ip6_frags_ns_sysctl_unregister(struct net *net)
{
}
#endif
Expand All @@ -728,12 +728,12 @@ static int ipv6_frags_init_net(struct net *net)

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)
{
ip6_frags_sysctl_unregister(net);
ip6_frags_ns_sysctl_unregister(net);
inet_frags_exit_net(&net->ipv6.frags, &ip6_frags);
}

Expand Down

0 comments on commit 0a64b4b

Please sign in to comment.