summaryrefslogtreecommitdiffstats
path: root/net/mac80211/cfg.c
diff options
context:
space:
mode:
authorThomas Pedersen2013-03-04 22:06:11 +0100
committerJohannes Berg2013-03-06 16:36:11 +0100
commiteef941e6d6be8bce72b5c2963b69f948be4df7a7 (patch)
tree46081b4ec60c8fdc2c39cb53822421afd6930e99 /net/mac80211/cfg.c
parentnl80211: explicit userspace MPM (diff)
downloadkernel-qcow2-linux-eef941e6d6be8bce72b5c2963b69f948be4df7a7.tar.gz
kernel-qcow2-linux-eef941e6d6be8bce72b5c2963b69f948be4df7a7.tar.xz
kernel-qcow2-linux-eef941e6d6be8bce72b5c2963b69f948be4df7a7.zip
cfg80211: rename mesh station types
The mesh station types used to refer to whether the station was secure or nonsecure. Really the salient information is whether it is managed by the kernel or userspace Signed-off-by: Thomas Pedersen <thomas@cozybit.com> Signed-off-by: Johannes Berg <johannes.berg@intel.com>
Diffstat (limited to 'net/mac80211/cfg.c')
-rw-r--r--net/mac80211/cfg.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/net/mac80211/cfg.c b/net/mac80211/cfg.c
index 9d708f9e246e..6ac89e5c2963 100644
--- a/net/mac80211/cfg.c
+++ b/net/mac80211/cfg.c
@@ -1436,9 +1436,9 @@ static int ieee80211_change_station(struct wiphy *wiphy,
switch (sdata->vif.type) {
case NL80211_IFTYPE_MESH_POINT:
if (sdata->u.mesh.security & IEEE80211_MESH_SEC_SECURED)
- statype = CFG80211_STA_MESH_PEER_SECURE;
+ statype = CFG80211_STA_MESH_PEER_USER;
else
- statype = CFG80211_STA_MESH_PEER_NONSEC;
+ statype = CFG80211_STA_MESH_PEER_KERNEL;
break;
case NL80211_IFTYPE_ADHOC:
statype = CFG80211_STA_IBSS;