|
@@ -1395,19 +1395,13 @@ static int rtw_wx_get_essid(struct net_device *dev,
|
|
if ((check_fwstate(pmlmepriv, _FW_LINKED)) ||
|
|
if ((check_fwstate(pmlmepriv, _FW_LINKED)) ||
|
|
(check_fwstate(pmlmepriv, WIFI_ADHOC_MASTER_STATE))) {
|
|
(check_fwstate(pmlmepriv, WIFI_ADHOC_MASTER_STATE))) {
|
|
len = pcur_bss->Ssid.SsidLength;
|
|
len = pcur_bss->Ssid.SsidLength;
|
|
-
|
|
|
|
- wrqu->essid.length = len;
|
|
|
|
-
|
|
|
|
memcpy(extra, pcur_bss->Ssid.Ssid, len);
|
|
memcpy(extra, pcur_bss->Ssid.Ssid, len);
|
|
-
|
|
|
|
- wrqu->essid.flags = 1;
|
|
|
|
} else {
|
|
} else {
|
|
- ret = -1;
|
|
|
|
- goto exit;
|
|
|
|
|
|
+ len = 0;
|
|
|
|
+ *extra = 0;
|
|
}
|
|
}
|
|
-
|
|
|
|
-exit:
|
|
|
|
-
|
|
|
|
|
|
+ wrqu->essid.length = len;
|
|
|
|
+ wrqu->essid.flags = 1;
|
|
|
|
|
|
return ret;
|
|
return ret;
|
|
}
|
|
}
|