diff options
| author | Felix Fietkau <nbd@openwrt.org> | 2010-12-02 21:01:07 +0100 |
|---|---|---|
| committer | John W. Linville <linville@tuxdriver.com> | 2010-12-06 15:58:43 -0500 |
| commit | 75706d0e9d19601534446982b70102bb9327169b (patch) | |
| tree | 9379d9325198b2afab9d83bbb684fe7cdb2cd800 /net | |
| parent | af5568843594fb71055debe36e521fa8072fcecc (diff) | |
| download | blackbird-op-linux-75706d0e9d19601534446982b70102bb9327169b.tar.gz blackbird-op-linux-75706d0e9d19601534446982b70102bb9327169b.zip | |
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')
| -rw-r--r-- | net/mac80211/mlme.c | 3 |
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); |
