Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 9f77ccab authored by Jussi Kivilinna's avatar Jussi Kivilinna Committed by John W. Linville
Browse files

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: default avatarJussi Kivilinna <jussi.kivilinna@mbnet.fi>
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent 16139172

drivers/net/wireless/rndis_wlan.c

+6 −0
Original line number Diff line number Diff line
@@ -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;