cfg80211: allow changing station capabilities for unassociated stations

Currently, cfg80211 rejects capability updates for existing entries
and as a result it's impossible to update entries that were added
unassociated, but that is necessary to go through the full station
states from userspace, adding a station before authentication etc.

Fix this by allowing updates to capabilities for stations that the
driver (or mac80211) assigned unassociated state. Drivers setting
the full station state support flag must use the new station type
for proper operation.

Signed-off-by: Ayala Beker <ayala.beker@intel.com>
Signed-off-by: Luca Coelho <luciano.coelho@intel.com>
Signed-off-by: Johannes Berg <johannes.berg@intel.com>

1 files changed, 5 insertions, 2 deletions

diff --git a/net/wireless/nl80211.c b/net/wireless/nl80211.c
index 50cd7707040c..f05ba8b7af61 100644
--- a/net/wireless/nl80211.c
+++ b/net/wireless/nl80211.c
@@ -4009,7 +4009,8 @@ int cfg80211_check_station_change(struct wiphy *wiphy,
                 params->sta_flags_mask &= ~BIT(NL80211_STA_FLAG_TDLS_PEER);
         }
 
-        if (statype != CFG80211_STA_TDLS_PEER_SETUP) {
+        if (statype != CFG80211_STA_TDLS_PEER_SETUP &&
+            statype != CFG80211_STA_AP_CLIENT_UNASSOC) {
                 /* reject other things that can't change */
                 if (params->sta_modify_mask & STATION_PARAM_APPLY_UAPSD)
                         return -EINVAL;
@@ -4021,7 +4022,8 @@ int cfg80211_check_station_change(struct wiphy *wiphy,
                         return -EINVAL;
         }
 
-        if (statype != CFG80211_STA_AP_CLIENT) {
+        if (statype != CFG80211_STA_AP_CLIENT &&
+            statype != CFG80211_STA_AP_CLIENT_UNASSOC) {
                 if (params->vlan)
                         return -EINVAL;
         }
@@ -4033,6 +4035,7 @@ int cfg80211_check_station_change(struct wiphy *wiphy,
                         return -EOPNOTSUPP;
                 break;
         case CFG80211_STA_AP_CLIENT:
+        case CFG80211_STA_AP_CLIENT_UNASSOC:
                 /* accept only the listed bits */
                 if (params->sta_flags_mask &
                                 ~(BIT(NL80211_STA_FLAG_AUTHORIZED) |