Modified the code to avoid warning from mac80211.

Signed-off-by: David Lin <dlin@marvell.com>
kaloz · Aug 25, 2017 · b7a314a · b7a314a
1 parent 97dbb61
commit b7a314a
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git a/core.c b/core.c
@@ -803,8 +803,7 @@ static int mwl_wl_init(struct mwl_priv *priv)
 
 	hw->wiphy->interface_modes = 0;
 	hw->wiphy->interface_modes |= BIT(NL80211_IFTYPE_AP);
-	if (priv->chip_type == MWL8997)
-		hw->wiphy->interface_modes |= BIT(NL80211_IFTYPE_MESH_POINT);
+	hw->wiphy->interface_modes |= BIT(NL80211_IFTYPE_MESH_POINT);
 	hw->wiphy->interface_modes |= BIT(NL80211_IFTYPE_STATION);
 	hw->wiphy->iface_combinations = &ap_if_comb;
 	hw->wiphy->n_iface_combinations = 1;

diff --git a/mac80211.c b/mac80211.c
@@ -143,6 +143,9 @@ static int mwl_mac80211_add_interface(struct ieee80211_hw *hw,
 	switch (vif->type) {
 	case NL80211_IFTYPE_AP:
 	case NL80211_IFTYPE_MESH_POINT:
+		if (vif->type == NL80211_IFTYPE_MESH_POINT)
+			if (priv->chip_type != MWL8997)
+				return -EPERM;
 		macids_supported = priv->ap_macids_supported;
 		break;
 	case NL80211_IFTYPE_STATION: