nl80211: Let userspace drive the peer link management states.

Signed-off-by: Javier Cardona <javier@cozybit.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>

diff --git a/include/linux/nl80211.h b/include/linux/nl80211.h
index c53b916036c5ff85aebe9539066cb3e97af60ccc..de96783954a1c6067eff5ad430e16ba4a41eda9f 100644 (file)
--- a/include/linux/nl80211.h
+++ b/include/linux/nl80211.h
@@ -913,6 +913,9 @@ enum nl80211_commands {
  * @NL80211_ATTR_SUPPORT_MESH_AUTH: Currently, this means the underlying driver
  *     allows auth frames in a mesh to be passed to userspace for processing via
  *     the @NL80211_MESH_SETUP_USERSPACE_AUTH flag.
+ * @NL80211_ATTR_STA_PLINK_STATE: The state of a mesh peer link. Used when
+ *      userspace is driving the peer link management state machine.
+ *      @NL80211_MESH_SETUP_USERSPACE_AMPE must be enabled.
  *
  * @NL80211_ATTR_WOWLAN_SUPPORTED: indicates, as part of the wiphy capabilities,
  *     the supported WoWLAN triggers
@@ -1109,6 +1112,7 @@ enum nl80211_attrs {
        NL80211_ATTR_WIPHY_ANTENNA_AVAIL_RX,
 
        NL80211_ATTR_SUPPORT_MESH_AUTH,
+       NL80211_ATTR_STA_PLINK_STATE,
 
        NL80211_ATTR_WOWLAN_TRIGGERS,
        NL80211_ATTR_WOWLAN_TRIGGERS_SUPPORTED,

diff --git a/include/net/cfg80211.h b/include/net/cfg80211.h
index 10c17d68059f1110c2b9b6201c2ddde858fc611b..4b0d035be64f8205731df065bef40a3d0f77a695 100644 (file)
--- a/include/net/cfg80211.h
+++ b/include/net/cfg80211.h
@@ -371,6 +371,33 @@ enum plink_actions {
        PLINK_ACTION_BLOCK,
 };
 
+/**
+ * enum plink_states - state of a mesh peer link finite state machine
+ *
+ * @PLINK_LISTEN: initial state, considered the implicit state of non
+ * existant mesh peer links
+ * @PLINK_OPN_SNT: mesh plink open frame has been sent to this mesh
+ * peer @PLINK_OPN_RCVD: mesh plink open frame has been received from
+ * this mesh peer
+ * @PLINK_CNF_RCVD: mesh plink confirm frame has been received from
+ * this mesh peer
+ * @PLINK_ESTAB: mesh peer link is established
+ * @PLINK_HOLDING: mesh peer link is being closed or cancelled
+ * @PLINK_BLOCKED: all frames transmitted from this mesh plink are
+ * discarded
+ * @PLINK_INVALID: reserved
+ */
+enum plink_state {
+       PLINK_LISTEN,
+       PLINK_OPN_SNT,
+       PLINK_OPN_RCVD,
+       PLINK_CNF_RCVD,
+       PLINK_ESTAB,
+       PLINK_HOLDING,
+       PLINK_BLOCKED,
+       PLINK_INVALID,
+};
+
 /**
  * struct station_parameters - station parameters
  *
@@ -387,6 +414,7 @@ enum plink_actions {
  * @listen_interval: listen interval or -1 for no change
  * @aid: AID or zero for no change
  * @plink_action: plink action to take
+ * @plink_state: set the peer link state for a station
  * @ht_capa: HT capabilities of station
  */
 struct station_parameters {
@@ -397,6 +425,7 @@ struct station_parameters {
        u16 aid;
        u8 supported_rates_len;
        u8 plink_action;
+       u8 plink_state;
        struct ieee80211_ht_cap *ht_capa;
 };
 

diff --git a/net/mac80211/cfg.c b/net/mac80211/cfg.c
index 18c2555e04e64009d8076ec91073083d640937ce..51f775772d9eb4f81bd9c5ae0b310f7386dffb40 100644 (file)
--- a/net/mac80211/cfg.c
+++ b/net/mac80211/cfg.c
@@ -734,15 +734,27 @@ static void sta_apply_parameters(struct ieee80211_local *local,
                                                  params->ht_capa,
                                                  &sta->sta.ht_cap);
 
-       if (ieee80211_vif_is_mesh(&sdata->vif) && params->plink_action) {
-               switch (params->plink_action) {
-               case PLINK_ACTION_OPEN:
-                       mesh_plink_open(sta);
-                       break;
-               case PLINK_ACTION_BLOCK:
-                       mesh_plink_block(sta);
-                       break;
-               }
+       if (ieee80211_vif_is_mesh(&sdata->vif)) {
+               if (sdata->u.mesh.security & IEEE80211_MESH_SEC_SECURED)
+                       switch (params->plink_state) {
+                       case PLINK_LISTEN:
+                       case PLINK_ESTAB:
+                       case PLINK_BLOCKED:
+                               sta->plink_state = params->plink_state;
+                               break;
+                       default:
+                               /*  nothing  */
+                               break;
+                       }
+               else
+                       switch (params->plink_action) {
+                       case PLINK_ACTION_OPEN:
+                               mesh_plink_open(sta);
+                               break;
+                       case PLINK_ACTION_BLOCK:
+                               mesh_plink_block(sta);
+                               break;
+                       }
        }
 }
 

diff --git a/net/mac80211/sta_info.h b/net/mac80211/sta_info.h
index af1a7f8c86757174c37a138b99916ee644825135..f00b4dcb49d7f9fd23b762eb81acfc06c0b40dc5 100644 (file)
--- a/net/mac80211/sta_info.h
+++ b/net/mac80211/sta_info.h
@@ -173,29 +173,6 @@ struct sta_ampdu_mlme {
 };
 
 
-/**
- * enum plink_state - state of a mesh peer link finite state machine
- *
- * @PLINK_LISTEN: initial state, considered the implicit state of non existant
- *     mesh peer links
- * @PLINK_OPN_SNT: mesh plink open frame has been sent to this mesh peer
- * @PLINK_OPN_RCVD: mesh plink open frame has been received from this mesh peer
- * @PLINK_CNF_RCVD: mesh plink confirm frame has been received from this mesh
- *     peer
- * @PLINK_ESTAB: mesh peer link is established
- * @PLINK_HOLDING: mesh peer link is being closed or cancelled
- * @PLINK_BLOCKED: all frames transmitted from this mesh plink are discarded
- */
-enum plink_state {
-       PLINK_LISTEN,
-       PLINK_OPN_SNT,
-       PLINK_OPN_RCVD,
-       PLINK_CNF_RCVD,
-       PLINK_ESTAB,
-       PLINK_HOLDING,
-       PLINK_BLOCKED
-};
-
 /**
  * struct sta_info - STA information
  *

diff --git a/net/wireless/nl80211.c b/net/wireless/nl80211.c
index 64efc2d7a7add2f03538709eb9d1be8f5f796e21..f698c1d116e4145cda838e2021c3da702847c3d8 100644 (file)
--- a/net/wireless/nl80211.c
+++ b/net/wireless/nl80211.c
@@ -174,6 +174,7 @@ static const struct nla_policy nl80211_policy[NL80211_ATTR_MAX+1] = {
        [NL80211_ATTR_OFFCHANNEL_TX_OK] = { .type = NLA_FLAG },
        [NL80211_ATTR_KEY_DEFAULT_TYPES] = { .type = NLA_NESTED },
        [NL80211_ATTR_WOWLAN_TRIGGERS] = { .type = NLA_NESTED },
+       [NL80211_ATTR_STA_PLINK_STATE] = { .type = NLA_U8 },
 };
 
 /* policy for the key attributes */
@@ -2247,6 +2248,7 @@ static int nl80211_set_station(struct sk_buff *skb, struct genl_info *info)
        memset(&params, 0, sizeof(params));
 
        params.listen_interval = -1;
+       params.plink_state = PLINK_INVALID;
 
        if (info->attrs[NL80211_ATTR_STA_AID])
                return -EINVAL;
@@ -2278,6 +2280,10 @@ static int nl80211_set_station(struct sk_buff *skb, struct genl_info *info)
                params.plink_action =
                    nla_get_u8(info->attrs[NL80211_ATTR_STA_PLINK_ACTION]);
 
+       if (info->attrs[NL80211_ATTR_STA_PLINK_STATE])
+               params.plink_state =
+                   nla_get_u8(info->attrs[NL80211_ATTR_STA_PLINK_STATE]);
+
        err = get_vlan(info, rdev, &params.vlan);
        if (err)
                goto out;