mac80211: remove pointless chanctx NULL check

jmberg-intel · jmberg-intel · commit 8826fef95bd5 · 2016-09-15T16:46:19.000+02:00
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 &lt;johannes.berg@intel.com&gt;
diff --git 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;

Original file line number	Diff line number	Diff line change
`@@ -2961,10 +2961,6 @@ __ieee80211_channel_switch(struct wiphy wiphy, struct net_device dev,`
`2961`	`2961`	`}`
`2962`	`2962`
`2963`	`2963`	`chanctx = container_of(conf, struct ieee80211_chanctx, conf);`
`2964`		`- if (!chanctx) {`
`2965`		`- err = -EBUSY;`
`2966`		`- goto out;`
`2967`		`- }`
`2968`	`2964`
`2969`	`2965`	`ch_switch.timestamp = 0;`
`2970`	`2966`	`ch_switch.device_timestamp = 0;`