nl80211: Send STA flags to kernel on station addition
authorArik Nemtsov <arik@wizery.com>
Tue, 12 Jul 2011 17:28:31 +0000 (20:28 +0300)
committerJouni Malinen <j@w1.fi>
Tue, 12 Jul 2011 17:28:31 +0000 (20:28 +0300)
Send STA flags to kernel when adding a new station. This ensures
stations are added with up to date flags by kernel drivers.

Signed-off-by: Arik Nemtsov <arik@wizery.com>
src/drivers/driver_nl80211.c

index 50eac8a..1da5092 100644 (file)
@@ -3802,12 +3802,30 @@ nla_put_failure:
 }
 
 
+static u32 sta_flags_nl80211(int flags)
+{
+       u32 f = 0;
+
+       if (flags & WPA_STA_AUTHORIZED)
+               f |= BIT(NL80211_STA_FLAG_AUTHORIZED);
+       if (flags & WPA_STA_WMM)
+               f |= BIT(NL80211_STA_FLAG_WME);
+       if (flags & WPA_STA_SHORT_PREAMBLE)
+               f |= BIT(NL80211_STA_FLAG_SHORT_PREAMBLE);
+       if (flags & WPA_STA_MFP)
+               f |= BIT(NL80211_STA_FLAG_MFP);
+
+       return f;
+}
+
+
 static int wpa_driver_nl80211_sta_add(void *priv,
                                      struct hostapd_sta_add_params *params)
 {
        struct i802_bss *bss = priv;
        struct wpa_driver_nl80211_data *drv = bss->drv;
        struct nl_msg *msg;
+       struct nl80211_sta_flag_update upd;
        int ret = -ENOBUFS;
 
        msg = nlmsg_alloc();
@@ -3830,6 +3848,11 @@ static int wpa_driver_nl80211_sta_add(void *priv,
                        params->ht_capabilities);
        }
 
+       os_memset(&upd, 0, sizeof(upd));
+       upd.mask = sta_flags_nl80211(params->flags);
+       upd.set = upd.mask;
+       NLA_PUT(msg, NL80211_ATTR_STA_FLAGS2, sizeof(upd), &upd);
+
        ret = send_and_recv_msgs(drv, msg, NULL, NULL);
        if (ret)
                wpa_printf(MSG_DEBUG, "nl80211: NL80211_CMD_NEW_STATION "
@@ -4417,23 +4440,6 @@ static int wpa_driver_nl80211_hapd_send_eapol(
 }
 
 
-static u32 sta_flags_nl80211(int flags)
-{
-       u32 f = 0;
-
-       if (flags & WPA_STA_AUTHORIZED)
-               f |= BIT(NL80211_STA_FLAG_AUTHORIZED);
-       if (flags & WPA_STA_WMM)
-               f |= BIT(NL80211_STA_FLAG_WME);
-       if (flags & WPA_STA_SHORT_PREAMBLE)
-               f |= BIT(NL80211_STA_FLAG_SHORT_PREAMBLE);
-       if (flags & WPA_STA_MFP)
-               f |= BIT(NL80211_STA_FLAG_MFP);
-
-       return f;
-}
-
-
 static int wpa_driver_nl80211_sta_set_flags(void *priv, const u8 *addr,
                                            int total_flags,
                                            int flags_or, int flags_and)