From: Mahesh Bandewar <maheshb@google.com>
To: David Miller <davem@davemloft.net>
Cc: netdev <netdev@vger.kernel.org>, Mahesh Bandewar <maheshb@google.com>
Subject: [PATCH 11/20] net-wireless: extending (hw_/wanted_/vlan_)features fields to a bitmap.
Date: Tue, 5 Apr 2011 17:44:16 -0700 [thread overview]
Message-ID: <1302050665-10460-12-git-send-email-maheshb@google.com> (raw)
In-Reply-To: <1302050665-10460-11-git-send-email-maheshb@google.com>
Converting current use of (hw_/wanted_/vlan_)features to
legacy_(hw_/wanted_/vlan_)features to differntiate from the proposed usage.
Signed-off-by: Mahesh Bandewar <maheshb@google.com>
---
net/wireless/core.c | 10 +++++-----
1 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/net/wireless/core.c b/net/wireless/core.c
index fe01de2..f5b619d 100644
--- a/net/wireless/core.c
+++ b/net/wireless/core.c
@@ -235,11 +235,11 @@ int cfg80211_switch_netns(struct cfg80211_registered_device *rdev,
return -EOPNOTSUPP;
list_for_each_entry(wdev, &rdev->netdev_list, list) {
- wdev->netdev->features &= ~NETIF_F_NETNS_LOCAL;
+ wdev->netdev->legacy_features &= ~NETIF_F_NETNS_LOCAL;
err = dev_change_net_namespace(wdev->netdev, net, "wlan%d");
if (err)
break;
- wdev->netdev->features |= NETIF_F_NETNS_LOCAL;
+ wdev->netdev->legacy_features |= NETIF_F_NETNS_LOCAL;
}
if (err) {
@@ -248,11 +248,11 @@ int cfg80211_switch_netns(struct cfg80211_registered_device *rdev,
list_for_each_entry_continue_reverse(wdev, &rdev->netdev_list,
list) {
- wdev->netdev->features &= ~NETIF_F_NETNS_LOCAL;
+ wdev->netdev->legacy_features &= ~NETIF_F_NETNS_LOCAL;
err = dev_change_net_namespace(wdev->netdev, net,
"wlan%d");
WARN_ON(err);
- wdev->netdev->features |= NETIF_F_NETNS_LOCAL;
+ wdev->netdev->legacy_features |= NETIF_F_NETNS_LOCAL;
}
return err;
@@ -697,7 +697,7 @@ static int cfg80211_netdev_notifier_call(struct notifier_block * nb,
list_add_rcu(&wdev->list, &rdev->netdev_list);
rdev->devlist_generation++;
/* can only change netns with wiphy */
- dev->features |= NETIF_F_NETNS_LOCAL;
+ dev->legacy_features |= NETIF_F_NETNS_LOCAL;
if (sysfs_create_link(&dev->dev.kobj, &rdev->wiphy.dev.kobj,
"phy80211")) {
--
1.7.3.1
next prev parent reply other threads:[~2011-04-06 0:44 UTC|newest]
Thread overview: 27+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-04-06 0:44 [PATCH 00/20] extending (hw_/wanted_/vlan_)features fields to a bitmap Mahesh Bandewar
2011-04-06 0:44 ` [PATCH 01/20] net-core: " Mahesh Bandewar
2011-04-06 0:44 ` [PATCH 02/20] net-ipv4: " Mahesh Bandewar
2011-04-06 0:44 ` [PATCH 03/20] net-ipv6: " Mahesh Bandewar
2011-04-06 0:44 ` [PATCH 04/20] net-vlan: " Mahesh Bandewar
2011-04-06 0:44 ` [PATCH 05/20] net-bridge: " Mahesh Bandewar
2011-04-06 0:44 ` [PATCH 06/20] net-decnet: " Mahesh Bandewar
2011-04-06 0:44 ` [PATCH 07/20] net-dsa: " Mahesh Bandewar
2011-04-06 0:44 ` [PATCH 08/20] net-l2tp: " Mahesh Bandewar
2011-04-06 0:44 ` [PATCH 09/20] net-phonet: " Mahesh Bandewar
2011-04-06 0:44 ` [PATCH 10/20] net-sctp: " Mahesh Bandewar
2011-04-06 0:44 ` Mahesh Bandewar [this message]
2011-04-06 0:44 ` [PATCH 12/20] loopback: " Mahesh Bandewar
2011-04-06 0:44 ` [PATCH 13/20] veth: " Mahesh Bandewar
2011-04-06 0:44 ` [PATCH 14/20] jme: " Mahesh Bandewar
2011-04-06 0:44 ` [PATCH 15/20] sungem: " Mahesh Bandewar
2011-04-06 0:44 ` [PATCH 16/20] sunhme: " Mahesh Bandewar
2011-04-06 0:44 ` [PATCH 17/20] usb-smsc75xx: " Mahesh Bandewar
2011-04-06 0:44 ` [PATCH 18/20] usb-smsc95xx: " Mahesh Bandewar
2011-04-06 0:44 ` [PATCH 19/20] virtio_net: " Mahesh Bandewar
2011-04-06 0:44 ` [PATCH 20/20] xen: " Mahesh Bandewar
2011-04-06 1:27 ` [PATCH 01/20] net-core: " Ben Hutchings
2011-04-06 1:35 ` Mahesh Bandewar
2011-04-06 1:45 ` Ben Hutchings
2011-04-06 10:29 ` Michał Mirosław
2011-04-06 17:34 ` Mahesh Bandewar
2011-04-07 15:00 ` [PATCHv2 " Mahesh Bandewar
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=1302050665-10460-12-git-send-email-maheshb@google.com \
--to=maheshb@google.com \
--cc=davem@davemloft.net \
--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).