diff options
Diffstat (limited to 'drivers/net')
-rw-r--r-- | drivers/net/wireless/iwmc3200wifi/rx.c | 4 | ||||
-rw-r--r-- | drivers/net/wireless/rndis_wlan.c | 3 |
2 files changed, 4 insertions, 3 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, |
diff --git a/drivers/net/wireless/rndis_wlan.c b/drivers/net/wireless/rndis_wlan.c index 518542b4bf9e..29f938930667 100644 --- a/drivers/net/wireless/rndis_wlan.c +++ b/drivers/net/wireless/rndis_wlan.c | |||
@@ -2830,7 +2830,8 @@ static void rndis_wlan_do_link_up_work(struct usbnet *usbdev) | |||
2830 | req_ie_len, resp_ie, | 2830 | req_ie_len, resp_ie, |
2831 | resp_ie_len, 0, GFP_KERNEL); | 2831 | resp_ie_len, 0, GFP_KERNEL); |
2832 | else | 2832 | else |
2833 | cfg80211_roamed(usbdev->net, bssid, req_ie, req_ie_len, | 2833 | cfg80211_roamed(usbdev->net, NULL, bssid, |
2834 | req_ie, req_ie_len, | ||
2834 | resp_ie, resp_ie_len, GFP_KERNEL); | 2835 | resp_ie, resp_ie_len, GFP_KERNEL); |
2835 | } else if (priv->infra_mode == NDIS_80211_INFRA_ADHOC) | 2836 | } else if (priv->infra_mode == NDIS_80211_INFRA_ADHOC) |
2836 | cfg80211_ibss_joined(usbdev->net, bssid, GFP_KERNEL); | 2837 | cfg80211_ibss_joined(usbdev->net, bssid, GFP_KERNEL); |