diff options
| author |   Jussi Kivilinna <jussi.kivilinna@mbnet.fi> | 2009-08-28 12:59:26 +0300 |
|---|---|---|
| committer |   John W. Linville <linville@tuxdriver.com> | 2009-08-28 14:40:57 -0400 |
| commit | 9f77ccab57534f45b0289ceae3a6b85478d14182 (patch) | |
| tree | 1e155ec129d770d60db85d59e58eaf4ea178838b /drivers/net/wireless/rndis_wlan.c | |
| parent | rndis_wlan: set ieee80211_ptr->iftype in rndis_change_virtual_intf (diff) | |
| download | linux-dev-9f77ccab57534f45b0289ceae3a6b85478d14182.tar.xz linux-dev-9f77ccab57534f45b0289ceae3a6b85478d14182.zip | |
rndis_wlan: enable infrastructure before setting random essid
Random essid must be set to turn on radio when not connected. If device is
in ad-hoc mode, this results 'media connect' indications with the random
essid which should be ignored.
Signed-off-by: Jussi Kivilinna <jussi.kivilinna@mbnet.fi>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
Diffstat (limited to 'drivers/net/wireless/rndis_wlan.c')
| -rw-r--r-- | drivers/net/wireless/rndis_wlan.c | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/drivers/net/wireless/rndis_wlan.c b/drivers/net/wireless/rndis_wlan.c index d11762011dc2..c5a674d8d1fb 100644 --- a/drivers/net/wireless/rndis_wlan.c +++ b/drivers/net/wireless/rndis_wlan.c @@ -921,6 +921,7 @@ static int freq_to_dsconfig(struct iw_freq *freq, unsigned int *dsconfig) /* * common functions */ +static int set_infra_mode(struct usbnet *usbdev, int mode); static void restore_keys(struct usbnet *usbdev); static int rndis_check_bssid_list(struct usbnet *usbdev); @@ -1014,6 +1015,11 @@ static int disassociate(struct usbnet *usbdev, int reset_ssid) /* disassociate causes radio to be turned off; if reset_ssid * is given, set random ssid to enable radio */ if (reset_ssid) { + /* Set device to infrastructure mode so we don't get ad-hoc + * 'media connect' indications with the random ssid. + */ + set_infra_mode(usbdev, NDIS_80211_INFRA_INFRA); + ssid.length = cpu_to_le32(sizeof(ssid.essid)); get_random_bytes(&ssid.essid[2], sizeof(ssid.essid)-2); ssid.essid[0] = 0x1; |