Minki/linux
1
0
Fork 1
mirror of https://github.com/torvalds/linux.git synced 2024-11-01 01:31:44 +00:00
Code Issues Packages Projects Releases Wiki Activity

mac80211: remove sent_ps_buffered

Browse Source 
This variable is set once, and tested once.
However, the code path that can set it is
mutually exclusive with the code path that
tests it, so the test is always true. Thus
we also don't need to set it either and can
just remove the variable.

Signed-off-by: Johannes Berg <johannes@sipsolutions.net>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
This commit is contained in:
Johannes Berg 2009-10-30 12:56:02 +01:00 committed by John W. Linville
parent 22403def13
commit ff9458d3ec
2 changed files with 3 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
net/mac80211/ieee80211_i.h
View File

@ -176,7 +176,6 @@ struct ieee80211_rx_data {
struct ieee80211_rate *rate; struct ieee80211_rate *rate;
unsigned int flags; unsigned int flags;
int sent_ps_buffered;
int queue; int queue;
u32 tkip_iv32; u32 tkip_iv32;
u16 tkip_iv16; u16 tkip_iv16;

8
net/mac80211/rx.c
View File

@ -789,7 +789,7 @@ static void ap_sta_ps_start(struct sta_info *sta)
#endif /* CONFIG_MAC80211_VERBOSE_PS_DEBUG */ #endif /* CONFIG_MAC80211_VERBOSE_PS_DEBUG */
} }
static int ap_sta_ps_end(struct sta_info *sta) static void ap_sta_ps_end(struct sta_info *sta)
{ {
struct ieee80211_sub_if_data *sdata = sta->sdata; struct ieee80211_sub_if_data *sdata = sta->sdata;
struct ieee80211_local *local = sdata->local; struct ieee80211_local *local = sdata->local;
@ -819,8 +819,6 @@ static int ap_sta_ps_end(struct sta_info *sta)
"since STA not sleeping anymore\n", sdata->dev->name, "since STA not sleeping anymore\n", sdata->dev->name,
sta->sta.addr, sta->sta.aid, sent - buffered, buffered); sta->sta.addr, sta->sta.aid, sent - buffered, buffered);
#endif /* CONFIG_MAC80211_VERBOSE_PS_DEBUG */ #endif /* CONFIG_MAC80211_VERBOSE_PS_DEBUG */
return sent;
} }
static ieee80211_rx_result debug_noinline static ieee80211_rx_result debug_noinline
@ -879,7 +877,7 @@ ieee80211_rx_h_sta_process(struct ieee80211_rx_data *rx)
*/ */
if (ieee80211_is_data(hdr->frame_control) && if (ieee80211_is_data(hdr->frame_control) &&
!ieee80211_has_pm(hdr->frame_control)) !ieee80211_has_pm(hdr->frame_control))
rx->sent_ps_buffered += ap_sta_ps_end(sta); ap_sta_ps_end(sta);
} else { } else {
if (ieee80211_has_pm(hdr->frame_control)) if (ieee80211_has_pm(hdr->frame_control))
ap_sta_ps_start(sta); ap_sta_ps_start(sta);
@ -1147,7 +1145,7 @@ ieee80211_rx_h_ps_poll(struct ieee80211_rx_data *rx)
if (no_pending_pkts) if (no_pending_pkts)
sta_info_clear_tim_bit(rx->sta); sta_info_clear_tim_bit(rx->sta);
#ifdef CONFIG_MAC80211_VERBOSE_PS_DEBUG #ifdef CONFIG_MAC80211_VERBOSE_PS_DEBUG
} else if (!rx->sent_ps_buffered) { } else {
/* /*
* FIXME: This can be the result of a race condition between * FIXME: This can be the result of a race condition between
* us expiring a frame and the station polling for it. * us expiring a frame and the station polling for it.