Skip to content

L
linux
Commit 49aab5fd authored by Larry Finger's avatar Larry Finger Committed by Greg Kroah-Hartman
Browse files
Options

staging: rtl8192e: Fix sparse (non-endian) warnings - Part II 

Signed-off-by: default avatarLarry Finger <Larry.Finger@lwfinger.net>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
parent ec0dc6be
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 152 additions and 455 deletions
drivers/staging/rtl8192e/r8192E_cmdpkt.c
View file @ 49aab5fd
...@@ -34,7 +34,7 @@ ...@@ -34,7 +34,7 @@
} }
/*---------------------------Define functions---------------------------------*/ /*---------------------------Define functions---------------------------------*/
extern bool cmpk_message_handle_tx( bool cmpk_message_handle_tx(
struct net_device *dev, struct net_device *dev,
u8 *code_virtual_address, u8 *code_virtual_address,
u32 packettype, u32 packettype,
...@@ -167,7 +167,7 @@ static void cmpk_handle_tx_feedback(struct net_device *dev, u8 *pmsg) ...@@ -167,7 +167,7 @@ static void cmpk_handle_tx_feedback(struct net_device *dev, u8 *pmsg)
} /* cmpk_Handle_Tx_Feedback */ } /* cmpk_Handle_Tx_Feedback */
void cmdpkt_beacontimerinterrupt_819xusb(struct net_device *dev) static void cmdpkt_beacontimerinterrupt_819xusb(struct net_device *dev)
{ {
struct r8192_priv *priv = rtllib_priv(dev); struct r8192_priv *priv = rtllib_priv(dev);
u16 tx_rate; u16 tx_rate;
...@@ -339,10 +339,8 @@ static void cmpk_handle_tx_rate_history(struct net_device *dev, u8 *pmsg) ...@@ -339,10 +339,8 @@ static void cmpk_handle_tx_rate_history(struct net_device *dev, u8 *pmsg)
} }
extern u32 u32 cmpk_message_handle_rx(struct net_device *dev,
cmpk_message_handle_rx( struct rtllib_rx_stats *pstats)
struct net_device *dev,
struct rtllib_rx_stats *pstats)
{ {
struct r8192_priv *priv = rtllib_priv(dev); struct r8192_priv *priv = rtllib_priv(dev);
int total_length; int total_length;
......
drivers/staging/rtl8192e/r8192E_dev.c
View file @ 49aab5fd
...@@ -57,7 +57,7 @@ void rtl8192e_start_beacon(struct net_device *dev) ...@@ -57,7 +57,7 @@ void rtl8192e_start_beacon(struct net_device *dev)
rtl8192_irq_enable(dev); rtl8192_irq_enable(dev);
} }
void rtl8192e_update_msr(struct net_device *dev) static void rtl8192e_update_msr(struct net_device *dev)
{ {
struct r8192_priv *priv = rtllib_priv(dev); struct r8192_priv *priv = rtllib_priv(dev);
u8 msr; u8 msr;
...@@ -952,7 +952,7 @@ bool rtl8192_adapter_start(struct net_device *dev) ...@@ -952,7 +952,7 @@ bool rtl8192_adapter_start(struct net_device *dev)
return rtStatus; return rtStatus;
} }
void rtl8192_net_update(struct net_device *dev) static void rtl8192_net_update(struct net_device *dev)
{ {
struct r8192_priv *priv = rtllib_priv(dev); struct r8192_priv *priv = rtllib_priv(dev);
...@@ -1127,7 +1127,7 @@ static u8 MRateToHwRate8190Pci(u8 rate) ...@@ -1127,7 +1127,7 @@ static u8 MRateToHwRate8190Pci(u8 rate)
return ret; return ret;
} }
u8 rtl8192_MapHwQueueToFirmwareQueue(u8 QueueID, u8 priority) static u8 rtl8192_MapHwQueueToFirmwareQueue(u8 QueueID, u8 priority)
{ {
u8 QueueSelect = 0x0; u8 QueueSelect = 0x0;
...@@ -1301,7 +1301,7 @@ void rtl8192_tx_fill_cmd_desc(struct net_device *dev, ...@@ -1301,7 +1301,7 @@ void rtl8192_tx_fill_cmd_desc(struct net_device *dev,
entry->OWN = 1; entry->OWN = 1;
} }
u8 HwRateToMRate90(bool bIsHT, u8 rate) static u8 HwRateToMRate90(bool bIsHT, u8 rate)
{ {
u8 ret_rate = 0x02; u8 ret_rate = 0x02;
...@@ -1414,7 +1414,7 @@ u8 HwRateToMRate90(bool bIsHT, u8 rate) ...@@ -1414,7 +1414,7 @@ u8 HwRateToMRate90(bool bIsHT, u8 rate)
return ret_rate; return ret_rate;
} }
long rtl8192_signal_scale_mapping(struct r8192_priv *priv, long currsig) static long rtl8192_signal_scale_mapping(struct r8192_priv *priv, long currsig)
{ {
long retsig; long retsig;
...@@ -1450,7 +1450,7 @@ long rtl8192_signal_scale_mapping(struct r8192_priv *priv, long currsig) ...@@ -1450,7 +1450,7 @@ long rtl8192_signal_scale_mapping(struct r8192_priv *priv, long currsig)
_pdrvinfo->RxRate == DESC90_RATE11M) &&\ _pdrvinfo->RxRate == DESC90_RATE11M) &&\
!_pdrvinfo->RxHT) !_pdrvinfo->RxHT)
void rtl8192_query_rxphystatus( static void rtl8192_query_rxphystatus(
struct r8192_priv *priv, struct r8192_priv *priv,
struct rtllib_rx_stats *pstats, struct rtllib_rx_stats *pstats,
struct rx_desc *pdesc, struct rx_desc *pdesc,
...@@ -1664,9 +1664,9 @@ void rtl8192_query_rxphystatus( ...@@ -1664,9 +1664,9 @@ void rtl8192_query_rxphystatus(
} }
} }
void rtl8192_process_phyinfo(struct r8192_priv *priv, u8 *buffer, static void rtl8192_process_phyinfo(struct r8192_priv *priv, u8 *buffer,
struct rtllib_rx_stats *prev_st, struct rtllib_rx_stats *prev_st,
struct rtllib_rx_stats *curr_st) struct rtllib_rx_stats *curr_st)
{ {
bool bcheck = false; bool bcheck = false;
u8 rfpath; u8 rfpath;
...@@ -1839,10 +1839,11 @@ void rtl8192_process_phyinfo(struct r8192_priv *priv, u8 *buffer, ...@@ -1839,10 +1839,11 @@ void rtl8192_process_phyinfo(struct r8192_priv *priv, u8 *buffer,
} }
} }
void rtl8192_TranslateRxSignalStuff(struct net_device *dev, struct sk_buff *skb, static void rtl8192_TranslateRxSignalStuff(struct net_device *dev,
struct rtllib_rx_stats *pstats, struct sk_buff *skb,
struct rx_desc *pdesc, struct rtllib_rx_stats *pstats,
struct rx_fwinfo *pdrvinfo) struct rx_desc *pdesc,
struct rx_fwinfo *pdrvinfo)
{ {
struct r8192_priv *priv = (struct r8192_priv *)rtllib_priv(dev); struct r8192_priv *priv = (struct r8192_priv *)rtllib_priv(dev);
bool bpacket_match_bssid, bpacket_toself; bool bpacket_match_bssid, bpacket_toself;
...@@ -1867,7 +1868,7 @@ void rtl8192_TranslateRxSignalStuff(struct net_device *dev, struct sk_buff *skb, ...@@ -1867,7 +1868,7 @@ void rtl8192_TranslateRxSignalStuff(struct net_device *dev, struct sk_buff *skb,
(fc & RTLLIB_FCTL_TODS) ? hdr->addr1 : (fc & RTLLIB_FCTL_TODS) ? hdr->addr1 :
(fc & RTLLIB_FCTL_FROMDS) ? hdr->addr2 : hdr->addr3)) (fc & RTLLIB_FCTL_FROMDS) ? hdr->addr2 : hdr->addr3))
&& (!pstats->bHwError) && (!pstats->bCRC) && (!pstats->bICV)); && (!pstats->bHwError) && (!pstats->bCRC) && (!pstats->bICV));
bpacket_toself = bpacket_match_bssid & bpacket_toself = bpacket_match_bssid && /* check this */
(!compare_ether_addr(praddr, (!compare_ether_addr(praddr,
priv->rtllib->dev->dev_addr)); priv->rtllib->dev->dev_addr));
if (WLAN_FC_GET_FRAMETYPE(fc) == RTLLIB_STYPE_BEACON) if (WLAN_FC_GET_FRAMETYPE(fc) == RTLLIB_STYPE_BEACON)
...@@ -1883,7 +1884,8 @@ void rtl8192_TranslateRxSignalStuff(struct net_device *dev, struct sk_buff *skb, ...@@ -1883,7 +1884,8 @@ void rtl8192_TranslateRxSignalStuff(struct net_device *dev, struct sk_buff *skb,
rtl8192_record_rxdesc_forlateruse(pstats, &previous_stats); rtl8192_record_rxdesc_forlateruse(pstats, &previous_stats);
} }
void rtl8192_UpdateReceivedRateHistogramStatistics(struct net_device *dev, static void rtl8192_UpdateReceivedRateHistogramStatistics(
struct net_device *dev,
struct rtllib_rx_stats *pstats) struct rtllib_rx_stats *pstats)
{ {
struct r8192_priv *priv = (struct r8192_priv *)rtllib_priv(dev); struct r8192_priv *priv = (struct r8192_priv *)rtllib_priv(dev);
...@@ -2255,17 +2257,6 @@ void rtl8192_enable_tx(struct net_device *dev) ...@@ -2255,17 +2257,6 @@ void rtl8192_enable_tx(struct net_device *dev)
} }
void rtl8192_beacon_disable(struct net_device *dev)
{
struct r8192_priv *priv = (struct r8192_priv *)rtllib_priv(dev);
u32 reg;
reg = read_nic_dword(priv->rtllib->dev, INTA_MASK);
reg &= ~(IMR_BcnInt | IMR_BcnInt | IMR_TBDOK | IMR_TBDER);
write_nic_dword(priv->rtllib->dev, INTA_MASK, reg);
}
void rtl8192_interrupt_recognized(struct net_device *dev, u32 *p_inta, void rtl8192_interrupt_recognized(struct net_device *dev, u32 *p_inta,
u32 *p_intb) u32 *p_intb)
{ {
......
drivers/staging/rtl8192e/r8192E_firmware.c
View file @ 49aab5fd
...@@ -23,7 +23,7 @@ ...@@ -23,7 +23,7 @@
#include "r8192E_firmware.h" #include "r8192E_firmware.h"
#include <linux/firmware.h> #include <linux/firmware.h>
extern void firmware_init_param(struct net_device *dev) void firmware_init_param(struct net_device *dev)
{ {
struct r8192_priv *priv = rtllib_priv(dev); struct r8192_priv *priv = rtllib_priv(dev);
struct rt_firmware *pfirmware = priv->pFirmware; struct rt_firmware *pfirmware = priv->pFirmware;
...@@ -32,8 +32,8 @@ extern void firmware_init_param(struct net_device *dev) ...@@ -32,8 +32,8 @@ extern void firmware_init_param(struct net_device *dev)
MAX_TRANSMIT_BUFFER_SIZE); MAX_TRANSMIT_BUFFER_SIZE);
} }
bool fw_download_code(struct net_device *dev, u8 *code_virtual_address, static bool fw_download_code(struct net_device *dev, u8 *code_virtual_address,
u32 buffer_len) u32 buffer_len)
{ {
struct r8192_priv *priv = rtllib_priv(dev); struct r8192_priv *priv = rtllib_priv(dev);
bool rt_status = true; bool rt_status = true;
...@@ -102,42 +102,7 @@ bool fw_download_code(struct net_device *dev, u8 *code_virtual_address, ...@@ -102,42 +102,7 @@ bool fw_download_code(struct net_device *dev, u8 *code_virtual_address,
return rt_status; return rt_status;
} }
bool fwSendNullPacket(struct net_device *dev, u32 Length) static bool CPUcheck_maincodeok_turnonCPU(struct net_device *dev)
{
bool rtStatus = true;
struct r8192_priv *priv = rtllib_priv(dev);
struct sk_buff *skb;
struct cb_desc *tcb_desc;
unsigned char *ptr_buf;
bool bLastInitPacket = false;
skb = dev_alloc_skb(Length + 4);
memcpy((unsigned char *)(skb->cb), &dev, sizeof(dev));
tcb_desc = (struct cb_desc *)(skb->cb + MAX_DEV_ADDR_SIZE);
tcb_desc->queue_index = TXCMD_QUEUE;
tcb_desc->bCmdOrInit = DESC_PACKET_TYPE_INIT;
tcb_desc->bLastIniPkt = bLastInitPacket;
ptr_buf = skb_put(skb, Length);
memset(ptr_buf, 0, Length);
tcb_desc->txbuf_size = (u16)Length;
if (!priv->rtllib->check_nic_enough_desc(dev, tcb_desc->queue_index) ||
(!skb_queue_empty(&priv->rtllib->skb_waitQ[tcb_desc->
queue_index])) || (priv->rtllib->queue_stop)) {
RT_TRACE(COMP_FIRMWARE, "===================NULL packet========"
"========> tx full!\n");
skb_queue_tail(&priv->rtllib->skb_waitQ[tcb_desc->queue_index],
skb);
} else {
priv->rtllib->softmac_hard_start_xmit(skb, dev);
}
write_nic_byte(dev, TPPoll, TPPoll_CQ);
return rtStatus;
}
bool CPUcheck_maincodeok_turnonCPU(struct net_device *dev)
{ {
bool rt_status = true; bool rt_status = true;
u32 CPU_status = 0; u32 CPU_status = 0;
...@@ -184,7 +149,7 @@ bool CPUcheck_maincodeok_turnonCPU(struct net_device *dev) ...@@ -184,7 +149,7 @@ bool CPUcheck_maincodeok_turnonCPU(struct net_device *dev)
return rt_status; return rt_status;
} }
bool CPUcheck_firmware_ready(struct net_device *dev) static bool CPUcheck_firmware_ready(struct net_device *dev)
{ {
bool rt_status = true; bool rt_status = true;
......
drivers/staging/rtl8192e/r8192E_phy.c
View file @ 49aab5fd
...@@ -53,7 +53,8 @@ static u32 phy_FwRFSerialRead(struct net_device *dev, ...@@ -53,7 +53,8 @@ static u32 phy_FwRFSerialRead(struct net_device *dev,
static void phy_FwRFSerialWrite(struct net_device *dev, static void phy_FwRFSerialWrite(struct net_device *dev,
enum rf90_radio_path eRFPath, enum rf90_radio_path eRFPath,
u32 Offset, u32 Data); u32 Offset, u32 Data);
u32 rtl8192_CalculateBitShift(u32 dwBitMask)
static u32 rtl8192_CalculateBitShift(u32 dwBitMask)
{ {
u32 i; u32 i;
for (i = 0; i <= 31; i++) { for (i = 0; i <= 31; i++) {
...@@ -105,8 +106,8 @@ u32 rtl8192_QueryBBReg(struct net_device *dev, u32 dwRegAddr, u32 dwBitMask) ...@@ -105,8 +106,8 @@ u32 rtl8192_QueryBBReg(struct net_device *dev, u32 dwRegAddr, u32 dwBitMask)
return Ret; return Ret;
} }
u32 rtl8192_phy_RFSerialRead(struct net_device *dev, static u32 rtl8192_phy_RFSerialRead(struct net_device *dev,
enum rf90_radio_path eRFPath, u32 Offset) enum rf90_radio_path eRFPath, u32 Offset)
{ {
struct r8192_priv *priv = rtllib_priv(dev); struct r8192_priv *priv = rtllib_priv(dev);
u32 ret = 0; u32 ret = 0;
...@@ -161,9 +162,9 @@ u32 rtl8192_phy_RFSerialRead(struct net_device *dev, ...@@ -161,9 +162,9 @@ u32 rtl8192_phy_RFSerialRead(struct net_device *dev,
} }
void rtl8192_phy_RFSerialWrite(struct net_device *dev, static void rtl8192_phy_RFSerialWrite(struct net_device *dev,
enum rf90_radio_path eRFPath, u32 Offset, enum rf90_radio_path eRFPath, u32 Offset,
u32 Data) u32 Data)
{ {
struct r8192_priv *priv = rtllib_priv(dev); struct r8192_priv *priv = rtllib_priv(dev);
u32 DataAndAddr = 0, NewOffset = 0; u32 DataAndAddr = 0, NewOffset = 0;
...@@ -400,7 +401,7 @@ void rtl8192_phyConfigBB(struct net_device *dev, u8 ConfigType) ...@@ -400,7 +401,7 @@ void rtl8192_phyConfigBB(struct net_device *dev, u8 ConfigType)
return; return;
} }
void rtl8192_InitBBRFRegDef(struct net_device *dev) static void rtl8192_InitBBRFRegDef(struct net_device *dev)
{ {
struct r8192_priv *priv = rtllib_priv(dev); struct r8192_priv *priv = rtllib_priv(dev);
...@@ -549,7 +550,7 @@ bool rtl8192_phy_checkBBAndRF(struct net_device *dev, ...@@ -549,7 +550,7 @@ bool rtl8192_phy_checkBBAndRF(struct net_device *dev,
return ret; return ret;
} }
bool rtl8192_BB_Config_ParaFile(struct net_device *dev) static bool rtl8192_BB_Config_ParaFile(struct net_device *dev)
{ {
struct r8192_priv *priv = rtllib_priv(dev); struct r8192_priv *priv = rtllib_priv(dev);
bool rtStatus = true; bool rtStatus = true;
...@@ -790,7 +791,7 @@ u8 rtl8192_phy_ConfigRFWithHeaderFile(struct net_device *dev, ...@@ -790,7 +791,7 @@ u8 rtl8192_phy_ConfigRFWithHeaderFile(struct net_device *dev,
return ret; return ret;
} }
void rtl8192_SetTxPowerLevel(struct net_device *dev, u8 channel) static void rtl8192_SetTxPowerLevel(struct net_device *dev, u8 channel)
{ {
struct r8192_priv *priv = rtllib_priv(dev); struct r8192_priv *priv = rtllib_priv(dev);
u8 powerlevel = priv->TxPowerLevelCCK[channel-1]; u8 powerlevel = priv->TxPowerLevelCCK[channel-1];
...@@ -815,9 +816,10 @@ void rtl8192_SetTxPowerLevel(struct net_device *dev, u8 channel) ...@@ -815,9 +816,10 @@ void rtl8192_SetTxPowerLevel(struct net_device *dev, u8 channel)
return; return;
} }
u8 rtl8192_phy_SetSwChnlCmdArray(struct sw_chnl_cmd *CmdTable, u32 CmdTableIdx, static u8 rtl8192_phy_SetSwChnlCmdArray(struct sw_chnl_cmd *CmdTable,
u32 CmdTableSz, enum sw_chnl_cmd_id CmdID, u32 CmdTableIdx, u32 CmdTableSz,
u32 Para1, u32 Para2, u32 msDelay) enum sw_chnl_cmd_id CmdID,
u32 Para1, u32 Para2, u32 msDelay)
{ {
struct sw_chnl_cmd *pCmd; struct sw_chnl_cmd *pCmd;
...@@ -843,8 +845,8 @@ u8 rtl8192_phy_SetSwChnlCmdArray(struct sw_chnl_cmd *CmdTable, u32 CmdTableIdx, ...@@ -843,8 +845,8 @@ u8 rtl8192_phy_SetSwChnlCmdArray(struct sw_chnl_cmd *CmdTable, u32 CmdTableIdx,
return true; return true;
} }
u8 rtl8192_phy_SwChnlStepByStep(struct net_device *dev, u8 channel, u8 *stage, static u8 rtl8192_phy_SwChnlStepByStep(struct net_device *dev, u8 channel,
u8 *step, u32 *delay) u8 *stage, u8 *step, u32 *delay)
{ {
struct r8192_priv *priv = rtllib_priv(dev); struct r8192_priv *priv = rtllib_priv(dev);
struct sw_chnl_cmd PreCommonCmd[MAX_PRECMD_CNT]; struct sw_chnl_cmd PreCommonCmd[MAX_PRECMD_CNT];
...@@ -983,7 +985,7 @@ u8 rtl8192_phy_SwChnlStepByStep(struct net_device *dev, u8 channel, u8 *stage, ...@@ -983,7 +985,7 @@ u8 rtl8192_phy_SwChnlStepByStep(struct net_device *dev, u8 channel, u8 *stage,
return false; return false;
} }
void rtl8192_phy_FinishSwChnlNow(struct net_device *dev, u8 channel) static void rtl8192_phy_FinishSwChnlNow(struct net_device *dev, u8 channel)
{ {
struct r8192_priv *priv = rtllib_priv(dev); struct r8192_priv *priv = rtllib_priv(dev);
u32 delay = 0; u32 delay = 0;
...@@ -1410,8 +1412,8 @@ void PHY_SetRtl8192eRfOff(struct net_device *dev) ...@@ -1410,8 +1412,8 @@ void PHY_SetRtl8192eRfOff(struct net_device *dev)
} }
bool SetRFPowerState8190(struct net_device *dev, static bool SetRFPowerState8190(struct net_device *dev,
enum rt_rf_power_state eRFPowerState) enum rt_rf_power_state eRFPowerState)
{ {
struct r8192_priv *priv = rtllib_priv(dev); struct r8192_priv *priv = rtllib_priv(dev);
struct rt_pwr_save_ctrl *pPSC = (struct rt_pwr_save_ctrl *) struct rt_pwr_save_ctrl *pPSC = (struct rt_pwr_save_ctrl *)
...@@ -1608,7 +1610,7 @@ bool SetRFPowerState(struct net_device *dev, ...@@ -1608,7 +1610,7 @@ bool SetRFPowerState(struct net_device *dev,
return bResult; return bResult;
} }
extern void PHY_ScanOperationBackup8192(struct net_device *dev, u8 Operation) void PHY_ScanOperationBackup8192(struct net_device *dev, u8 Operation)
{ {
struct r8192_priv *priv = rtllib_priv(dev); struct r8192_priv *priv = rtllib_priv(dev);
......
drivers/staging/rtl8192e/rtl_core.c
View file @ 49aab5fd
This diff is collapsed.
drivers/staging/rtl8192e/rtl_core.h
View file @ 49aab5fd
...@@ -1110,7 +1110,6 @@ void rtl819x_process_cck_rxpathsel(struct r8192_priv *priv, ...@@ -1110,7 +1110,6 @@ void rtl819x_process_cck_rxpathsel(struct r8192_priv *priv,
u8 rtl819x_query_rxpwrpercentage(char antpower); u8 rtl819x_query_rxpwrpercentage(char antpower);
void rtl8192_record_rxdesc_forlateruse(struct rtllib_rx_stats *psrc_stats, void rtl8192_record_rxdesc_forlateruse(struct rtllib_rx_stats *psrc_stats,
struct rtllib_rx_stats *ptarget_stats); struct rtllib_rx_stats *ptarget_stats);
bool NicIFEnableNIC(struct net_device *dev); bool NicIFEnableNIC(struct net_device *dev);
bool NicIFDisableNIC(struct net_device *dev); bool NicIFDisableNIC(struct net_device *dev);
......
drivers/staging/rtl8192e/rtl_dm.c
View file @ 49aab5fd
This diff is collapsed.
drivers/staging/rtl8192e/rtl_eeprom.c
View file @ 49aab5fd
...@@ -25,7 +25,7 @@ ...@@ -25,7 +25,7 @@
#include "rtl_core.h" #include "rtl_core.h"
#include "rtl_eeprom.h" #include "rtl_eeprom.h"
void eprom_cs(struct net_device *dev, short bit) static void eprom_cs(struct net_device *dev, short bit)
{ {
if (bit) if (bit)
write_nic_byte(dev, EPROM_CMD, write_nic_byte(dev, EPROM_CMD,
...@@ -39,7 +39,7 @@ void eprom_cs(struct net_device *dev, short bit) ...@@ -39,7 +39,7 @@ void eprom_cs(struct net_device *dev, short bit)
} }
void eprom_ck_cycle(struct net_device *dev) static void eprom_ck_cycle(struct net_device *dev)
{ {
write_nic_byte(dev, EPROM_CMD, write_nic_byte(dev, EPROM_CMD,
(1<<EPROM_CK_SHIFT) | read_nic_byte(dev, EPROM_CMD)); (1<<EPROM_CK_SHIFT) | read_nic_byte(dev, EPROM_CMD));
...@@ -50,7 +50,7 @@ void eprom_ck_cycle(struct net_device *dev) ...@@ -50,7 +50,7 @@ void eprom_ck_cycle(struct net_device *dev)
} }
void eprom_w(struct net_device *dev, short bit) static void eprom_w(struct net_device *dev, short bit)
{ {
if (bit) if (bit)
write_nic_byte(dev, EPROM_CMD, (1<<EPROM_W_SHIFT) | write_nic_byte(dev, EPROM_CMD, (1<<EPROM_W_SHIFT) |
...@@ -63,7 +63,7 @@ void eprom_w(struct net_device *dev, short bit) ...@@ -63,7 +63,7 @@ void eprom_w(struct net_device *dev, short bit)
} }
short eprom_r(struct net_device *dev) static short eprom_r(struct net_device *dev)
{ {
short bit; short bit;
...@@ -75,8 +75,7 @@ short eprom_r(struct net_device *dev) ...@@ -75,8 +75,7 @@ short eprom_r(struct net_device *dev)
return 0; return 0;
} }
static void eprom_send_bits_string(struct net_device *dev, short b[], int len)
void eprom_send_bits_string(struct net_device *dev, short b[], int len)
{ {
int i; int i;
......
drivers/staging/rtl8192e/rtl_ps.c
View file @ 49aab5fd
...@@ -29,7 +29,7 @@ ...@@ -29,7 +29,7 @@
#include "r8190P_rtl8256.h" /* RTL8225 Radio frontend */ #include "r8190P_rtl8256.h" /* RTL8225 Radio frontend */
#include "r8192E_cmdpkt.h" #include "r8192E_cmdpkt.h"
void rtl8192_hw_sleep_down(struct net_device *dev) static void rtl8192_hw_sleep_down(struct net_device *dev)
{ {
struct r8192_priv *priv = rtllib_priv(dev); struct r8192_priv *priv = rtllib_priv(dev);
unsigned long flags = 0; unsigned long flags = 0;
...@@ -115,7 +115,7 @@ void rtl8192_hw_to_sleep(struct net_device *dev, u64 time) ...@@ -115,7 +115,7 @@ void rtl8192_hw_to_sleep(struct net_device *dev, u64 time)
spin_unlock_irqrestore(&priv->ps_lock, flags); spin_unlock_irqrestore(&priv->ps_lock, flags);
} }
void InactivePsWorkItemCallback(struct net_device *dev) static void InactivePsWorkItemCallback(struct net_device *dev)
{ {
struct r8192_priv *priv = rtllib_priv(dev); struct r8192_priv *priv = rtllib_priv(dev);
struct rt_pwr_save_ctrl *pPSC = (struct rt_pwr_save_ctrl *) struct rt_pwr_save_ctrl *pPSC = (struct rt_pwr_save_ctrl *)
...@@ -214,7 +214,8 @@ void rtllib_ips_leave(struct net_device *dev) ...@@ -214,7 +214,8 @@ void rtllib_ips_leave(struct net_device *dev)
up(&priv->rtllib->ips_sem); up(&priv->rtllib->ips_sem);
} }
bool MgntActSet_802_11_PowerSaveMode(struct net_device *dev, u8 rtPsMode) static bool MgntActSet_802_11_PowerSaveMode(struct net_device *dev,
u8 rtPsMode)
{ {
struct r8192_priv *priv = rtllib_priv(dev); struct r8192_priv *priv = rtllib_priv(dev);
......
drivers/staging/rtl8192e/rtl_wx.c
View file @ 49aab5fd
...@@ -22,7 +22,7 @@ ...@@ -22,7 +22,7 @@
#include "dot11d.h" #include "dot11d.h"
#define RATE_COUNT 12 #define RATE_COUNT 12
u32 rtl8192_rates[] = { static u32 rtl8192_rates[] = {
1000000, 2000000, 5500000, 11000000, 6000000, 9000000, 12000000, 1000000, 2000000, 5500000, 11000000, 6000000, 9000000, 12000000,
18000000, 24000000, 36000000, 48000000, 54000000 18000000, 24000000, 36000000, 48000000, 54000000
}; };
...@@ -198,9 +198,9 @@ struct adhoc_peers_info { ...@@ -198,9 +198,9 @@ struct adhoc_peers_info {
unsigned char num; unsigned char num;
}; };
int r8192_wx_get_adhoc_peers(struct net_device *dev, static int r8192_wx_get_adhoc_peers(struct net_device *dev,
struct iw_request_info *info, struct iw_request_info *info,
union iwreq_data *wrqu, char *extra) union iwreq_data *wrqu, char *extra)
{ {
return 0; return 0;
} }
...@@ -1293,7 +1293,7 @@ static iw_handler r8192_private_handler[] = { ...@@ -1293,7 +1293,7 @@ static iw_handler r8192_private_handler[] = {
(iw_handler)r8192_wx_get_PromiscuousMode, (iw_handler)r8192_wx_get_PromiscuousMode,
}; };
struct iw_statistics *r8192_get_wireless_stats(struct net_device *dev) static struct iw_statistics *r8192_get_wireless_stats(struct net_device *dev)
{ {
struct r8192_priv *priv = rtllib_priv(dev); struct r8192_priv *priv = rtllib_priv(dev);
struct rtllib_device *ieee = priv->rtllib; struct rtllib_device *ieee = priv->rtllib;
......
drivers/staging/rtl8192e/rtllib_rx.c
View file @ 49aab5fd
...@@ -442,15 +442,20 @@ static int is_duplicate_packet(struct rtllib_device *ieee, ...@@ -442,15 +442,20 @@ static int is_duplicate_packet(struct rtllib_device *ieee,
return 1; return 1;
} }
bool AddReorderEntry(struct rx_ts_record *pTS, struct rx_reorder_entry *pReorderEntry) static bool AddReorderEntry(struct rx_ts_record *pTS,
struct rx_reorder_entry *pReorderEntry)
{ {
struct list_head *pList = &pTS->RxPendingPktList; struct list_head *pList = &pTS->RxPendingPktList;
while (pList->next != &pTS->RxPendingPktList) { while (pList->next != &pTS->RxPendingPktList) {
if (SN_LESS(pReorderEntry->SeqNum, ((struct rx_reorder_entry *)list_entry(pList->next, struct rx_reorder_entry, List))->SeqNum)) if (SN_LESS(pReorderEntry->SeqNum, ((struct rx_reorder_entry *)
list_entry(pList->next, struct rx_reorder_entry,
List))->SeqNum))
pList = pList->next; pList = pList->next;
else if (SN_EQUAL(pReorderEntry->SeqNum, ((struct rx_reorder_entry *)list_entry(pList->next, struct rx_reorder_entry, List))->SeqNum)) else if (SN_EQUAL(pReorderEntry->SeqNum,
return false; ((struct rx_reorder_entry *)list_entry(pList->next,
struct rx_reorder_entry, List))->SeqNum))
return false;
else else
break; break;
} }
...@@ -539,8 +544,9 @@ void rtllib_FlushRxTsPendingPkts(struct rtllib_device *ieee, struct rx_ts_record ...@@ -539,8 +544,9 @@ void rtllib_FlushRxTsPendingPkts(struct rtllib_device *ieee, struct rx_ts_record
pTS->RxIndicateSeq = 0xffff; pTS->RxIndicateSeq = 0xffff;
} }
void RxReorderIndicatePacket(struct rtllib_device *ieee, struct rtllib_rxb *prxb, static void RxReorderIndicatePacket(struct rtllib_device *ieee,
struct rx_ts_record *pTS, u16 SeqNum) struct rtllib_rxb *prxb,
struct rx_ts_record *pTS, u16 SeqNum)
{ {
struct rt_hi_throughput *pHTInfo = ieee->pHTInfo; struct rt_hi_throughput *pHTInfo = ieee->pHTInfo;
struct rx_reorder_entry *pReorderEntry = NULL; struct rx_reorder_entry *pReorderEntry = NULL;
...@@ -728,9 +734,9 @@ void RxReorderIndicatePacket(struct rtllib_device *ieee, struct rtllib_rxb *prxb ...@@ -728,9 +734,9 @@ void RxReorderIndicatePacket(struct rtllib_device *ieee, struct rtllib_rxb *prxb
spin_unlock_irqrestore(&(ieee->reorder_spinlock), flags); spin_unlock_irqrestore(&(ieee->reorder_spinlock), flags);
} }
u8 parse_subframe(struct rtllib_device *ieee, struct sk_buff *skb, static u8 parse_subframe(struct rtllib_device *ieee, struct sk_buff *skb,
struct rtllib_rx_stats *rx_stats, struct rtllib_rx_stats *rx_stats,
struct rtllib_rxb *rxb, u8 *src, u8 *dst) struct rtllib_rxb *rxb, u8 *src, u8 *dst)
{ {
struct rtllib_hdr_3addr *hdr = (struct rtllib_hdr_3addr *)skb->data; struct rtllib_hdr_3addr *hdr = (struct rtllib_hdr_3addr *)skb->data;
u16 fc = le16_to_cpu(hdr->frame_ctl); u16 fc = le16_to_cpu(hdr->frame_ctl);
...@@ -853,8 +859,9 @@ u8 parse_subframe(struct rtllib_device *ieee, struct sk_buff *skb, ...@@ -853,8 +859,9 @@ u8 parse_subframe(struct rtllib_device *ieee, struct sk_buff *skb,
} }
size_t rtllib_rx_get_hdrlen(struct rtllib_device *ieee, struct sk_buff *skb, static size_t rtllib_rx_get_hdrlen(struct rtllib_device *ieee,
struct rtllib_rx_stats *rx_stats) struct sk_buff *skb,
struct rtllib_rx_stats *rx_stats)
{ {
struct rtllib_hdr_4addr *hdr = (struct rtllib_hdr_4addr *)skb->data; struct rtllib_hdr_4addr *hdr = (struct rtllib_hdr_4addr *)skb->data;
u16 fc = le16_to_cpu(hdr->frame_ctl); u16 fc = le16_to_cpu(hdr->frame_ctl);
...@@ -874,8 +881,8 @@ size_t rtllib_rx_get_hdrlen(struct rtllib_device *ieee, struct sk_buff *skb, ...@@ -874,8 +881,8 @@ size_t rtllib_rx_get_hdrlen(struct rtllib_device *ieee, struct sk_buff *skb,
return hdrlen; return hdrlen;
} }
int rtllib_rx_check_duplicate(struct rtllib_device *ieee, struct sk_buff *skb, static int rtllib_rx_check_duplicate(struct rtllib_device *ieee,
u8 multicast) struct sk_buff *skb, u8 multicast)
{ {
struct rtllib_hdr_4addr *hdr = (struct rtllib_hdr_4addr *)skb->data; struct rtllib_hdr_4addr *hdr = (struct rtllib_hdr_4addr *)skb->data;
u16 fc, sc; u16 fc, sc;
...@@ -916,9 +923,9 @@ int rtllib_rx_check_duplicate(struct rtllib_device *ieee, struct sk_buff *skb, ...@@ -916,9 +923,9 @@ int rtllib_rx_check_duplicate(struct rtllib_device *ieee, struct sk_buff *skb,
return 0; return 0;
} }
void rtllib_rx_extract_addr(struct rtllib_device *ieee, static void rtllib_rx_extract_addr(struct rtllib_device *ieee,
struct rtllib_hdr_4addr *hdr, u8 *dst, u8 *src, struct rtllib_hdr_4addr *hdr, u8 *dst,
u8 *bssid) u8 *src, u8 *bssid)
{ {
u16 fc = le16_to_cpu(hdr->frame_ctl); u16 fc = le16_to_cpu(hdr->frame_ctl);
...@@ -946,8 +953,8 @@ void rtllib_rx_extract_addr(struct rtllib_device *ieee, ...@@ -946,8 +953,8 @@ void rtllib_rx_extract_addr(struct rtllib_device *ieee,
} }
} }
int rtllib_rx_data_filter(struct rtllib_device *ieee, u16 fc, u8 *dst, u8 *src, static int rtllib_rx_data_filter(struct rtllib_device *ieee, u16 fc,
u8 *bssid, u8 *addr2) u8 *dst, u8 *src, u8 *bssid, u8 *addr2)
{ {
u8 zero_addr[ETH_ALEN] = {0}; u8 zero_addr[ETH_ALEN] = {0};
u8 type, stype; u8 type, stype;
...@@ -1004,7 +1011,7 @@ int rtllib_rx_data_filter(struct rtllib_device *ieee, u16 fc, u8 *dst, u8 *src, ...@@ -1004,7 +1011,7 @@ int rtllib_rx_data_filter(struct rtllib_device *ieee, u16 fc, u8 *dst, u8 *src,
return 0; return 0;
} }
int rtllib_rx_get_crypt(struct rtllib_device *ieee, struct sk_buff *skb, static int rtllib_rx_get_crypt(struct rtllib_device *ieee, struct sk_buff *skb,
struct rtllib_crypt_data **crypt, size_t hdrlen) struct rtllib_crypt_data **crypt, size_t hdrlen)
{ {
struct rtllib_hdr_4addr *hdr = (struct rtllib_hdr_4addr *)skb->data; struct rtllib_hdr_4addr *hdr = (struct rtllib_hdr_4addr *)skb->data;
...@@ -1038,7 +1045,7 @@ int rtllib_rx_get_crypt(struct rtllib_device *ieee, struct sk_buff *skb, ...@@ -1038,7 +1045,7 @@ int rtllib_rx_get_crypt(struct rtllib_device *ieee, struct sk_buff *skb,
return 0; return 0;
} }
int rtllib_rx_decrypt(struct rtllib_device *ieee, struct sk_buff *skb, static int rtllib_rx_decrypt(struct rtllib_device *ieee, struct sk_buff *skb,
struct rtllib_rx_stats *rx_stats, struct rtllib_rx_stats *rx_stats,
struct rtllib_crypt_data *crypt, size_t hdrlen) struct rtllib_crypt_data *crypt, size_t hdrlen)
{ {
...@@ -1168,7 +1175,7 @@ int rtllib_rx_decrypt(struct rtllib_device *ieee, struct sk_buff *skb, ...@@ -1168,7 +1175,7 @@ int rtllib_rx_decrypt(struct rtllib_device *ieee, struct sk_buff *skb,
return 0; return 0;
} }
void rtllib_rx_check_leave_lps(struct rtllib_device *ieee, u8 unicast, u8 nr_subframes) static void rtllib_rx_check_leave_lps(struct rtllib_device *ieee, u8 unicast, u8 nr_subframes)
{ {
if (unicast) { if (unicast) {
...@@ -1184,7 +1191,7 @@ void rtllib_rx_check_leave_lps(struct rtllib_device *ieee, u8 unicast, u8 nr_sub ...@@ -1184,7 +1191,7 @@ void rtllib_rx_check_leave_lps(struct rtllib_device *ieee, u8 unicast, u8 nr_sub
ieee->last_rx_ps_time = jiffies; ieee->last_rx_ps_time = jiffies;
} }
void rtllib_rx_indicate_pkt_legacy(struct rtllib_device *ieee, static void rtllib_rx_indicate_pkt_legacy(struct rtllib_device *ieee,
struct rtllib_rx_stats *rx_stats, struct rtllib_rx_stats *rx_stats,
struct rtllib_rxb *rxb, struct rtllib_rxb *rxb,
u8 *dst, u8 *dst,
...@@ -1243,7 +1250,7 @@ void rtllib_rx_indicate_pkt_legacy(struct rtllib_device *ieee, ...@@ -1243,7 +1250,7 @@ void rtllib_rx_indicate_pkt_legacy(struct rtllib_device *ieee,
rxb = NULL; rxb = NULL;
} }
int rtllib_rx_InfraAdhoc(struct rtllib_device *ieee, struct sk_buff *skb, static int rtllib_rx_InfraAdhoc(struct rtllib_device *ieee, struct sk_buff *skb,
struct rtllib_rx_stats *rx_stats) struct rtllib_rx_stats *rx_stats)
{ {
struct net_device *dev = ieee->dev; struct net_device *dev = ieee->dev;
...@@ -1412,13 +1419,13 @@ int rtllib_rx_InfraAdhoc(struct rtllib_device *ieee, struct sk_buff *skb, ...@@ -1412,13 +1419,13 @@ int rtllib_rx_InfraAdhoc(struct rtllib_device *ieee, struct sk_buff *skb,
return 0; return 0;
} }
int rtllib_rx_Master(struct rtllib_device *ieee, struct sk_buff *skb, static int rtllib_rx_Master(struct rtllib_device *ieee, struct sk_buff *skb,
struct rtllib_rx_stats *rx_stats) struct rtllib_rx_stats *rx_stats)
{ {
return 0; return 0;
} }
int rtllib_rx_Monitor(struct rtllib_device *ieee, struct sk_buff *skb, static int rtllib_rx_Monitor(struct rtllib_device *ieee, struct sk_buff *skb,
struct rtllib_rx_stats *rx_stats) struct rtllib_rx_stats *rx_stats)
{ {
struct rtllib_hdr_4addr *hdr = (struct rtllib_hdr_4addr *)skb->data; struct rtllib_hdr_4addr *hdr = (struct rtllib_hdr_4addr *)skb->data;
...@@ -1443,7 +1450,7 @@ int rtllib_rx_Monitor(struct rtllib_device *ieee, struct sk_buff *skb, ...@@ -1443,7 +1450,7 @@ int rtllib_rx_Monitor(struct rtllib_device *ieee, struct sk_buff *skb,
return 1; return 1;
} }
int rtllib_rx_Mesh(struct rtllib_device *ieee, struct sk_buff *skb, static int rtllib_rx_Mesh(struct rtllib_device *ieee, struct sk_buff *skb,
struct rtllib_rx_stats *rx_stats) struct rtllib_rx_stats *rx_stats)
{ {
return 0; return 0;
...@@ -2223,7 +2230,7 @@ static inline u8 rtllib_SignalStrengthTranslate(u8 CurrSS) ...@@ -2223,7 +2230,7 @@ static inline u8 rtllib_SignalStrengthTranslate(u8 CurrSS)
return RetSS; return RetSS;
} }
long rtllib_translate_todbm(u8 signal_strength_index) static long rtllib_translate_todbm(u8 signal_strength_index)
{ {
long signal_power; long signal_power;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7