cfg80211: rename mesh station types
authorThomas Pedersen <thomas@cozybit.com>
Mon, 4 Mar 2013 21:06:11 +0000 (13:06 -0800)
committerJohannes Berg <johannes.berg@intel.com>
Wed, 6 Mar 2013 15:36:11 +0000 (16:36 +0100)
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>
include/net/cfg80211.h
net/mac80211/cfg.c
net/wireless/nl80211.c

index 69b2b2631b9a87ccd8d7f5c444ec107a3348fbbe..bdba9b619064b9c2fa683c2356821348df6d793d 100644 (file)
@@ -690,8 +690,8 @@ struct station_parameters {
  *     supported/used)
  * @CFG80211_STA_TDLS_PEER_ACTIVE: TDLS peer on managed interface (active
  *     entry that is operating, has been marked authorized by userspace)
- * @CFG80211_STA_MESH_PEER_NONSEC: peer on mesh interface (non-secured)
- * @CFG80211_STA_MESH_PEER_SECURE: peer on mesh interface (secured)
+ * @CFG80211_STA_MESH_PEER_KERNEL: peer on mesh interface (kernel managed)
+ * @CFG80211_STA_MESH_PEER_USER: peer on mesh interface (user managed)
  */
 enum cfg80211_station_type {
        CFG80211_STA_AP_CLIENT,
@@ -700,8 +700,8 @@ enum cfg80211_station_type {
        CFG80211_STA_IBSS,
        CFG80211_STA_TDLS_PEER_SETUP,
        CFG80211_STA_TDLS_PEER_ACTIVE,
-       CFG80211_STA_MESH_PEER_NONSEC,
-       CFG80211_STA_MESH_PEER_SECURE,
+       CFG80211_STA_MESH_PEER_KERNEL,
+       CFG80211_STA_MESH_PEER_USER,
 };
 
 /**
index 9d708f9e246e025d7a337f6d3fe0f9a808ebbf7e..6ac89e5c2963514865e695de302640cf267fd905 100644 (file)
@@ -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;
index bdf39836d9d8aa9f7de793decc3035b97fe10337..946b2e7acdf291c28acfafac51b0aa354998ae7c 100644 (file)
@@ -3617,8 +3617,8 @@ int cfg80211_check_station_change(struct wiphy *wiphy,
        BUILD_BUG_ON(NL80211_STA_FLAG_MAX != 7);
 
        switch (statype) {
-       case CFG80211_STA_MESH_PEER_NONSEC:
-       case CFG80211_STA_MESH_PEER_SECURE:
+       case CFG80211_STA_MESH_PEER_KERNEL:
+       case CFG80211_STA_MESH_PEER_USER:
                /*
                 * No ignoring the TDLS flag here -- the userspace mesh
                 * code doesn't have the bug of including TDLS in the
@@ -3720,11 +3720,11 @@ int cfg80211_check_station_change(struct wiphy *wiphy,
        case CFG80211_STA_TDLS_PEER_ACTIVE:
                /* reject any changes */
                return -EINVAL;
-       case CFG80211_STA_MESH_PEER_NONSEC:
+       case CFG80211_STA_MESH_PEER_KERNEL:
                if (params->sta_modify_mask & STATION_PARAM_APPLY_PLINK_STATE)
                        return -EINVAL;
                break;
-       case CFG80211_STA_MESH_PEER_SECURE:
+       case CFG80211_STA_MESH_PEER_USER:
                if (params->plink_action != NL80211_PLINK_ACTION_NO_ACTION)
                        return -EINVAL;
                break;