Commit 04600794 authored by Johannes Berg's avatar Johannes Berg Committed by John W. Linville
Browse files

cfg80211: support sysfs namespaces 



Enable using network namespaces with
wireless devices even when sysfs is
enabled using the same infrastructure
that was built for netdevs.

Signed-off-by: default avatarJohannes Berg <johannes.berg@intel.com>
Acked-by: default avatar"Eric W. Biederman" <ebiederm@xmission.com>
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent d1f5b7a3

include/linux/netdevice.h

+2 −0
Original line number Diff line number Diff line
@@ -2171,6 +2171,8 @@ extern void dev_seq_stop(struct seq_file *seq, void *v); 
extern int netdev_class_create_file(struct class_attribute *class_attr);

extern void netdev_class_remove_file(struct class_attribute *class_attr);



extern struct kobj_ns_type_operations net_ns_type_operations;



extern char *netdev_drivername(const struct net_device *dev, char *buffer, int len);



extern void linkwatch_run_queue(void);

net/core/net-sysfs.c

+2 −1
Original line number Diff line number Diff line
@@ -789,12 +789,13 @@ static const void *net_netlink_ns(struct sock *sk) 
	return sock_net(sk);

}



static struct kobj_ns_type_operations net_ns_type_operations = {

struct kobj_ns_type_operations net_ns_type_operations = {

	.type = KOBJ_NS_TYPE_NET,

	.current_ns = net_current_ns,

	.netlink_ns = net_netlink_ns,

	.initial_ns = net_initial_ns,

};

EXPORT_SYMBOL_GPL(net_ns_type_operations);



static void net_kobj_ns_exit(struct net *net)

{

net/wireless/core.c

+6 −1
Original line number Diff line number Diff line
@@ -253,11 +253,16 @@ int cfg80211_switch_netns(struct cfg80211_registered_device *rdev, 
			WARN_ON(err);

			wdev->netdev->features |= NETIF_F_NETNS_LOCAL;

		}



		return err;

	}



	wiphy_net_set(&rdev->wiphy, net);



	return err;

	err = device_rename(&rdev->wiphy.dev, dev_name(&rdev->wiphy.dev));

	WARN_ON(err);



	return 0;

}



static void cfg80211_rfkill_poll(struct rfkill *rfkill, void *data)

net/wireless/sysfs.c

+9 −0
Original line number Diff line number Diff line
@@ -110,6 +110,13 @@ static int wiphy_resume(struct device *dev) 
	return ret;

}



static const void *wiphy_namespace(struct device *d)

{

	struct wiphy *wiphy = container_of(d, struct wiphy, dev);



	return wiphy_net(wiphy);

}



struct class ieee80211_class = {

	.name = "ieee80211",

	.owner = THIS_MODULE,
@@ -120,6 +127,8 @@ struct class ieee80211_class = { 
#endif

	.suspend = wiphy_suspend,

	.resume = wiphy_resume,

	.ns_type = &net_ns_type_operations,

	.namespace = wiphy_namespace,

};



int wiphy_sysfs_init(void)