summaryrefslogtreecommitdiff
path: root/net
diff options
context:
space:
mode:
authorDan Carpenter <error27@gmail.com>2011-02-07 22:03:35 +0300
committerJohn W. Linville <linville@tuxdriver.com>2011-02-07 16:18:28 -0500
commit3ad97fbcc233a295f2ccc2c6bdeb32323e360a5e (patch)
treeafd41efc01403af33b5c86bd21e74cb881a57571 /net
parent3a2329f2680796b0c09ff207803ea880a481c3a4 (diff)
downloadlinux-3.10-3ad97fbcc233a295f2ccc2c6bdeb32323e360a5e.tar.gz
linux-3.10-3ad97fbcc233a295f2ccc2c6bdeb32323e360a5e.tar.bz2
linux-3.10-3ad97fbcc233a295f2ccc2c6bdeb32323e360a5e.zip
mac80211: remove unneeded check
"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>
Diffstat (limited to 'net')
-rw-r--r--net/mac80211/tx.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/net/mac80211/tx.c b/net/mac80211/tx.c
index 291516807fc..38e59393972 100644
--- 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