Skip to content

Commit

Permalink
mac80211: use the correct capability info in ieee80211_set_associated()
Browse files Browse the repository at this point in the history
If an AP is beaconing with different capabilities than the one we get
in the associate response, we were still using the capabilities
received in the beacons.  One example is when the AP is beaconing with
the short slot bit set to zero and then we try to connect to it with
long slot.  In this case, we would keep using long slot until the next
beacon was received.

Fix this by using the correct capability value when calling
ieee80211_handle_bss_capability().  We were using cbss->capability,
but we should use the bss_conf->assoc_capability instead.

Signed-off-by: Luciano Coelho <coelho@ti.com>
  • Loading branch information
Luciano Coelho committed Jun 20, 2012
1 parent 3b7c946 commit c2fda28
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion net/mac80211/mlme.c
Expand Up @@ -1010,7 +1010,7 @@ static void ieee80211_set_associated(struct ieee80211_sub_if_data *sdata,

bss_info_changed |= BSS_CHANGED_BEACON_INT;
bss_info_changed |= ieee80211_handle_bss_capability(sdata,
cbss->capability, bss->has_erp_value, bss->erp_value);
bss_conf->assoc_capability, bss->has_erp_value, bss->erp_value);

sdata->u.mgd.beacon_timeout = usecs_to_jiffies(ieee80211_tu_to_usec(
IEEE80211_BEACON_LOSS_COUNT * bss_conf->beacon_int));
Expand Down

0 comments on commit c2fda28

Please sign in to comment.