diff options
| author | John W. Linville <linville@tuxdriver.com> | 2011-05-24 16:47:54 -0400 |
|---|---|---|
| committer | John W. Linville <linville@tuxdriver.com> | 2011-05-24 16:47:54 -0400 |
| commit | 31ec97d9cebac804814de298592648f7c18d8281 (patch) | |
| tree | f725fcce0d5a9d6d7bd64b777de0a44e71773d0e /drivers/net/wireless/iwmc3200wifi | |
| parent | 557eed603159b4e007c57d97fad1333ecebd3c2e (diff) | |
| parent | daf8cf608d57a0b9f22276036e420cc82cf6ab4f (diff) | |
Merge ssh://master.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next-2.6 into for-davem
Diffstat (limited to 'drivers/net/wireless/iwmc3200wifi')
| -rw-r--r-- | drivers/net/wireless/iwmc3200wifi/rx.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/net/wireless/iwmc3200wifi/rx.c b/drivers/net/wireless/iwmc3200wifi/rx.c index 5665a1a9b99e..a414768f40f1 100644 --- a/drivers/net/wireless/iwmc3200wifi/rx.c +++ b/drivers/net/wireless/iwmc3200wifi/rx.c | |||
| @@ -565,7 +565,7 @@ static int iwm_mlme_assoc_complete(struct iwm_priv *iwm, u8 *buf, | |||
| 565 | if (!test_and_clear_bit(IWM_STATUS_SME_CONNECTING, &iwm->status) | 565 | if (!test_and_clear_bit(IWM_STATUS_SME_CONNECTING, &iwm->status) |
| 566 | && iwm->conf.mode == UMAC_MODE_BSS) { | 566 | && iwm->conf.mode == UMAC_MODE_BSS) { |
| 567 | cancel_delayed_work(&iwm->disconnect); | 567 | cancel_delayed_work(&iwm->disconnect); |
| 568 | cfg80211_roamed(iwm_to_ndev(iwm), | 568 | cfg80211_roamed(iwm_to_ndev(iwm), NULL, |
| 569 | complete->bssid, | 569 | complete->bssid, |
| 570 | iwm->req_ie, iwm->req_ie_len, | 570 | iwm->req_ie, iwm->req_ie_len, |
| 571 | iwm->resp_ie, iwm->resp_ie_len, | 571 | iwm->resp_ie, iwm->resp_ie_len, |
| @@ -586,7 +586,7 @@ static int iwm_mlme_assoc_complete(struct iwm_priv *iwm, u8 *buf, | |||
| 586 | WLAN_STATUS_SUCCESS, | 586 | WLAN_STATUS_SUCCESS, |
| 587 | GFP_KERNEL); | 587 | GFP_KERNEL); |
| 588 | else | 588 | else |
| 589 | cfg80211_roamed(iwm_to_ndev(iwm), | 589 | cfg80211_roamed(iwm_to_ndev(iwm), NULL, |
| 590 | complete->bssid, | 590 | complete->bssid, |
| 591 | iwm->req_ie, iwm->req_ie_len, | 591 | iwm->req_ie, iwm->req_ie_len, |
| 592 | iwm->resp_ie, iwm->resp_ie_len, | 592 | iwm->resp_ie, iwm->resp_ie_len, |