summaryrefslogtreecommitdiffstats
path: root/net/wireless/core.h
diff options
context:
space:
mode:
authorJohannes Berg2012-06-15 14:33:17 +0200
committerJohannes Berg2012-07-09 14:51:46 +0200
commit89a54e48b9cbb44aed1bf6cd712e087b96b6ae65 (patch)
treef605a69704d49c5535adf2906b276ca2207a078f /net/wireless/core.h
parentmac80211: remove ieee80211_key_removed (diff)
downloadkernel-qcow2-linux-89a54e48b9cbb44aed1bf6cd712e087b96b6ae65.tar.gz
kernel-qcow2-linux-89a54e48b9cbb44aed1bf6cd712e087b96b6ae65.tar.xz
kernel-qcow2-linux-89a54e48b9cbb44aed1bf6cd712e087b96b6ae65.zip
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/core.h')
-rw-r--r--net/wireless/core.h6
1 files changed, 3 insertions, 3 deletions
diff --git a/net/wireless/core.h b/net/wireless/core.h
index 377dc394f48c..6b0170a5f05f 100644
--- a/net/wireless/core.h
+++ b/net/wireless/core.h
@@ -47,11 +47,11 @@ struct cfg80211_registered_device {
/* wiphy index, internal only */
int wiphy_idx;
- /* associate netdev list */
+ /* associated wireless interfaces */
struct mutex devlist_mtx;
/* protected by devlist_mtx or RCU */
- struct list_head netdev_list;
- int devlist_generation;
+ struct list_head wdev_list;
+ int devlist_generation, wdev_id;
int opencount; /* also protected by devlist_mtx */
wait_queue_head_t dev_wait;