|
@@ -611,7 +611,7 @@ static void ieee80211_sta_wmm_params(struct ieee80211_local *local,
|
|
|
}
|
|
|
}
|
|
|
|
|
|
-static bool check_tim(struct ieee802_11_elems *elems, u16 aid, bool *is_mc)
|
|
|
+static bool ieee80211_check_tim(struct ieee802_11_elems *elems, u16 aid)
|
|
|
{
|
|
|
u8 mask;
|
|
|
u8 index, indexn1, indexn2;
|
|
@@ -621,9 +621,6 @@ static bool check_tim(struct ieee802_11_elems *elems, u16 aid, bool *is_mc)
|
|
|
index = aid / 8;
|
|
|
mask = 1 << (aid & 7);
|
|
|
|
|
|
- if (tim->bitmap_ctrl & 0x01)
|
|
|
- *is_mc = true;
|
|
|
-
|
|
|
indexn1 = tim->bitmap_ctrl & 0xfe;
|
|
|
indexn2 = elems->tim_len + indexn1 - 4;
|
|
|
|
|
@@ -1840,7 +1837,7 @@ static void ieee80211_rx_mgmt_beacon(struct ieee80211_sub_if_data *sdata,
|
|
|
struct ieee802_11_elems elems;
|
|
|
struct ieee80211_local *local = sdata->local;
|
|
|
u32 changed = 0;
|
|
|
- bool erp_valid, directed_tim, is_mc = false;
|
|
|
+ bool erp_valid, directed_tim;
|
|
|
u8 erp_value = 0;
|
|
|
|
|
|
/* Process beacon from the current BSS */
|
|
@@ -1868,9 +1865,9 @@ static void ieee80211_rx_mgmt_beacon(struct ieee80211_sub_if_data *sdata,
|
|
|
|
|
|
if (local->hw.flags & IEEE80211_HW_PS_NULLFUNC_STACK &&
|
|
|
local->hw.conf.flags & IEEE80211_CONF_PS) {
|
|
|
- directed_tim = check_tim(&elems, ifsta->aid, &is_mc);
|
|
|
+ directed_tim = ieee80211_check_tim(&elems, ifsta->aid);
|
|
|
|
|
|
- if (directed_tim || is_mc) {
|
|
|
+ if (directed_tim) {
|
|
|
local->hw.conf.flags &= ~IEEE80211_CONF_PS;
|
|
|
ieee80211_hw_config(local, IEEE80211_CONF_CHANGE_PS);
|
|
|
ieee80211_send_nullfunc(local, sdata, 0);
|