projects
/
platform
/
upstream
/
kernel-adaptation-pc.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
3a2329f
)
mac80211: remove unneeded check
author
Dan Carpenter
<error27@gmail.com>
Mon, 7 Feb 2011 19:03:35 +0000
(22:03 +0300)
committer
John W. Linville
<linville@tuxdriver.com>
Mon, 7 Feb 2011 21:18:28 +0000
(16:18 -0500)
"ap" is the address of sdata->u.ap so it can never be NULL here. Also
we dereferenced it on the previous line. I removed the check.
Signed-off-by: Dan Carpenter <error27@gmail.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
net/mac80211/tx.c
patch
|
blob
|
history
diff --git
a/net/mac80211/tx.c
b/net/mac80211/tx.c
index
2915168
..
38e5939
100644
(file)
--- a/
net/mac80211/tx.c
+++ b/
net/mac80211/tx.c
@@
-2245,7
+2245,7
@@
struct sk_buff *ieee80211_beacon_get_tim(struct ieee80211_hw *hw,
if (sdata->vif.type == NL80211_IFTYPE_AP) {
ap = &sdata->u.ap;
beacon = rcu_dereference(ap->beacon);
- if (
ap &&
beacon) {
+ if (beacon) {
/*
* headroom, head length,
* tail length and maximum TIM length