Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 831e85f3 authored by Ilan Peer's avatar Ilan Peer Committed by Johannes Berg
Browse files

iwlwifi: mvm: Add support for additional addresses 



Use the number of addresses (max 5) from the NVM
instead of limiting to 2 artificially.

Signed-off-by: default avatarIlan Peer <ilan.peer@intel.com>
Reviewed-by: default avatarEmmanuel Grumbach <emmanuel.grumbach@intel.com>
Signed-off-by: default avatarJohannes Berg <johannes.berg@intel.com>
parent 6e6cc9f3

drivers/net/wireless/iwlwifi/mvm/mac80211.c

+9 −5
Original line number Diff line number Diff line
@@ -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++;

	}

drivers/net/wireless/iwlwifi/mvm/mvm.h

+1 −1
Original line number Diff line number Diff line
@@ -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