summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJohannes Berg <johannes.berg@intel.com>2016-09-14 10:00:23 +0200
committerJohannes Berg <johannes.berg@intel.com>2016-09-15 16:46:19 +0200
commit8826fef95bd5f846f7745d9ce1e3009927ec0cb8 (patch)
tree2cef418cc9d2f1bb6f58dc4db9dbd27870cd1fdd
parent5140974dca69f0eace465bccd93891ca242a7e61 (diff)
downloadblackbird-op-linux-8826fef95bd5f846f7745d9ce1e3009927ec0cb8.tar.gz
blackbird-op-linux-8826fef95bd5f846f7745d9ce1e3009927ec0cb8.zip
mac80211: remove pointless chanctx NULL check
If chanctx is derived as container_of() from a non-NULL pointer, it can't ever be NULL. Since we checked conf before, that's true here, so remove the useless NULL check. Signed-off-by: Johannes Berg <johannes.berg@intel.com>
-rw-r--r--net/mac80211/cfg.c4
1 files changed, 0 insertions, 4 deletions
diff --git a/net/mac80211/cfg.c b/net/mac80211/cfg.c
index 5d4afead804e..e29ff5749944 100644
--- a/net/mac80211/cfg.c
+++ b/net/mac80211/cfg.c
@@ -2961,10 +2961,6 @@ __ieee80211_channel_switch(struct wiphy *wiphy, struct net_device *dev,
}
chanctx = container_of(conf, struct ieee80211_chanctx, conf);
- if (!chanctx) {
- err = -EBUSY;
- goto out;
- }
ch_switch.timestamp = 0;
ch_switch.device_timestamp = 0;
OpenPOWER on IntegriCloud