aboutsummaryrefslogtreecommitdiffstats
path: root/net/ipx/af_ipx.c
diff options
context:
space:
mode:
authorEric W. Biederman <ebiederm@xmission.com>2007-09-17 14:56:21 -0400
committerDavid S. Miller <davem@sunset.davemloft.net>2007-10-10 19:49:10 -0400
commit881d966b48b035ab3f3aeaae0f3d3f9b584f45b2 (patch)
treec579d59a4107cbbe9e2b85939bc0d496b815c887 /net/ipx/af_ipx.c
parentb4b510290b056b86611757ce1175a230f1080f53 (diff)
[NET]: Make the device list and device lookups per namespace.
This patch makes most of the generic device layer network namespace safe. This patch makes dev_base_head a network namespace variable, and then it picks up a few associated variables. The functions: dev_getbyhwaddr dev_getfirsthwbytype dev_get_by_flags dev_get_by_name __dev_get_by_name dev_get_by_index __dev_get_by_index dev_ioctl dev_ethtool dev_load wireless_process_ioctl were modified to take a network namespace argument, and deal with it. vlan_ioctl_set and brioctl_set were modified so their hooks will receive a network namespace argument. So basically anthing in the core of the network stack that was affected to by the change of dev_base was modified to handle multiple network namespaces. The rest of the network stack was simply modified to explicitly use &init_net the initial network namespace. This can be fixed when those components of the network stack are modified to handle multiple network namespaces. For now the ifindex generator is left global. Fundametally ifindex numbers are per namespace, or else we will have corner case problems with migration when we get that far. At the same time there are assumptions in the network stack that the ifindex of a network device won't change. Making the ifindex number global seems a good compromise until the network stack can cope with ifindex changes when you change namespaces, and the like. Signed-off-by: Eric W. Biederman <ebiederm@xmission.com> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/ipx/af_ipx.c')
-rw-r--r--net/ipx/af_ipx.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/net/ipx/af_ipx.c b/net/ipx/af_ipx.c
index 24921f12e9af..29b063d43120 100644
--- a/net/ipx/af_ipx.c
+++ b/net/ipx/af_ipx.c
@@ -989,7 +989,7 @@ static int ipxitf_create(struct ipx_interface_definition *idef)
989 if (intrfc) 989 if (intrfc)
990 ipxitf_put(intrfc); 990 ipxitf_put(intrfc);
991 991
992 dev = dev_get_by_name(idef->ipx_device); 992 dev = dev_get_by_name(&init_net, idef->ipx_device);
993 rc = -ENODEV; 993 rc = -ENODEV;
994 if (!dev) 994 if (!dev)
995 goto out; 995 goto out;
@@ -1097,7 +1097,7 @@ static int ipxitf_delete(struct ipx_interface_definition *idef)
1097 if (!dlink_type) 1097 if (!dlink_type)
1098 goto out; 1098 goto out;
1099 1099
1100 dev = __dev_get_by_name(idef->ipx_device); 1100 dev = __dev_get_by_name(&init_net, idef->ipx_device);
1101 rc = -ENODEV; 1101 rc = -ENODEV;
1102 if (!dev) 1102 if (!dev)
1103 goto out; 1103 goto out;
@@ -1192,7 +1192,7 @@ static int ipxitf_ioctl(unsigned int cmd, void __user *arg)
1192 if (copy_from_user(&ifr, arg, sizeof(ifr))) 1192 if (copy_from_user(&ifr, arg, sizeof(ifr)))
1193 break; 1193 break;
1194 sipx = (struct sockaddr_ipx *)&ifr.ifr_addr; 1194 sipx = (struct sockaddr_ipx *)&ifr.ifr_addr;
1195 dev = __dev_get_by_name(ifr.ifr_name); 1195 dev = __dev_get_by_name(&init_net, ifr.ifr_name);
1196 rc = -ENODEV; 1196 rc = -ENODEV;
1197 if (!dev) 1197 if (!dev)
1198 break; 1198 break;