mac80211: PS processing for every Beacon with our AID in TIM

If the AP includes our AID in the TIM IE, we need to process the
Beacon frame as far as PS is concerned (send PS-Poll or nullfunc data
with PM=0). The previous code skipped this in cases where the CRC
value did not change and it would not change if the AP continues
including our AID in the TIM..

There is no need to count the crc32 value for directed_tim with this
change, so we can remove that part. In order not to change the order
of operations (i.e., update WMM parameters prior to sending PS-Poll),
the CRC match is checked twice as only after the PS processing step,
the rest of the function is skipped if nothing changed in the Beacon.

Signed-off-by: Jouni Malinen <jouni.malinen@atheros.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>

diff --git a/net/mac80211/mlme.c b/net/mac80211/mlme.c
index b61a7819867ef816453dcb32f83a360760add0dc..54a2a1db98a3561df0fc53de454509b8fa2fa497 100644 (file)
--- a/net/mac80211/mlme.c
+++ b/net/mac80211/mlme.c
@@ -1951,16 +1951,13 @@ static void ieee80211_rx_mgmt_beacon(struct ieee80211_sub_if_data *sdata,
                directed_tim = ieee80211_check_tim(elems.tim, elems.tim_len,
                                                   ifmgd->aid);
 
-       ncrc = crc32_be(ncrc, (void *)&directed_tim, sizeof(directed_tim));
+       if (ncrc != ifmgd->beacon_crc) {
+               ieee80211_rx_bss_info(sdata, mgmt, len, rx_status, &elems,
+                                     true);
 
-       if (ncrc == ifmgd->beacon_crc)
-               return;
-       ifmgd->beacon_crc = ncrc;
-
-       ieee80211_rx_bss_info(sdata, mgmt, len, rx_status, &elems, true);
-
-       ieee80211_sta_wmm_params(local, ifmgd, elems.wmm_param,
-                                elems.wmm_param_len);
+               ieee80211_sta_wmm_params(local, ifmgd, elems.wmm_param,
+                                        elems.wmm_param_len);
+       }
 
        if (local->hw.flags & IEEE80211_HW_PS_NULLFUNC_STACK) {
                if (directed_tim) {
@@ -1985,6 +1982,10 @@ static void ieee80211_rx_mgmt_beacon(struct ieee80211_sub_if_data *sdata,
                }
        }
 
+       if (ncrc == ifmgd->beacon_crc)
+               return;
+       ifmgd->beacon_crc = ncrc;
+
        if (elems.erp_info && elems.erp_info_len >= 1) {
                erp_valid = true;
                erp_value = elems.erp_info[0];