From: Yogesh Ashok Powar <yogeshp@marvell.com>
Date: Fri, 25 Jan 2013 10:50:12 +0000 (+0530)
Subject: mwl8k: set mac type to MWL8K_MAC_TYPE_SECONDARY_CLIENT
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=af458831c49d634027811b6cf9072cdcd03961e8;p=GitHub%2Fmt8127%2Fandroid_kernel_alcatel_ttab.git

mwl8k: set mac type to MWL8K_MAC_TYPE_SECONDARY_CLIENT

Set mac type for station interface on AP firmware
as secondary. This allows the firmware to set specific
characteristics for the STA interface.

Signed-off-by: Yogesh Ashok Powar <yogeshp@marvell.com>
Signed-off-by: Nishant Sarmukadam <nishants@marvell.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
---

diff --git a/drivers/net/wireless/mwl8k.c b/drivers/net/wireless/mwl8k.c
index 84207a8e5e0a..4d3f140b4d32 100644
--- a/drivers/net/wireless/mwl8k.c
+++ b/drivers/net/wireless/mwl8k.c
@@ -3538,7 +3538,10 @@ static int mwl8k_cmd_update_mac_addr(struct ieee80211_hw *hw,
 	mac_type = MWL8K_MAC_TYPE_PRIMARY_AP;
 	if (vif != NULL && vif->type == NL80211_IFTYPE_STATION) {
 		if (mwl8k_vif->macid + 1 == ffs(priv->sta_macids_supported))
-			mac_type = MWL8K_MAC_TYPE_PRIMARY_CLIENT;
+			if (priv->ap_fw)
+				mac_type = MWL8K_MAC_TYPE_SECONDARY_CLIENT;
+			else
+				mac_type = MWL8K_MAC_TYPE_PRIMARY_CLIENT;
 		else
 			mac_type = MWL8K_MAC_TYPE_SECONDARY_CLIENT;
 	} else if (vif != NULL && vif->type == NL80211_IFTYPE_AP) {