projects
/
platform
/
kernel
/
linux-amlogic.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
af55688
)
mac80211: remove a redundant check
author
Felix Fietkau
<nbd@openwrt.org>
Thu, 2 Dec 2010 20:01:07 +0000
(21:01 +0100)
committer
John 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
patch
|
blob
|
history
diff --git
a/net/mac80211/mlme.c
b/net/mac80211/mlme.c
index
7948079
..
f570801
100644
(file)
--- 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);