Merge branch 'for-3.17/core' of git://git.kernel.dk/linux-block

[cascardo/linux.git] / drivers / staging / rtl8712 / rtl871x_ioctl_set.c

diff --git a/drivers/staging/rtl8712/rtl871x_ioctl_set.c b/drivers/staging/rtl8712/rtl871x_ioctl_set.c
index 53a7c8c..9d47eb4 100644 (file)
--- a/drivers/staging/rtl8712/rtl871x_ioctl_set.c
+++ b/drivers/staging/rtl8712/rtl871x_ioctl_set.c
@@ -62,8 +62,8 @@ static u8 do_join(struct _adapter *padapter)
        struct  mlme_priv       *pmlmepriv = &(padapter->mlmepriv);
        struct  __queue *queue  = &(pmlmepriv->scanned_queue);
 
-       phead = get_list_head(queue);
-       plist = get_next(phead);
+       phead = &queue->queue;
+       plist = phead->next;
        pmlmepriv->cur_network.join_res = -2;
        pmlmepriv->fw_state |= _FW_UNDER_LINKING;
        pmlmepriv->pscanned = plist;
@@ -71,7 +71,7 @@ static u8 do_join(struct _adapter *padapter)
 
        /* adhoc mode will start with an empty queue, but skip checking */
        if (!check_fwstate(pmlmepriv, WIFI_ADHOC_STATE) &&
-           _queue_empty(queue)) {
+           list_empty(&queue->queue)) {
                if (pmlmepriv->fw_state & _FW_UNDER_LINKING)
                        pmlmepriv->fw_state ^= _FW_UNDER_LINKING;
                /* when set_ssid/set_bssid for do_join(), but scanning queue