ath10k: fix aid setup in station mode
authorMichal Kazior <michal.kazior@tieto.com>
Mon, 30 Mar 2015 06:51:57 +0000 (09:51 +0300)
committerKalle Valo <kvalo@qca.qualcomm.com>
Mon, 30 Mar 2015 12:20:33 +0000 (15:20 +0300)
While debugging something else I noticed AID was
set to 0. This could lead to powersave issues in
station mode. Maybe this isn't really necessary
but set it properly just to be sure.

Signed-off-by: Michal Kazior <michal.kazior@tieto.com>
Signed-off-by: Kalle Valo <kvalo@qca.qualcomm.com>
drivers/net/wireless/ath/ath10k/mac.c

index ec26d96054c25e663d53a743b7c1b13aa165d69f..b5c9a10f9f49443121707c6124bca583e4917d58 100644 (file)
@@ -1730,12 +1730,18 @@ static void ath10k_peer_assoc_h_basic(struct ath10k *ar,
                                      struct wmi_peer_assoc_complete_arg *arg)
 {
        struct ath10k_vif *arvif = ath10k_vif_to_arvif(vif);
+       u32 aid;
 
        lockdep_assert_held(&ar->conf_mutex);
 
+       if (vif->type == NL80211_IFTYPE_STATION)
+               aid = vif->bss_conf.aid;
+       else
+               aid = sta->aid;
+
        ether_addr_copy(arg->addr, sta->addr);
        arg->vdev_id = arvif->vdev_id;
-       arg->peer_aid = sta->aid;
+       arg->peer_aid = aid;
        arg->peer_flags |= WMI_PEER_AUTH;
        arg->peer_listen_intval = ath10k_peer_assoc_h_listen_intval(ar, vif);
        arg->peer_num_spatial_streams = 1;