aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/pppoe.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 /drivers/net/pppoe.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 'drivers/net/pppoe.c')
-rw-r--r--drivers/net/pppoe.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/net/pppoe.c b/drivers/net/pppoe.c
index c5c70e4b1d36..2f130e06b6dc 100644
--- a/drivers/net/pppoe.c
+++ b/drivers/net/pppoe.c
@@ -216,7 +216,7 @@ static inline struct pppox_sock *get_item_by_addr(struct sockaddr_pppox *sp)
216 struct net_device *dev; 216 struct net_device *dev;
217 int ifindex; 217 int ifindex;
218 218
219 dev = dev_get_by_name(sp->sa_addr.pppoe.dev); 219 dev = dev_get_by_name(&init_net, sp->sa_addr.pppoe.dev);
220 if(!dev) 220 if(!dev)
221 return NULL; 221 return NULL;
222 ifindex = dev->ifindex; 222 ifindex = dev->ifindex;
@@ -603,7 +603,7 @@ static int pppoe_connect(struct socket *sock, struct sockaddr *uservaddr,
603 603
604 /* Don't re-bind if sid==0 */ 604 /* Don't re-bind if sid==0 */
605 if (sp->sa_addr.pppoe.sid != 0) { 605 if (sp->sa_addr.pppoe.sid != 0) {
606 dev = dev_get_by_name(sp->sa_addr.pppoe.dev); 606 dev = dev_get_by_name(&init_net, sp->sa_addr.pppoe.dev);
607 607
608 error = -ENODEV; 608 error = -ENODEV;
609 if (!dev) 609 if (!dev)