diff options
| author | Jussi Kivilinna <jussi.kivilinna@mbnet.fi> | 2011-11-19 06:04:11 -0500 |
|---|---|---|
| committer | John W. Linville <linville@tuxdriver.com> | 2011-11-21 16:22:07 -0500 |
| commit | 6f104a081b18ffc7c666be2a1cda682f83d7c8b7 (patch) | |
| tree | 1ac747ecde3b4339b9507fa40a2ea4c3e4b52380 | |
| parent | cb82a66d0f35eb3f510c3f770d6fbdc3b17ab041 (diff) | |
rndis_wlan: pass channel info to cfg80211_roamed()
cfg80211_roamed() now has channel parameter so add passing current channel
info.
Signed-off-by: Jussi Kivilinna <jussi.kivilinna@mbnet.fi>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
| -rw-r--r-- | drivers/net/wireless/rndis_wlan.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/drivers/net/wireless/rndis_wlan.c b/drivers/net/wireless/rndis_wlan.c index 37c4c4087572..d5bfc8d2bcad 100644 --- a/drivers/net/wireless/rndis_wlan.c +++ b/drivers/net/wireless/rndis_wlan.c | |||
| @@ -2854,8 +2854,9 @@ static void rndis_wlan_do_link_up_work(struct usbnet *usbdev) | |||
| 2854 | req_ie_len, resp_ie, | 2854 | req_ie_len, resp_ie, |
| 2855 | resp_ie_len, 0, GFP_KERNEL); | 2855 | resp_ie_len, 0, GFP_KERNEL); |
| 2856 | else | 2856 | else |
| 2857 | cfg80211_roamed(usbdev->net, NULL, bssid, | 2857 | cfg80211_roamed(usbdev->net, |
| 2858 | req_ie, req_ie_len, | 2858 | get_current_channel(usbdev, NULL), |
| 2859 | bssid, req_ie, req_ie_len, | ||
| 2859 | resp_ie, resp_ie_len, GFP_KERNEL); | 2860 | resp_ie, resp_ie_len, GFP_KERNEL); |
| 2860 | } else if (priv->infra_mode == NDIS_80211_INFRA_ADHOC) | 2861 | } else if (priv->infra_mode == NDIS_80211_INFRA_ADHOC) |
| 2861 | cfg80211_ibss_joined(usbdev->net, bssid, GFP_KERNEL); | 2862 | cfg80211_ibss_joined(usbdev->net, bssid, GFP_KERNEL); |