From 2523749e8f6d19fac6e49cea8fbc4aa04fdca052 Mon Sep 17 00:00:00 2001
From: Thomas Pedersen <thomas@cozybit.com>
Date: Sun, 13 May 2012 22:24:08 -0700
Subject: [PATCH] --- yaml --- r: 313964 b: refs/heads/master c:
 be0f42377ffbc7fbb8bda74755048712a4ee8d8e h: refs/heads/master v: v3

---
 [refs]                    | 2 +-
 trunk/net/mac80211/chan.c | 4 ++++
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index de1efacd36df..4133131aa301 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: dac211ec10d268b9d09000093a9fa2ac1773894f
+refs/heads/master: be0f42377ffbc7fbb8bda74755048712a4ee8d8e
diff --git a/trunk/net/mac80211/chan.c b/trunk/net/mac80211/chan.c
index c76cf7230c7d..f0f87e5a1d35 100644
--- a/trunk/net/mac80211/chan.c
+++ b/trunk/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;
 		}