diff options
author | Johannes Berg <johannes.berg@intel.com> | 2012-06-15 08:33:17 -0400 |
---|---|---|
committer | Johannes Berg <johannes.berg@intel.com> | 2012-07-09 08:51:46 -0400 |
commit | 89a54e48b9cbb44aed1bf6cd712e087b96b6ae65 (patch) | |
tree | f605a69704d49c5535adf2906b276ca2207a078f /net/wireless/sme.c | |
parent | f72b85b8eb6657fae95ac8f5cb20954b4d87a520 (diff) |
nl80211: prepare for non-netdev wireless devs
In order to support a P2P device abstraction and
Bluetooth high-speed AMPs, we need to have a way
to identify virtual interfaces that don't have a
netdev associated.
Do this by adding a NL80211_ATTR_WDEV attribute
to identify a wdev which may or may not also be
a netdev.
To simplify things, use a 64-bit value with the
high 32 bits being the wiphy index for this new
wdev identifier in the nl80211 API.
Signed-off-by: Johannes Berg <johannes.berg@intel.com>
Diffstat (limited to 'net/wireless/sme.c')
-rw-r--r-- | net/wireless/sme.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/net/wireless/sme.c b/net/wireless/sme.c index f7e937ff8978..dec97981e689 100644 --- a/net/wireless/sme.c +++ b/net/wireless/sme.c | |||
@@ -51,7 +51,7 @@ static bool cfg80211_is_all_idle(void) | |||
51 | */ | 51 | */ |
52 | list_for_each_entry(rdev, &cfg80211_rdev_list, list) { | 52 | list_for_each_entry(rdev, &cfg80211_rdev_list, list) { |
53 | cfg80211_lock_rdev(rdev); | 53 | cfg80211_lock_rdev(rdev); |
54 | list_for_each_entry(wdev, &rdev->netdev_list, list) { | 54 | list_for_each_entry(wdev, &rdev->wdev_list, list) { |
55 | wdev_lock(wdev); | 55 | wdev_lock(wdev); |
56 | if (wdev->sme_state != CFG80211_SME_IDLE) | 56 | if (wdev->sme_state != CFG80211_SME_IDLE) |
57 | is_all_idle = false; | 57 | is_all_idle = false; |
@@ -221,7 +221,7 @@ void cfg80211_conn_work(struct work_struct *work) | |||
221 | cfg80211_lock_rdev(rdev); | 221 | cfg80211_lock_rdev(rdev); |
222 | mutex_lock(&rdev->devlist_mtx); | 222 | mutex_lock(&rdev->devlist_mtx); |
223 | 223 | ||
224 | list_for_each_entry(wdev, &rdev->netdev_list, list) { | 224 | list_for_each_entry(wdev, &rdev->wdev_list, list) { |
225 | wdev_lock(wdev); | 225 | wdev_lock(wdev); |
226 | if (!netif_running(wdev->netdev)) { | 226 | if (!netif_running(wdev->netdev)) { |
227 | wdev_unlock(wdev); | 227 | wdev_unlock(wdev); |