diff options
Diffstat (limited to 'net')
-rw-r--r-- | net/decnet/dn_dev.c | 5 | ||||
-rw-r--r-- | net/ipv4/devinet.c | 5 | ||||
-rw-r--r-- | net/ipv6/addrconf.c | 5 |
3 files changed, 0 insertions, 15 deletions
diff --git a/net/decnet/dn_dev.c b/net/decnet/dn_dev.c index 0977df42c205..060d725e2942 100644 --- a/net/decnet/dn_dev.c +++ b/net/decnet/dn_dev.c | |||
@@ -261,7 +261,6 @@ static void dn_dev_sysctl_register(struct net_device *dev, struct dn_dev_parms * | |||
261 | for(i = 0; i < ARRAY_SIZE(t->dn_dev_vars) - 1; i++) { | 261 | for(i = 0; i < ARRAY_SIZE(t->dn_dev_vars) - 1; i++) { |
262 | long offset = (long)t->dn_dev_vars[i].data; | 262 | long offset = (long)t->dn_dev_vars[i].data; |
263 | t->dn_dev_vars[i].data = ((char *)parms) + offset; | 263 | t->dn_dev_vars[i].data = ((char *)parms) + offset; |
264 | t->dn_dev_vars[i].de = NULL; | ||
265 | } | 264 | } |
266 | 265 | ||
267 | if (dev) { | 266 | if (dev) { |
@@ -273,13 +272,9 @@ static void dn_dev_sysctl_register(struct net_device *dev, struct dn_dev_parms * | |||
273 | } | 272 | } |
274 | 273 | ||
275 | t->dn_dev_dev[0].child = t->dn_dev_vars; | 274 | t->dn_dev_dev[0].child = t->dn_dev_vars; |
276 | t->dn_dev_dev[0].de = NULL; | ||
277 | t->dn_dev_conf_dir[0].child = t->dn_dev_dev; | 275 | t->dn_dev_conf_dir[0].child = t->dn_dev_dev; |
278 | t->dn_dev_conf_dir[0].de = NULL; | ||
279 | t->dn_dev_proto_dir[0].child = t->dn_dev_conf_dir; | 276 | t->dn_dev_proto_dir[0].child = t->dn_dev_conf_dir; |
280 | t->dn_dev_proto_dir[0].de = NULL; | ||
281 | t->dn_dev_root_dir[0].child = t->dn_dev_proto_dir; | 277 | t->dn_dev_root_dir[0].child = t->dn_dev_proto_dir; |
282 | t->dn_dev_root_dir[0].de = NULL; | ||
283 | t->dn_dev_vars[0].extra1 = (void *)dev; | 278 | t->dn_dev_vars[0].extra1 = (void *)dev; |
284 | 279 | ||
285 | t->sysctl_header = register_sysctl_table(t->dn_dev_root_dir); | 280 | t->sysctl_header = register_sysctl_table(t->dn_dev_root_dir); |
diff --git a/net/ipv4/devinet.c b/net/ipv4/devinet.c index bf3eb2dc7662..8a0ec10a13a7 100644 --- a/net/ipv4/devinet.c +++ b/net/ipv4/devinet.c | |||
@@ -1576,7 +1576,6 @@ static void devinet_sysctl_register(struct in_device *in_dev, | |||
1576 | return; | 1576 | return; |
1577 | for (i = 0; i < ARRAY_SIZE(t->devinet_vars) - 1; i++) { | 1577 | for (i = 0; i < ARRAY_SIZE(t->devinet_vars) - 1; i++) { |
1578 | t->devinet_vars[i].data += (char *)p - (char *)&ipv4_devconf; | 1578 | t->devinet_vars[i].data += (char *)p - (char *)&ipv4_devconf; |
1579 | t->devinet_vars[i].de = NULL; | ||
1580 | } | 1579 | } |
1581 | 1580 | ||
1582 | if (dev) { | 1581 | if (dev) { |
@@ -1598,13 +1597,9 @@ static void devinet_sysctl_register(struct in_device *in_dev, | |||
1598 | 1597 | ||
1599 | t->devinet_dev[0].procname = dev_name; | 1598 | t->devinet_dev[0].procname = dev_name; |
1600 | t->devinet_dev[0].child = t->devinet_vars; | 1599 | t->devinet_dev[0].child = t->devinet_vars; |
1601 | t->devinet_dev[0].de = NULL; | ||
1602 | t->devinet_conf_dir[0].child = t->devinet_dev; | 1600 | t->devinet_conf_dir[0].child = t->devinet_dev; |
1603 | t->devinet_conf_dir[0].de = NULL; | ||
1604 | t->devinet_proto_dir[0].child = t->devinet_conf_dir; | 1601 | t->devinet_proto_dir[0].child = t->devinet_conf_dir; |
1605 | t->devinet_proto_dir[0].de = NULL; | ||
1606 | t->devinet_root_dir[0].child = t->devinet_proto_dir; | 1602 | t->devinet_root_dir[0].child = t->devinet_proto_dir; |
1607 | t->devinet_root_dir[0].de = NULL; | ||
1608 | 1603 | ||
1609 | t->sysctl_header = register_sysctl_table(t->devinet_root_dir); | 1604 | t->sysctl_header = register_sysctl_table(t->devinet_root_dir); |
1610 | if (!t->sysctl_header) | 1605 | if (!t->sysctl_header) |
diff --git a/net/ipv6/addrconf.c b/net/ipv6/addrconf.c index 34d80b4aaa04..569a37d698f7 100644 --- a/net/ipv6/addrconf.c +++ b/net/ipv6/addrconf.c | |||
@@ -3998,7 +3998,6 @@ static void addrconf_sysctl_register(struct inet6_dev *idev, struct ipv6_devconf | |||
3998 | return; | 3998 | return; |
3999 | for (i=0; t->addrconf_vars[i].data; i++) { | 3999 | for (i=0; t->addrconf_vars[i].data; i++) { |
4000 | t->addrconf_vars[i].data += (char*)p - (char*)&ipv6_devconf; | 4000 | t->addrconf_vars[i].data += (char*)p - (char*)&ipv6_devconf; |
4001 | t->addrconf_vars[i].de = NULL; | ||
4002 | t->addrconf_vars[i].extra1 = idev; /* embedded; no ref */ | 4001 | t->addrconf_vars[i].extra1 = idev; /* embedded; no ref */ |
4003 | } | 4002 | } |
4004 | if (dev) { | 4003 | if (dev) { |
@@ -4021,13 +4020,9 @@ static void addrconf_sysctl_register(struct inet6_dev *idev, struct ipv6_devconf | |||
4021 | t->addrconf_dev[0].procname = dev_name; | 4020 | t->addrconf_dev[0].procname = dev_name; |
4022 | 4021 | ||
4023 | t->addrconf_dev[0].child = t->addrconf_vars; | 4022 | t->addrconf_dev[0].child = t->addrconf_vars; |
4024 | t->addrconf_dev[0].de = NULL; | ||
4025 | t->addrconf_conf_dir[0].child = t->addrconf_dev; | 4023 | t->addrconf_conf_dir[0].child = t->addrconf_dev; |
4026 | t->addrconf_conf_dir[0].de = NULL; | ||
4027 | t->addrconf_proto_dir[0].child = t->addrconf_conf_dir; | 4024 | t->addrconf_proto_dir[0].child = t->addrconf_conf_dir; |
4028 | t->addrconf_proto_dir[0].de = NULL; | ||
4029 | t->addrconf_root_dir[0].child = t->addrconf_proto_dir; | 4025 | t->addrconf_root_dir[0].child = t->addrconf_proto_dir; |
4030 | t->addrconf_root_dir[0].de = NULL; | ||
4031 | 4026 | ||
4032 | t->sysctl_header = register_sysctl_table(t->addrconf_root_dir); | 4027 | t->sysctl_header = register_sysctl_table(t->addrconf_root_dir); |
4033 | if (t->sysctl_header == NULL) | 4028 | if (t->sysctl_header == NULL) |