diff options
| author | Johannes Berg <johannes.berg@intel.com> | 2010-05-12 03:33:12 -0700 |
|---|---|---|
| committer | Reinette Chatre <reinette.chatre@intel.com> | 2010-06-05 23:14:23 -0700 |
| commit | 3a0b9aad0a8166e9fb23d420fdc08ee2820d4c39 (patch) | |
| tree | ce483eae4ab981f5b24645b791c71a0f94d07643 /drivers/net/wireless/iwlwifi/iwl-agn-lib.c | |
| parent | 7684c4083114e0f0cc02f3a7cbef27b1e29381cd (diff) | |
| download | kernel_samsung_tuna-3a0b9aad0a8166e9fb23d420fdc08ee2820d4c39.zip kernel_samsung_tuna-3a0b9aad0a8166e9fb23d420fdc08ee2820d4c39.tar.gz kernel_samsung_tuna-3a0b9aad0a8166e9fb23d420fdc08ee2820d4c39.tar.bz2 | |
iwlwifi: use virtual interface address for scan
For probe request frames sent during scan, we
should use the virtual interface's mac address
that the scan was initiated on to avoid issues
when the wrong address is used.
Signed-off-by: Johannes Berg <johannes.berg@intel.com>
Signed-off-by: Reinette Chatre <reinette.chatre@intel.com>
Diffstat (limited to 'drivers/net/wireless/iwlwifi/iwl-agn-lib.c')
| -rw-r--r-- | drivers/net/wireless/iwlwifi/iwl-agn-lib.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/drivers/net/wireless/iwlwifi/iwl-agn-lib.c b/drivers/net/wireless/iwlwifi/iwl-agn-lib.c index 57c122d..42e6219 100644 --- a/drivers/net/wireless/iwlwifi/iwl-agn-lib.c +++ b/drivers/net/wireless/iwlwifi/iwl-agn-lib.c @@ -1462,13 +1462,15 @@ void iwlagn_request_scan(struct iwl_priv *priv, struct ieee80211_vif *vif) if (!priv->is_internal_short_scan) { cmd_len = iwl_fill_probe_req(priv, (struct ieee80211_mgmt *)scan->data, + vif->addr, priv->scan_request->ie, priv->scan_request->ie_len, IWL_MAX_SCAN_SIZE - sizeof(*scan)); } else { + /* use bcast addr, will not be transmitted but must be valid */ cmd_len = iwl_fill_probe_req(priv, (struct ieee80211_mgmt *)scan->data, - NULL, 0, + iwl_bcast_addr, NULL, 0, IWL_MAX_SCAN_SIZE - sizeof(*scan)); } |