OSDN Git Service
(root)
/
android-x86
/
kernel.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
5140974
)
mac80211: remove pointless chanctx NULL check
author
Johannes Berg
<johannes.berg@intel.com>
Wed, 14 Sep 2016 08:00:23 +0000
(10:00 +0200)
committer
Johannes Berg
<johannes.berg@intel.com>
Thu, 15 Sep 2016 14:46:19 +0000
(16:46 +0200)
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>
net/mac80211/cfg.c
patch
|
blob
|
history
diff --git
a/net/mac80211/cfg.c
b/net/mac80211/cfg.c
index
5d4afea
..
e29ff57
100644
(file)
--- 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;