Merge tag 'v3.10-rc1' into patchwork

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

diff --git a/drivers/staging/rtl8712/rtl871x_sta_mgt.c b/drivers/staging/rtl8712/rtl871x_sta_mgt.c
index 81bde80..1247b3d 100644 (file)
--- a/drivers/staging/rtl8712/rtl871x_sta_mgt.c
+++ b/drivers/staging/rtl8712/rtl871x_sta_mgt.c
@@ -42,10 +42,8 @@ static void _init_stainfo(struct sta_info *psta)
        _init_listhead(&psta->hash_list);
        _r8712_init_sta_xmit_priv(&psta->sta_xmitpriv);
        _r8712_init_sta_recv_priv(&psta->sta_recvpriv);
-#ifdef CONFIG_R8712_AP
        _init_listhead(&psta->asoc_list);
        _init_listhead(&psta->auth_list);
-#endif
 }
 
 u32 _r8712_init_sta_priv(struct        sta_priv *pstapriv)
@@ -72,10 +70,8 @@ u32 _r8712_init_sta_priv(struct      sta_priv *pstapriv)
                                 get_list_head(&pstapriv->free_sta_queue));
                psta++;
        }
-#ifdef CONFIG_R8712_AP
        _init_listhead(&pstapriv->asoc_list);
        _init_listhead(&pstapriv->auth_list);
-#endif
        return _SUCCESS;
 }