Merge branch 'x86-platform-for-linus' of git://git.kernel.org/pub/scm/linux/kernel...

[firefly-linux-kernel-4.4.55.git] / net / mac80211 / chan.c

diff --git a/net/mac80211/chan.c b/net/mac80211/chan.c
index c76cf7230c7db06c646c4b13b14b46bf670a0afa..f0f87e5a1d354eef6a705deba7a15c21b491093f 100644 (file)
--- a/net/mac80211/chan.c
+++ b/net/mac80211/chan.c
@@ -41,6 +41,10 @@ __ieee80211_get_channel_mode(struct ieee80211_local *local,
                        if (!sdata->u.ap.beacon)
                                continue;
                        break;
+               case NL80211_IFTYPE_MESH_POINT:
+                       if (!sdata->wdev.mesh_id_len)
+                               continue;
+                       break;
                default:
                        break;
                }