]> git.proxmox.com Git - mirror_ubuntu-hirsute-kernel.git/commitdiff
mac80211: remove unneeded check
authorDan Carpenter <error27@gmail.com>
Mon, 7 Feb 2011 19:03:35 +0000 (22:03 +0300)
committerJohn 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

index 291516807fc43fa2397301f0efdbcb423c32adc7..38e593939727398473e43af52df920c82d8854c6 100644 (file)
@@ -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