staging: r8188eu: remove unused macros and defines from rtl8188e_hal.h
PATCH 1/3 staging: r8188eu: remove unused macros and defines from rtl8188e_hal.h
Remove unused macros and defines from rtl8188e_hal.h.
Signed-off-by Michael Straube <[email protected]>
--- .../staging/r8188eu/include/rtl8188e_hal.h | 55 ------------------- 1 file changed, 55 deletions(-)
drivers/staging/r8188eu/include/rtl8188e_hal.h +0 -55
@@ -19,29 +19,10 @@#include "odm_precomp.h" -/* Fw Array */ -#define Rtl8188E_FwImageArray Rtl8188EFwImgArray -#define Rtl8188E_FWImgArrayLength Rtl8188EFWImgArrayLength - -#define RTL8188E_FW_UMC_IMG "rtl8188E\\rtl8188efw.bin" -#define RTL8188E_PHY_REG "rtl8188E\\PHY_REG_1T.txt" -#define RTL8188E_PHY_RADIO_A "rtl8188E\\radio_a_1T.txt" -#define RTL8188E_PHY_RADIO_B "rtl8188E\\radio_b_1T.txt" -#define RTL8188E_AGC_TAB "rtl8188E\\AGC_TAB_1T.txt" -#define RTL8188E_PHY_MACREG "rtl8188E\\MAC_REG.txt" -#define RTL8188E_PHY_REG_PG "rtl8188E\\PHY_REG_PG.txt" -#define RTL8188E_PHY_REG_MP "rtl8188E\\PHY_REG_MP.txt" -/* RTL8188E Power Configuration CMDs for USB/SDIO interfaces */ #define Rtl8188E_NIC_PWR_ON_FLOW rtl8188E_power_on_flow -#define Rtl8188E_NIC_RF_OFF_FLOW rtl8188E_radio_off_flow#define Rtl8188E_NIC_DISABLE_FLOW rtl8188E_card_disable_flow -#define Rtl8188E_NIC_ENABLE_FLOW rtl8188E_card_enable_flow -#define Rtl8188E_NIC_SUSPEND_FLOW rtl8188E_suspend_flow -#define Rtl8188E_NIC_RESUME_FLOW rtl8188E_resume_flow -#define Rtl8188E_NIC_PDN_FLOW rtl8188E_hwpdn_flow#define Rtl8188E_NIC_LPS_ENTER_FLOW rtl8188E_enter_lps_flow -#define Rtl8188E_NIC_LPS_LEAVE_FLOW rtl8188E_leave_lps_flow#define DRVINFO_SZ 4/* unit is 8bytes */ #define PageNum_128 (_Len) (u32)(((_Len)>>7) + ((_Len) & 0x7F ? 1 : 0))
@@ -49,7 +30,6 @@/* download firmware related data structure */ #define FW_8188E_SIZE 0x4000/* 16384,16k */ #define FW_8188E_START_ADDRESS 0x1000 -#define FW_8188E_END_ADDRESS 0x1FFF/* 0x5FFF */ #define MAX_PAGE_SIZE 4096/* @ page : 4k bytes */
@@ -108,11 +88,6 @@ enum usb_rx_agg_mode { 0x2400 /* 9k for 88E nornal chip , MaxRxBuff=10k-max(TxReportSize(64*8),* WOLPattern(16*24)) */ -#define MAX_TX_REPORT_BUFFER_SIZE 0x0400/* 1k */ - -/* BK, BE, VI, VO, HCCA, MANAGEMENT, COMMAND, HIGH, BEACON. */ -#define MAX_TX_QUEUE 9 -#define TX_SELE_HQ BIT(0)/* High Queue */ #define TX_SELE_LQ BIT(1)/* Low Queue */ #define TX_SELE_NQ BIT(2)/* Normal Queue */
@@ -134,11 +109,6 @@ enum usb_rx_agg_mode {#define WMM_NORMAL_TX_PAGE_BOUNDARY_88E \ (WMM_NORMAL_TX_TOTAL_PAGE_NUMBER + 1)/* 0xA9 */ -/* Chip specific */ -#define CHIP_BONDING_IDENTIFIER (_value) (((_value)>>22)&0x3) -#define CHIP_BONDING_92C_1T2R 0x1 -#define CHIP_BONDING_88C_USB_MCARD 0x2 -#define CHIP_BONDING_88C_USB_HP 0x1#include "HalVerDef.h" #include "hal_com.h"
@@ -168,29 +138,11 @@ struct txpowerinfo24g { };#define EFUSE_REAL_CONTENT_LEN 512 -#define EFUSE_MAX_SECTION 16 -#define EFUSE_IC_ID_OFFSET 506/* For some inferior IC purpose*/ #define AVAILABLE_EFUSE_ADDR (addr) (addr < EFUSE_REAL_CONTENT_LEN) -/* To prevent out of boundary programming case, */ -/* leave 1byte and program full section */ -/* 9bytes + 1byt + 5bytes and pre 1byte. */ -/* For worst case: */ -/* | 1byte|----8bytes----|1byte|--5bytes--| */ -/* | | Reserved(14bytes) | */ - -/* PG data exclude header, dummy 6 bytes frome CP test and reserved 1byte. */ -#define EFUSE_OOB_PROTECT_BYTES 15 - -#define HWSET_MAX_SIZE_88E 512#define EFUSE_REAL_CONTENT_LEN_88E 256#define EFUSE_MAP_LEN_88E 512 -#define EFUSE_MAP_LEN EFUSE_MAP_LEN_88E#define EFUSE_MAX_SECTION_88E 64 -#define EFUSE_MAX_WORD_UNIT_88E 4 -#define EFUSE_IC_ID_OFFSET_88E 506 -#define AVAILABLE_EFUSE_ADDR_88E (addr) \ - (addr < EFUSE_REAL_CONTENT_LEN_88E)/* To prevent out of boundary programming case, leave 1byte and program * full section */ /* 9bytes + 1byt + 5bytes and pre 1byte. */
@@ -198,12 +150,6 @@ struct txpowerinfo24g {/* | 2byte|----8bytes----|1byte|--7bytes--| 92D */ /* PG data exclude header, dummy 7 bytes frome CP test and reserved 1byte. */ #define EFUSE_OOB_PROTECT_BYTES_88E 18 -#define EFUSE_PROTECT_BYTES_BANK_88E 16 - -/* EFUSE for BT definition */ -#define EFUSE_BT_REAL_CONTENT_LEN 1536/* 512*3 */ -#define EFUSE_BT_MAP_LEN 1024/* 1k bytes */ -#define EFUSE_BT_MAX_SECTION 128/* 1024/8 */ #define EFUSE_PROTECT_BYTES_BANK 16
@@ -367,7 +313,6 @@ struct hal_data_8188e {#define GET_HAL_DATA (__pAdapter) \ ((struct hal_data_8188e *)((__pAdapter)->HalData)) -#define GET_RF_TYPE (priv) (GET_HAL_DATA(priv)->rf_type)/* rtl8188e_hal_init.c */ s32 rtl8188e_FirmwareDownload (struct adapter *padapter);
Signature · 1 line
2.33.0
PATCH 2/3 staging: r8188eu: replace MACADDRLEN with ETH_ALEN
Replace the custom constant MACADDRLEN with in-kernel ETH_ALEN.
Signed-off-by Michael Straube <[email protected]>
--- drivers/staging/r8188eu/core/rtw_xmit.c | 44 ++++++++++---------- drivers/staging/r8188eu/include/drv_types.h | 6 +-- drivers/staging/r8188eu/include/rtw_br_ext.h | 3 +- 3 files changed, 26 insertions(+), 27 deletions(-)
drivers/staging/r8188eu/core/rtw_xmit.c +22 -22
@@ -1553,31 +1553,31 @@ static int rtw_br_client_tx(struct adapter *padapter, struct sk_buff **pskb)rcu_read_unlock ();spin_lock_bh (&padapter->br_ext_lock);if (!(skb->data[0 ] &1 ) && br_port && -memcmp (skb->data +MACADDRLEN , padapter->br_mac,MACADDRLEN ) && - *((__be16 *)(skb->data +MACADDRLEN *2 )) !=__constant_htons (ETH_P_8021Q ) && - *((__be16 *)(skb->data +MACADDRLEN *2 )) ==__constant_htons (ETH_P_IP ) && - !memcmp (padapter->scdb_mac, skb->data +MACADDRLEN ,MACADDRLEN ) && padapter->scdb_entry) { -memcpy (skb->data +MACADDRLEN ,GET_MY_HWADDR (padapter),MACADDRLEN ); +memcmp (skb->data +ETH_ALEN , padapter->br_mac,ETH_ALEN ) && + *((__be16 *)(skb->data +ETH_ALEN *2 )) !=__constant_htons (ETH_P_8021Q ) && + *((__be16 *)(skb->data +ETH_ALEN *2 )) ==__constant_htons (ETH_P_IP ) && + !memcmp (padapter->scdb_mac, skb->data +ETH_ALEN ,ETH_ALEN ) && padapter->scdb_entry) { +memcpy (skb->data +ETH_ALEN ,GET_MY_HWADDR (padapter),ETH_ALEN ); padapter->scdb_entry->ageing_timer = jiffies;spin_unlock_bh (&padapter->br_ext_lock); }else { -if (*((__be16 *)(skb->data +MACADDRLEN *2 )) ==__constant_htons (ETH_P_8021Q )) { +if (*((__be16 *)(skb->data +ETH_ALEN *2 )) ==__constant_htons (ETH_P_8021Q )) { is_vlan_tag =1 ; - vlan_hdr = *((unsigned short *)(skb->data +MACADDRLEN *2 +2 )); + vlan_hdr = *((unsigned short *)(skb->data +ETH_ALEN *2 +2 ));for (i =0 ; i <6 ; i++) - *((unsigned short *)(skb->data +MACADDRLEN *2 +2 - i *2 )) = *((unsigned short *)(skb->data +MACADDRLEN *2 -2 - i *2 )); + *((unsigned short *)(skb->data +ETH_ALEN *2 +2 - i *2 )) = *((unsigned short *)(skb->data +ETH_ALEN *2 -2 - i *2 ));skb_pull (skb,4 ); } -if (!memcmp (skb->data +MACADDRLEN , padapter->br_mac,MACADDRLEN ) && - (*((__be16 *)(skb->data +MACADDRLEN *2 )) ==__constant_htons (ETH_P_IP ))) +if (!memcmp (skb->data +ETH_ALEN , padapter->br_mac,ETH_ALEN ) && + (*((__be16 *)(skb->data +ETH_ALEN *2 )) ==__constant_htons (ETH_P_IP )))memcpy (padapter->br_ip, skb->data +WLAN_ETHHDR_LEN +12 ,4 ); -if (*((__be16 *)(skb->data +MACADDRLEN *2 )) ==__constant_htons (ETH_P_IP )) { -if (memcmp (padapter->scdb_mac, skb->data +MACADDRLEN ,MACADDRLEN )) { +if (*((__be16 *)(skb->data +ETH_ALEN *2 )) ==__constant_htons (ETH_P_IP )) { +if (memcmp (padapter->scdb_mac, skb->data +ETH_ALEN ,ETH_ALEN )) { padapter->scdb_entry = (struct nat25_network_db_entry *)scdb_findEntry (padapter, skb->data +WLAN_ETHHDR_LEN +12 );if (padapter->scdb_entry) { -memcpy (padapter->scdb_mac, skb->data +MACADDRLEN ,MACADDRLEN ); +memcpy (padapter->scdb_mac, skb->data +ETH_ALEN ,ETH_ALEN );memcpy (padapter->scdb_ip, skb->data +WLAN_ETHHDR_LEN +12 ,4 ); padapter->scdb_entry->ageing_timer = jiffies; do_nat25 =0 ;
@@ -1587,7 +1587,7 @@ static int rtw_br_client_tx(struct adapter *padapter, struct sk_buff **pskb) padapter->scdb_entry->ageing_timer = jiffies; do_nat25 =0 ; }else { -memset (padapter->scdb_mac,0 ,MACADDRLEN ); +memset (padapter->scdb_mac,0 ,ETH_ALEN );memset (padapter->scdb_ip,0 ,4 ); } }
@@ -1601,8 +1601,8 @@ static int rtw_br_client_tx(struct adapter *padapter, struct sk_buff **pskb)skb_push (skb,4 );for (i =0 ; i <6 ; i++) *((unsigned short *)(skb->data + i *2 )) = *((unsigned short *)(skb->data +4 + i *2 )); - *((__be16 *)(skb->data +MACADDRLEN *2 )) =__constant_htons (ETH_P_8021Q ); - *((unsigned short *)(skb->data +MACADDRLEN *2 +2 )) = vlan_hdr; + *((__be16 *)(skb->data +ETH_ALEN *2 )) =__constant_htons (ETH_P_8021Q ); + *((unsigned short *)(skb->data +ETH_ALEN *2 +2 )) = vlan_hdr; } newskb =skb_copy (skb,GFP_ATOMIC );
@@ -1614,9 +1614,9 @@ static int rtw_br_client_tx(struct adapter *padapter, struct sk_buff **pskb) *pskb = skb = newskb;if (is_vlan_tag) { - vlan_hdr = *((unsigned short *)(skb->data +MACADDRLEN *2 +2 )); + vlan_hdr = *((unsigned short *)(skb->data +ETH_ALEN *2 +2 ));for (i =0 ; i <6 ; i++) - *((unsigned short *)(skb->data +MACADDRLEN *2 +2 - i *2 )) = *((unsigned short *)(skb->data +MACADDRLEN *2 -2 - i *2 )); + *((unsigned short *)(skb->data +ETH_ALEN *2 +2 - i *2 )) = *((unsigned short *)(skb->data +ETH_ALEN *2 -2 - i *2 ));skb_pull (skb,4 ); } }
@@ -1640,7 +1640,7 @@ static int rtw_br_client_tx(struct adapter *padapter, struct sk_buff **pskb) } } -memcpy (skb->data +MACADDRLEN ,GET_MY_HWADDR (padapter),MACADDRLEN ); +memcpy (skb->data +ETH_ALEN ,GET_MY_HWADDR (padapter),ETH_ALEN );dhcp_flag_bcast (padapter, skb);
@@ -1648,13 +1648,13 @@ static int rtw_br_client_tx(struct adapter *padapter, struct sk_buff **pskb)skb_push (skb,4 );for (i =0 ; i <6 ; i++) *((unsigned short *)(skb->data + i *2 )) = *((unsigned short *)(skb->data +4 + i *2 )); - *((__be16 *)(skb->data +MACADDRLEN *2 )) =__constant_htons (ETH_P_8021Q ); - *((unsigned short *)(skb->data +MACADDRLEN *2 +2 )) = vlan_hdr; + *((__be16 *)(skb->data +ETH_ALEN *2 )) =__constant_htons (ETH_P_8021Q ); + *((unsigned short *)(skb->data +ETH_ALEN *2 +2 )) = vlan_hdr; } }/* check if SA is equal to our MAC */ -if (memcmp (skb->data +MACADDRLEN ,GET_MY_HWADDR (padapter),MACADDRLEN )) { +if (memcmp (skb->data +ETH_ALEN ,GET_MY_HWADDR (padapter),ETH_ALEN )) {DEBUG_ERR ("TX DROP: untransformed frame SA:%02X%02X%02X%02X%02X%02X!\n" , skb->data[6 ], skb->data[7 ], skb->data[8 ], skb->data[9 ], skb->data[10 ], skb->data[11 ]);return -1 ;
drivers/staging/r8188eu/include/drv_types.h +3 -3
@@ -280,11 +280,11 @@ struct adapter {spinlock_t br_ext_lock;struct nat25_network_db_entry *nethash[NAT25_HASH_SIZE ];int pppoe_connection_in_progress; -unsigned char pppoe_addr[MACADDRLEN ]; -unsigned char scdb_mac[MACADDRLEN ]; +unsigned char pppoe_addr[ETH_ALEN ]; +unsigned char scdb_mac[ETH_ALEN ];unsigned char scdb_ip[4 ];struct nat25_network_db_entry *scdb_entry; -unsigned char br_mac[MACADDRLEN ]; +unsigned char br_mac[ETH_ALEN ];unsigned char br_ip[4 ];struct br_ext_info ethBrExtInfo;
drivers/staging/r8188eu/include/rtw_br_ext.h +1 -2
@@ -4,7 +4,6 @@#ifndef _RTW_BR_EXT_H_#define _RTW_BR_EXT_H_ -#define MACADDRLEN 6#define _DEBUG_ERR DBG_88E#define _DEBUG_INFO DBG_88E#define DEBUG_WARN DBG_88E
@@ -40,7 +39,7 @@ struct br_ext_info {unsigned int macclone_enable;unsigned int dhcp_bcst_disable;int addPPPoETag;/* 1: Add PPPoE relay-SID, 0: disable */ -unsigned char nat25_dmzMac[MACADDRLEN ]; +unsigned char nat25_dmzMac[ETH_ALEN ];unsigned int nat25sc_disable; };
Signature · 1 line
2.33.0
PATCH 3/3 staging: r8188eu: remove enum _RTL8712_RF_MIMO_CONFIG_
In reply to Michael StraubeThe enum _RTL8712_RF_MIMO_CONFIG_ is not used, remove it.
Signed-off-by Michael Straube <[email protected]>
--- drivers/staging/r8188eu/include/rtw_rf.h | 11 ----------- 1 file changed, 11 deletions(-)
drivers/staging/r8188eu/include/rtw_rf.h +0 -11
@@ -69,17 +69,6 @@ enum _REG_PREAMBLE_MODE { PREAMBLE_SHORT = 3, }; -enum _RTL8712_RF_MIMO_CONFIG_ { -RTL8712_RFCONFIG_1T =0x10 , -RTL8712_RFCONFIG_2T =0x20 , -RTL8712_RFCONFIG_1R =0x01 , -RTL8712_RFCONFIG_2R =0x02 , -RTL8712_RFCONFIG_1T1R =0x11 , -RTL8712_RFCONFIG_1T2R =0x12 , -RTL8712_RFCONFIG_TURBO =0x92 , -RTL8712_RFCONFIG_2T2R =0x22 -}; -enum rf90_radio_path {RF90_PATH_A =0 ,/* Radio Path A */ RF90_PATH_B =1 ,/* Radio Path B */
Signature · 1 line
2.33.0