summaryrefslogtreecommitdiff
path: root/net/mac80211/mlme.c
diff options
context:
space:
mode:
authorFelix Fietkau <nbd@openwrt.org>2010-12-02 23:01:07 +0300
committerJohn W. Linville <linville@tuxdriver.com>2010-12-06 23:58:43 +0300
commit75706d0e9d19601534446982b70102bb9327169b (patch)
tree9379d9325198b2afab9d83bbb684fe7cdb2cd800 /net/mac80211/mlme.c
parentaf5568843594fb71055debe36e521fa8072fcecc (diff)
downloadlinux-75706d0e9d19601534446982b70102bb9327169b.tar.xz
mac80211: remove a redundant check
ieee80211_is_nullfunc() implies ieee80211_is_data() Signed-off-by: Felix Fietkau <nbd@openwrt.org> Signed-off-by: John W. Linville <linville@tuxdriver.com>
Diffstat (limited to 'net/mac80211/mlme.c')
-rw-r--r--net/mac80211/mlme.c3
1 files changed, 1 insertions, 2 deletions
diff --git a/net/mac80211/mlme.c b/net/mac80211/mlme.c
index 794807914940..f570801514f1 100644
--- a/net/mac80211/mlme.c
+++ b/net/mac80211/mlme.c
@@ -1067,8 +1067,7 @@ static void ieee80211_reset_ap_probe(struct ieee80211_sub_if_data *sdata)
void ieee80211_sta_tx_notify(struct ieee80211_sub_if_data *sdata,
struct ieee80211_hdr *hdr)
{
- if (!ieee80211_is_data(hdr->frame_control) &&
- !ieee80211_is_nullfunc(hdr->frame_control))
+ if (!ieee80211_is_data(hdr->frame_control))
return;
ieee80211_sta_reset_conn_monitor(sdata);