projects
/
firefly-linux-kernel-4.4.55.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge tag 'v4.0' into for_next
[firefly-linux-kernel-4.4.55.git]
/
net
/
mac80211
/
util.c
diff --git
a/net/mac80211/util.c
b/net/mac80211/util.c
index 8428f4a954795657a32a24f77a0f9c9ae6591b7e..747bdcf72e92788574ec3e2e635b5e6b96cb75f0 100644
(file)
--- a/
net/mac80211/util.c
+++ b/
net/mac80211/util.c
@@
-3178,7
+3178,7
@@
int ieee80211_check_combinations(struct ieee80211_sub_if_data *sdata,
wdev_iter = &sdata_iter->wdev;
if (sdata_iter == sdata ||
-
rcu_access_pointer(sdata_iter->vif.chanctx_conf) == NULL
||
+
!ieee80211_sdata_running(sdata_iter)
||
local->hw.wiphy->software_iftypes & BIT(wdev_iter->iftype))
continue;