From e8224e352a6f6f028909d996d047f0bdabe17732 Mon Sep 17 00:00:00 2001
From: Ilan Peer <ilan.peer@intel.com>
Date: Thu, 7 Feb 2013 17:09:09 +0200
Subject: [PATCH] --- yaml --- r: 368455 b: refs/heads/master c:
 831e85f3fe078297ba452e12c0dba96008c59438 h: refs/heads/master i:   368453:
 b7615c119619a6f4ef9630067ea388782790dcc5   368451:
 4f8e8527df602c9d932e4be00d86c1d93cfb6b9a   368447:
 331d5957bc81213b8b52aba03ada4c6820dc7ed4 v: v3

---
 [refs]                                            |  2 +-
 trunk/drivers/net/wireless/iwlwifi/mvm/mac80211.c | 14 +++++++++-----
 trunk/drivers/net/wireless/iwlwifi/mvm/mvm.h      |  2 +-
 3 files changed, 11 insertions(+), 7 deletions(-)

diff --git a/[refs] b/[refs]
index 72c41bd54b52..938cb9f67967 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 6e6cc9f319bf81b292ceb281228ab1d261172cac
+refs/heads/master: 831e85f3fe078297ba452e12c0dba96008c59438
diff --git a/trunk/drivers/net/wireless/iwlwifi/mvm/mac80211.c b/trunk/drivers/net/wireless/iwlwifi/mvm/mac80211.c
index 65fc5531f7ba..d08ae2604d7b 100644
--- a/trunk/drivers/net/wireless/iwlwifi/mvm/mac80211.c
+++ b/trunk/drivers/net/wireless/iwlwifi/mvm/mac80211.c
@@ -105,7 +105,7 @@ static const struct ieee80211_iface_combination iwl_mvm_iface_combinations[] = {
 int iwl_mvm_mac_setup_register(struct iwl_mvm *mvm)
 {
 	struct ieee80211_hw *hw = mvm->hw;
-	int num_mac, ret;
+	int num_mac, ret, i;
 
 	/* Tell mac80211 our characteristics */
 	hw->flags = IEEE80211_HW_SIGNAL_DBM |
@@ -156,11 +156,15 @@ int iwl_mvm_mac_setup_register(struct iwl_mvm *mvm)
 	memcpy(mvm->addresses[0].addr, mvm->nvm_data->hw_addr, ETH_ALEN);
 	hw->wiphy->addresses = mvm->addresses;
 	hw->wiphy->n_addresses = 1;
-	num_mac = mvm->nvm_data->n_hw_addrs;
-	if (num_mac > 1) {
-		memcpy(mvm->addresses[1].addr, mvm->addresses[0].addr,
+
+	/* Extract additional MAC addresses if available */
+	num_mac = (mvm->nvm_data->n_hw_addrs > 1) ?
+		min(IWL_MVM_MAX_ADDRESSES, mvm->nvm_data->n_hw_addrs) : 1;
+
+	for (i = 1; i < num_mac; i++) {
+		memcpy(mvm->addresses[i].addr, mvm->addresses[i-1].addr,
 		       ETH_ALEN);
-		mvm->addresses[1].addr[5]++;
+		mvm->addresses[i].addr[5]++;
 		hw->wiphy->n_addresses++;
 	}
 
diff --git a/trunk/drivers/net/wireless/iwlwifi/mvm/mvm.h b/trunk/drivers/net/wireless/iwlwifi/mvm/mvm.h
index 23c39eab4d97..efe5da992897 100644
--- a/trunk/drivers/net/wireless/iwlwifi/mvm/mvm.h
+++ b/trunk/drivers/net/wireless/iwlwifi/mvm/mvm.h
@@ -79,7 +79,7 @@
 #include "fw-api.h"
 
 #define IWL_INVALID_MAC80211_QUEUE	0xff
-#define IWL_MVM_MAX_ADDRESSES		2
+#define IWL_MVM_MAX_ADDRESSES		5
 /* RSSI offset for WkP */
 #define IWL_RSSI_OFFSET 50