Commit f85bd052 authored by Jes Sorensen's avatar Jes Sorensen Committed by Greg Kroah-Hartman
Browse files

staging: rtl8723au: Move REALTEK96B_IE23A to rtw_mlme_ext.c and mark it static 



Signed-off-by: default avatarJes Sorensen <Jes.Sorensen@redhat.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent d39518a4

drivers/staging/rtl8723au/core/rtw_mlme_ext.c

+3 −2
Original line number Diff line number Diff line
@@ -98,6 +98,7 @@ unsigned char WMM_PARA_OUI23A[] = {0x00, 0x50, 0xf2, 0x02, 0x01, 0x01}; 
unsigned char WPA_TKIP_CIPHER23A[4] = {0x00, 0x50, 0xf2, 0x02};

unsigned char RSN_TKIP_CIPHER23A[4] = {0x00, 0x0f, 0xac, 0x02};



static unsigned char REALTEK_96B_IE[] = {0x00, 0xe0, 0x4c, 0x02, 0x01, 0x20};



/********************************************************

MCS rate definitions
@@ -3254,7 +3255,7 @@ void issue_asocrsp23a(struct rtw_adapter *padapter, unsigned short status, 


	if (pmlmeinfo->assoc_AP_vendor == HT_IOT_PEER_REALTEK) {

		pframe = rtw_set_ie23a(pframe, WLAN_EID_VENDOR_SPECIFIC, 6,

				       REALTEK_96B_IE23A, &pattrib->pktlen);

				       REALTEK_96B_IE, &pattrib->pktlen);

	}



	/* add WPS IE ie for wps 2.0 */
@@ -3518,7 +3519,7 @@ void issue_assocreq23a(struct rtw_adapter *padapter) 


	if (pmlmeinfo->assoc_AP_vendor == HT_IOT_PEER_REALTEK)

		pframe = rtw_set_ie23a(pframe, WLAN_EID_VENDOR_SPECIFIC, 6,

				       REALTEK_96B_IE23A, &pattrib->pktlen);

				       REALTEK_96B_IE, &pattrib->pktlen);



	pattrib->last_txcmdsz = pattrib->pktlen;

	dump_mgntframe23a(padapter, pmgntframe);

drivers/staging/rtl8723au/core/rtw_wlan_util.c

+0 −2
Original line number Diff line number Diff line
@@ -32,8 +32,6 @@ static unsigned char REALTEK_OUI[] = {0x00, 0xe0, 0x4c}; 
static unsigned char AIRGOCAP_OUI[] = {0x00, 0x0a, 0xf5};

static unsigned char EPIGRAM_OUI[] = {0x00, 0x90, 0x4c};



unsigned char REALTEK_96B_IE23A[] = {0x00, 0xe0, 0x4c, 0x02, 0x01, 0x20};



#define R2T_PHY_DELAY		0



/* define WAIT_FOR_BCN_TO_MIN	3000 */

drivers/staging/rtl8723au/include/osdep_service.h

+0 −1
Original line number Diff line number Diff line
@@ -126,7 +126,6 @@ static inline u32 CHKBIT(u32 x) 
#define BIT35	0x0800000000

#define BIT36	0x1000000000



extern unsigned char REALTEK_96B_IE23A[];

extern unsigned char MCS_rate_2R23A[16];

extern unsigned char WPA_TKIP_CIPHER23A[4];

extern unsigned char RSN_TKIP_CIPHER23A[4];