From: ebiederm@xmission.com (Eric W. Biederman)
To: Johannes Berg <johannes@sipsolutions.net>
Cc: John Linville <linville@tuxdriver.com>,
linux-wireless <linux-wireless@vger.kernel.org>,
netdev <netdev@vger.kernel.org>
Subject: Re: [PATCH] cfg80211: support sysfs namespaces
Date: Thu, 05 Aug 2010 12:46:17 -0700 [thread overview]
Message-ID: <m1wrs47shi.fsf@fess.ebiederm.org> (raw)
In-Reply-To: <1281023115.4058.11.camel@jlt3.sipsolutions.net> (Johannes Berg's message of "Thu\, 05 Aug 2010 17\:45\:15 +0200")
Johannes Berg <johannes@sipsolutions.net> writes:
> From: Johannes Berg <johannes.berg@intel.com>
>
> Enable using network namespaces with
> wireless devices even when sysfs is
> enabled using the same infrastructure
> that was built for netdevs.
Acked-by: "Eric W. Biederman" <ebiederm@xmission.com>
This looks reasonable. I assume you have tested this and it is
working now?
>
> Signed-off-by: Johannes Berg <johannes.berg@intel.com>
> ---
> NB: This generates a harmless gcc warning, I submitted
> a patch to fix it here:
> http://thread.gmane.org/gmane.linux.kernel/1019330
>
> include/linux/netdevice.h | 2 ++
> net/core/net-sysfs.c | 3 ++-
> net/wireless/core.c | 7 ++++++-
> net/wireless/sysfs.c | 9 +++++++++
> 4 files changed, 19 insertions(+), 2 deletions(-)
>
> --- wireless-testing.orig/net/core/net-sysfs.c 2010-08-05 17:33:47.000000000 +0200
> +++ wireless-testing/net/core/net-sysfs.c 2010-08-05 17:38:27.000000000 +0200
> @@ -789,12 +789,13 @@ static const void *net_netlink_ns(struct
> 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)
> {
> --- wireless-testing.orig/net/wireless/sysfs.c 2010-08-05 17:33:47.000000000 +0200
> +++ wireless-testing/net/wireless/sysfs.c 2010-08-05 17:39:11.000000000 +0200
> @@ -110,6 +110,13 @@ static int wiphy_resume(struct device *d
> 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)
> --- wireless-testing.orig/net/wireless/core.c 2010-08-05 17:33:47.000000000 +0200
> +++ wireless-testing/net/wireless/core.c 2010-08-05 17:38:27.000000000 +0200
> @@ -253,11 +253,16 @@ int cfg80211_switch_netns(struct cfg8021
> 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)
> --- wireless-testing.orig/include/linux/netdevice.h 2010-08-05 17:13:50.000000000 +0200
> +++ wireless-testing/include/linux/netdevice.h 2010-08-05 17:39:02.000000000 +0200
> @@ -2171,6 +2171,8 @@ extern void dev_seq_stop(struct seq_file
> 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);
next prev parent reply other threads:[~2010-08-05 19:46 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2010-08-05 15:45 [PATCH] cfg80211: support sysfs namespaces Johannes Berg
2010-08-05 19:46 ` Eric W. Biederman [this message]
2010-08-05 20:05 ` Johannes Berg
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=m1wrs47shi.fsf@fess.ebiederm.org \
--to=ebiederm@xmission.com \
--cc=johannes@sipsolutions.net \
--cc=linux-wireless@vger.kernel.org \
--cc=linville@tuxdriver.com \
--cc=netdev@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).