mac80211: remove a redundant check
authorFelix Fietkau <nbd@openwrt.org>
Thu, 2 Dec 2010 20:01:07 +0000 (21:01 +0100)
committerJohn W. Linville <linville@tuxdriver.com>
Mon, 6 Dec 2010 20:58:43 +0000 (15:58 -0500)
ieee80211_is_nullfunc() implies ieee80211_is_data()

Signed-off-by: Felix Fietkau <nbd@openwrt.org>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
net/mac80211/mlme.c

index 794807914940ef0b13022363a4c487f10c630cce..f570801514f1b1ecf57812513835179a4a3ea763 100644 (file)
@@ -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);