[PATCH] staging: r8712u: Remove configuration parameter CONFIG_R8712_AP

[PATCH] staging: r8712u: Remove configuration parameter CONFIG_R8712_AP

[Larry Finger]

The configuration parameter R8712_AP is misleading as the driver cannot
function as an AP without a heavily hacked version of hostapd. Thus, it
makes sense to remove the parameter; however the code and data configured
for the option is left in.

Signed-off-by: Larry Finger <Larry.Finger@lwfinger.net>
---

Index: wireless-testing-new/drivers/staging/rtl8712/Kconfig
===================================================================
--- wireless-testing-new.orig/drivers/staging/rtl8712/Kconfig
+++ wireless-testing-new/drivers/staging/rtl8712/Kconfig
@@ -9,13 +9,6 @@ config R8712U
 	This option adds the Realtek RTL8712 USB device such as the D-Link DWA-130.
 	If built as a module, it will be called r8712u.
 
-config R8712_AP
-	bool "Realtek RTL8712U AP code"
-	depends on R8712U
-	default N
-	---help---
-	This option allows the Realtek RTL8712 USB device to be an Access Point.
-
 config R8712_TX_AGGR
 	bool "Realtek RTL8712U Transmit Aggregation code"
 	depends on R8712U && BROKEN
Index: wireless-testing-new/drivers/staging/rtl8712/rtl871x_sta_mgt.c
===================================================================
--- wireless-testing-new.orig/drivers/staging/rtl8712/rtl871x_sta_mgt.c
+++ wireless-testing-new/drivers/staging/rtl8712/rtl871x_sta_mgt.c
@@ -42,10 +42,8 @@ static void _init_stainfo(struct sta_inf
 	_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
 				 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;
 }
 
Index: wireless-testing-new/drivers/staging/rtl8712/sta_info.h
===================================================================
--- wireless-testing-new.orig/drivers/staging/rtl8712/sta_info.h
+++ wireless-testing-new/drivers/staging/rtl8712/sta_info.h
@@ -90,7 +90,6 @@ struct sta_info {
 	 * curr_network(mlme_priv/security_priv/qos/ht) : AP CAP/INFO
 	 * sta_info: (AP & STA) CAP/INFO
 	 */
-#ifdef CONFIG_R8712_AP
 	struct list_head asoc_list;
 	struct list_head auth_list;
 	unsigned int expire_to;
@@ -98,7 +97,6 @@ struct sta_info {
 	unsigned int authalg;
 	unsigned char chg_txt[128];
 	unsigned int tx_ra_bitmap;
-#endif
 };
 
 struct	sta_priv {
@@ -111,13 +109,11 @@ struct	sta_priv {
 	struct  __queue sleep_q;
 	struct  __queue wakeup_q;
 	struct _adapter *padapter;
-#ifdef CONFIG_R8712_AP
 	struct list_head asoc_list;
 	struct list_head auth_list;
 	unsigned int auth_to;  /* sec, time to expire in authenticating. */
 	unsigned int assoc_to; /* sec, time to expire before associating. */
 	unsigned int expire_to; /* sec , time to expire after associated. */
-#endif
 };
 
 static inline u32 wifi_mac_hash(u8 *mac)

Re: [PATCH] staging: r8712u: Remove configuration parameter CONFIG_R8712_AP

[Greg KH]

On Sat, Feb 04, 2012 at 03:28:06PM -0600, Larry Finger wrote:
> The configuration parameter R8712_AP is misleading as the driver cannot
> function as an AP without a heavily hacked version of hostapd. Thus, it
> makes sense to remove the parameter; however the code and data configured
> for the option is left in.
> 
> Signed-off-by: Larry Finger <Larry.Finger@lwfinger.net>

This doesn't apply for some odd reason:

patching file drivers/staging/rtl8712/Kconfig
patching file drivers/staging/rtl8712/rtl871x_sta_mgt.c
Hunk #1 FAILED at 42.
Hunk #2 succeeded at 71 (offset -1 lines).
1 out of 2 hunks FAILED -- saving rejects to file drivers/staging/rtl8712/rtl871x_sta_mgt.c.rej
patching file drivers/staging/rtl8712/sta_info.h

I did this against my staging-next branch, can you redo it and resend
it?

thanks,

greg k-h