[PATCH 49/74] staging: rtl8723au: Declare issue_asocrsp() static

Jes.Sorensen at redhat.com Jes.Sorensen at redhat.com
Wed May 21 07:38:13 UTC 2014


From: Jes Sorensen <Jes.Sorensen at redhat.com>

Signed-off-by: Jes Sorensen <Jes.Sorensen at redhat.com>
---
 drivers/staging/rtl8723au/core/rtw_mlme_ext.c    | 19 +++++++++++--------
 drivers/staging/rtl8723au/include/rtw_mlme_ext.h |  2 --
 2 files changed, 11 insertions(+), 10 deletions(-)

diff --git a/drivers/staging/rtl8723au/core/rtw_mlme_ext.c b/drivers/staging/rtl8723au/core/rtw_mlme_ext.c
index 1178500..453b53f 100644
--- a/drivers/staging/rtl8723au/core/rtw_mlme_ext.c
+++ b/drivers/staging/rtl8723au/core/rtw_mlme_ext.c
@@ -46,6 +46,9 @@ static int OnAction23a_ht(struct rtw_adapter *padapter, struct recv_frame *precv
 static int OnAction23a_wmm(struct rtw_adapter *padapter, struct recv_frame *precv_frame);
 static int OnAction23a_p2p(struct rtw_adapter *padapter, struct recv_frame *precv_frame);
 
+static void issue_asocrsp(struct rtw_adapter *padapter, unsigned short status,
+			  struct sta_info *pstat, int pkt_type);
+
 static struct mlme_handler mlme_sta_tbl[]={
 	{"OnAssocReq23a",		&OnAssocReq23a},
 	{"OnAssocRsp23a",		&OnAssocRsp23a},
@@ -1693,11 +1696,11 @@ OnAssocReq23a(struct rtw_adapter *padapter, struct recv_frame *precv_frame)
 
 		/* issue assoc rsp before notify station join event. */
 		if (ieee80211_is_assoc_req(mgmt->frame_control))
-			issue_asocrsp23a(padapter, status, pstat,
-					 WIFI_ASSOCRSP);
+			issue_asocrsp(padapter, status, pstat,
+				      WIFI_ASSOCRSP);
 		else
-			issue_asocrsp23a(padapter, status, pstat,
-					 WIFI_REASSOCRSP);
+			issue_asocrsp(padapter, status, pstat,
+				      WIFI_REASSOCRSP);
 
 		/* 2 - report to upper layer */
 		DBG_8723A("indicate_sta_join_event to upper layer - hostapd\n");
@@ -1722,9 +1725,9 @@ OnAssocReq23aFail:
 #ifdef CONFIG_8723AU_AP_MODE
 	pstat->aid = 0;
 	if (ieee80211_is_assoc_req(mgmt->frame_control))
-		issue_asocrsp23a(padapter, status, pstat, WIFI_ASSOCRSP);
+		issue_asocrsp(padapter, status, pstat, WIFI_ASSOCRSP);
 	else
-		issue_asocrsp23a(padapter, status, pstat, WIFI_REASSOCRSP);
+		issue_asocrsp(padapter, status, pstat, WIFI_REASSOCRSP);
 #endif
 
 #endif /* CONFIG_8723AU_AP_MODE */
@@ -3108,8 +3111,8 @@ void issue_auth23a(struct rtw_adapter *padapter, struct sta_info *psta,
 	return;
 }
 
-void issue_asocrsp23a(struct rtw_adapter *padapter, unsigned short status,
-		      struct sta_info *pstat, int pkt_type)
+static void issue_asocrsp(struct rtw_adapter *padapter, unsigned short status,
+			  struct sta_info *pstat, int pkt_type)
 {
 #ifdef CONFIG_8723AU_AP_MODE
 	struct xmit_frame *pmgntframe;
diff --git a/drivers/staging/rtl8723au/include/rtw_mlme_ext.h b/drivers/staging/rtl8723au/include/rtw_mlme_ext.h
index 043ed7a..7f2607d 100644
--- a/drivers/staging/rtl8723au/include/rtw_mlme_ext.h
+++ b/drivers/staging/rtl8723au/include/rtw_mlme_ext.h
@@ -580,8 +580,6 @@ void issue_beacon23a(struct rtw_adapter *padapter, int timeout_ms);
 void issue_probersp23a(struct rtw_adapter *padapter, unsigned char *da,
 		    u8 is_valid_p2p_probereq);
 void issue_assocreq23a(struct rtw_adapter *padapter);
-void issue_asocrsp23a(struct rtw_adapter *padapter, unsigned short status,
-		   struct sta_info *pstat, int pkt_type);
 void issue_auth23a(struct rtw_adapter *padapter, struct sta_info *psta,
 		unsigned short status);
 void issue_probereq23a(struct rtw_adapter *padapter, struct cfg80211_ssid *pssid,
-- 
1.9.0



More information about the devel mailing list