p71924506
/
linux_old1
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

mwifiex: store permanant mac address in adapter structure 

This would be used to set mac address while changing virtual
interface to different types.

Signed-off-by: Avinash Patil <patila@marvell.com>
Signed-off-by: Amitkumar Karwar <akarwar@marvell.com>
Signed-off-by: Cathy Luo <cluo@marvell.com>
Signed-off-by: Kalle Valo <kvalo@codeaurora.org>
This commit is contained in:
Avinash Patil 2015-01-28 15:42:01 +05:30 committed by Kalle Valo
parent 4facc34a1f
commit 8d05eb2220
5 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
drivers/net/wireless/mwifiex/cfg80211.c
View File

@ -2974,7 +2974,7 @@ int mwifiex_register_cfg80211(struct mwifiex_adapter *adapter)
wiphy->cipher_suites = mwifiex_cipher_suites; wiphy->cipher_suites = mwifiex_cipher_suites;
wiphy->n_cipher_suites = ARRAY_SIZE(mwifiex_cipher_suites); wiphy->n_cipher_suites = ARRAY_SIZE(mwifiex_cipher_suites);
memcpy(wiphy->perm_addr, priv->curr_addr, ETH_ALEN); ether_addr_copy(wiphy->perm_addr, adapter->perm_addr);
wiphy->signal_type = CFG80211_SIGNAL_TYPE_MBM; wiphy->signal_type = CFG80211_SIGNAL_TYPE_MBM;
wiphy->flags |= WIPHY_FLAG_HAVE_AP_SME | wiphy->flags |= WIPHY_FLAG_HAVE_AP_SME |
WIPHY_FLAG_AP_PROBE_RESP_OFFLOAD | WIPHY_FLAG_AP_PROBE_RESP_OFFLOAD |

4
drivers/net/wireless/mwifiex/cmdevt.c
View File

@ -1582,9 +1582,7 @@ int mwifiex_ret_get_hw_spec(struct mwifiex_private *priv,
le16_to_cpu(hw_spec->hw_if_version), le16_to_cpu(hw_spec->hw_if_version),
le16_to_cpu(hw_spec->version)); le16_to_cpu(hw_spec->version));
if (priv->curr_addr[0] == 0xff) ether_addr_copy(priv->adapter->perm_addr, hw_spec->permanent_addr);
memmove(priv->curr_addr, hw_spec->permanent_addr, ETH_ALEN);
adapter->region_code = le16_to_cpu(hw_spec->region_code); adapter->region_code = le16_to_cpu(hw_spec->region_code);
for (i = 0; i < MWIFIEX_MAX_REGION_CODE; i++) for (i = 0; i < MWIFIEX_MAX_REGION_CODE; i++)

1
drivers/net/wireless/mwifiex/init.c
View File

@ -297,6 +297,7 @@ static void mwifiex_init_adapter(struct mwifiex_adapter *adapter)
adapter->ext_scan = false; adapter->ext_scan = false;
adapter->key_api_major_ver = 0; adapter->key_api_major_ver = 0;
adapter->key_api_minor_ver = 0; adapter->key_api_minor_ver = 0;
memset(adapter->perm_addr, 0xff, ETH_ALEN);
setup_timer(&adapter->wakeup_timer, wakeup_timer_fn, setup_timer(&adapter->wakeup_timer, wakeup_timer_fn,
(unsigned long)adapter); (unsigned long)adapter);

1
drivers/net/wireless/mwifiex/main.c
View File

@ -975,6 +975,7 @@ void mwifiex_init_priv_params(struct mwifiex_private *priv,
priv->assocresp_idx = MWIFIEX_AUTO_IDX_MASK; priv->assocresp_idx = MWIFIEX_AUTO_IDX_MASK;
priv->rsn_idx = MWIFIEX_AUTO_IDX_MASK; priv->rsn_idx = MWIFIEX_AUTO_IDX_MASK;
priv->num_tx_timeout = 0; priv->num_tx_timeout = 0;
ether_addr_copy(priv->curr_addr, priv->adapter->perm_addr);
memcpy(dev->dev_addr, priv->curr_addr, ETH_ALEN); memcpy(dev->dev_addr, priv->curr_addr, ETH_ALEN);
if (GET_BSS_ROLE(priv) == MWIFIEX_BSS_ROLE_STA || if (GET_BSS_ROLE(priv) == MWIFIEX_BSS_ROLE_STA ||

1
drivers/net/wireless/mwifiex/main.h
View File

@ -737,6 +737,7 @@ struct mwifiex_adapter {
int winner; int winner;
struct device *dev; struct device *dev;
struct wiphy *wiphy; struct wiphy *wiphy;
u8 perm_addr[ETH_ALEN];
bool surprise_removed; bool surprise_removed;
u32 fw_release_number; u32 fw_release_number;
u16 init_wait_q_woken; u16 init_wait_q_woken;