forked from Minki/linux
881d966b48
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>
68 lines
1.5 KiB
C
68 lines
1.5 KiB
C
/*
|
|
* mac80211 configuration hooks for cfg80211
|
|
*
|
|
* Copyright 2006 Johannes Berg <johannes@sipsolutions.net>
|
|
*
|
|
* This file is GPLv2 as found in COPYING.
|
|
*/
|
|
|
|
#include <linux/nl80211.h>
|
|
#include <linux/rtnetlink.h>
|
|
#include <net/net_namespace.h>
|
|
#include <net/cfg80211.h>
|
|
#include "ieee80211_i.h"
|
|
#include "ieee80211_cfg.h"
|
|
|
|
static int ieee80211_add_iface(struct wiphy *wiphy, char *name,
|
|
unsigned int type)
|
|
{
|
|
struct ieee80211_local *local = wiphy_priv(wiphy);
|
|
int itype;
|
|
|
|
if (unlikely(local->reg_state != IEEE80211_DEV_REGISTERED))
|
|
return -ENODEV;
|
|
|
|
switch (type) {
|
|
case NL80211_IFTYPE_UNSPECIFIED:
|
|
itype = IEEE80211_IF_TYPE_STA;
|
|
break;
|
|
case NL80211_IFTYPE_ADHOC:
|
|
itype = IEEE80211_IF_TYPE_IBSS;
|
|
break;
|
|
case NL80211_IFTYPE_STATION:
|
|
itype = IEEE80211_IF_TYPE_STA;
|
|
break;
|
|
case NL80211_IFTYPE_MONITOR:
|
|
itype = IEEE80211_IF_TYPE_MNTR;
|
|
break;
|
|
default:
|
|
return -EINVAL;
|
|
}
|
|
|
|
return ieee80211_if_add(local->mdev, name, NULL, itype);
|
|
}
|
|
|
|
static int ieee80211_del_iface(struct wiphy *wiphy, int ifindex)
|
|
{
|
|
struct ieee80211_local *local = wiphy_priv(wiphy);
|
|
struct net_device *dev;
|
|
char *name;
|
|
|
|
if (unlikely(local->reg_state != IEEE80211_DEV_REGISTERED))
|
|
return -ENODEV;
|
|
|
|
dev = dev_get_by_index(&init_net, ifindex);
|
|
if (!dev)
|
|
return 0;
|
|
|
|
name = dev->name;
|
|
dev_put(dev);
|
|
|
|
return ieee80211_if_remove(local->mdev, name, -1);
|
|
}
|
|
|
|
struct cfg80211_ops mac80211_config_ops = {
|
|
.add_virtual_intf = ieee80211_add_iface,
|
|
.del_virtual_intf = ieee80211_del_iface,
|
|
};
|