nl80211: Add support for sta_add flags_mask

Signed-off-by: Javier Lopez <jlopex@gmail.com>
Signed-off-by: Javier Cardona <javier@cozybit.com>
Signed-off-by: Jason Mobarak <x@jason.mobarak.name>
Signed-off-by: Bob Copeland <me@bobcopeland.com>

diff --git a/src/drivers/driver.h b/src/drivers/driver.h
index f382d231b5206f3fabde56fa2656179e615335e7..94006ac0c9c1c8578d39d697e606de44c9a3f889 100644 (file)
--- a/src/drivers/driver.h
+++ b/src/drivers/driver.h
@@ -1124,6 +1124,7 @@ struct hostapd_sta_add_params {
        int vht_opmode_enabled;
        u8 vht_opmode;
        u32 flags; /* bitmask of WPA_STA_* flags */
+       u32 flags_mask; /* unset bits in flags */
        int set; /* Set STA parameters instead of add */
        u8 qosinfo;
        const u8 *ext_capab;

diff --git a/src/drivers/driver_nl80211.c b/src/drivers/driver_nl80211.c
index 70d6c30eee6e8943e1013a784cdce9cd80744281..0e4fac721612b409a1ad833dc805db7fe233bcf6 100644 (file)
--- a/src/drivers/driver_nl80211.c
+++ b/src/drivers/driver_nl80211.c
@@ -7764,8 +7764,8 @@ static int wpa_driver_nl80211_sta_add(void *priv,
        }
 
        os_memset(&upd, 0, sizeof(upd));
-       upd.mask = sta_flags_nl80211(params->flags);
-       upd.set = upd.mask;
+       upd.set = sta_flags_nl80211(params->flags);
+       upd.mask = upd.set | sta_flags_nl80211(params->flags_mask);
        wpa_printf(MSG_DEBUG, "  * flags set=0x%x mask=0x%x",
                   upd.set, upd.mask);
        NLA_PUT(msg, NL80211_ATTR_STA_FLAGS2, sizeof(upd), &upd);