openkylin
/
linux
mirror of https://gitee.com/openkylin/linux.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

staging: r8712u: Fix driver to support ad-hoc mode 

Driver r8712u is unable to handle ad-hoc mode. The issue is that when
the driver first starts, there will not be an SSID for association.
The fix is to always call the "select and join from scan" routine when
in ad-hoc mode.

Note: Ad-hoc mode worked intermittently before. If the driver had
previously been associated, then things were OK.

Signed-off-by: Jeff Chua <jeff.chua.linux@gmail.com>
Signed-off-by: Larry Finger <Larry.Finger@lwfinger.net>
Cc: Stable <stable@kernel.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
This commit is contained in:
Jeff Chua 2011-04-27 11:25:14 -05:00 committed by Greg Kroah-Hartman
parent 3d51406d08
commit 62819fd948
1 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
drivers/staging/rtl8712/rtl871x_ioctl_set.c
View File

@ -68,7 +68,10 @@ static u8 do_join(struct _adapter *padapter)
pmlmepriv->fw_state |= _FW_UNDER_LINKING; pmlmepriv->fw_state |= _FW_UNDER_LINKING;
pmlmepriv->pscanned = plist; pmlmepriv->pscanned = plist;
pmlmepriv->to_join = true; pmlmepriv->to_join = true;
if (_queue_empty(queue) == true) {
/* adhoc mode will start with an empty queue, but skip checking */
if (!check_fwstate(pmlmepriv, WIFI_ADHOC_STATE) &&
_queue_empty(queue)) {
if (pmlmepriv->fw_state & _FW_UNDER_LINKING) if (pmlmepriv->fw_state & _FW_UNDER_LINKING)
pmlmepriv->fw_state ^= _FW_UNDER_LINKING; pmlmepriv->fw_state ^= _FW_UNDER_LINKING;
/* when set_ssid/set_bssid for do_join(), but scanning queue /* when set_ssid/set_bssid for do_join(), but scanning queue