diff options
| author | David S. Miller <davem@davemloft.net> | 2011-05-25 17:28:55 (GMT) |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2011-05-25 17:28:55 (GMT) |
| commit | 22e95ac87d62bdc65b8a694a23cd4a364689b013 (patch) | |
| tree | 5ac900300ad1d4a8d8118545e3e971862de70ea4 /drivers/net/wireless/rndis_wlan.c | |
| parent | 6b3678354647a653e669746c05765f05d2b90239 (diff) | |
| parent | 31ec97d9cebac804814de298592648f7c18d8281 (diff) | |
| download | linux-fsl-qoriq-22e95ac87d62bdc65b8a694a23cd4a364689b013.tar.xz | |
Merge branch 'for-davem' of ssh://master.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next-2.6
Diffstat (limited to 'drivers/net/wireless/rndis_wlan.c')
| -rw-r--r-- | drivers/net/wireless/rndis_wlan.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/net/wireless/rndis_wlan.c b/drivers/net/wireless/rndis_wlan.c index 518542b..29f9389 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) req_ie_len, resp_ie, resp_ie_len, 0, GFP_KERNEL); else - cfg80211_roamed(usbdev->net, bssid, req_ie, req_ie_len, + cfg80211_roamed(usbdev->net, NULL, bssid, + req_ie, req_ie_len, resp_ie, resp_ie_len, GFP_KERNEL); } else if (priv->infra_mode == NDIS_80211_INFRA_ADHOC) cfg80211_ibss_joined(usbdev->net, bssid, GFP_KERNEL); |