From a6abe7fcc7ef4eb3652f1db26b21dacf4c489655 Mon Sep 17 00:00:00 2001
From: Christian Lamparter <chunkeey@googlemail.com>
Date: Sat, 22 Dec 2012 04:35:24 +0100
Subject: [PATCH] --- yaml --- r: 348381 b: refs/heads/master c:
 6c653f66772c39c5e25db715bbd4730596fccd9e h: refs/heads/master i:   348379:
 d19af9b45d705603a73065b9516dfe60282fb4f8 v: v3

---
 [refs]                                       | 2 +-
 trunk/drivers/net/wireless/ath/carl9170/fw.c | 6 +++++-
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 99e4afb84bd0..f1e8f2985685 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 4c3de5920c486b8eefa6187ee6a181864c161100
+refs/heads/master: 6c653f66772c39c5e25db715bbd4730596fccd9e
diff --git a/trunk/drivers/net/wireless/ath/carl9170/fw.c b/trunk/drivers/net/wireless/ath/carl9170/fw.c
index aaebecd19e59..63fd9af3fd39 100644
--- a/trunk/drivers/net/wireless/ath/carl9170/fw.c
+++ b/trunk/drivers/net/wireless/ath/carl9170/fw.c
@@ -336,8 +336,12 @@ static int carl9170_fw(struct ar9170 *ar, const __u8 *data, size_t len)
 		if (SUPP(CARL9170FW_WLANTX_CAB)) {
 			if_comb_types |=
 				BIT(NL80211_IFTYPE_AP) |
-				BIT(NL80211_IFTYPE_MESH_POINT) |
 				BIT(NL80211_IFTYPE_P2P_GO);
+
+#ifdef CONFIG_MAC80211_MESH
+			if_comb_types |=
+				BIT(NL80211_IFTYPE_MESH_POINT);
+#endif /* CONFIG_MAC80211_MESH */
 		}
 	}