|
@@ -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",
|
|
@@ -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;
|
|
|
|
|
@@ -676,7 +676,7 @@ err_alloc:
|
|
|
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;
|
|
|
|
|
@@ -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
|
|
@@ -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);
|
|
|
}
|
|
|
|