Skip to content

L
linux
Commit c88af76f authored by Michael Straube's avatar Michael Straube Committed by Greg Kroah-Hartman
Browse files
Options

staging: rtl8192e: remove blank lines 

Remove unnecessary blank lines reported by checkpatch.
Signed-off-by: default avatarMichael Straube <straube.linux@gmail.com>
Tested-by: default avatarPhilipp Hortmann <philipp.g.hortmann@gmail.com>
Message-ID: <20230531053118.17053-1-straube.linux@gmail.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 00eca57d
Hide whitespace changes
Inline Side-by-side
Showing with 0 additions and 159 deletions
drivers/staging/rtl8192e/rtl8192e/r8190P_def.h
View file @ c88af76f
...@@ -85,7 +85,6 @@ enum rtl819x_loopback { ...@@ -85,7 +85,6 @@ enum rtl819x_loopback {
#define HAL_PRIME_CHNL_OFFSET_LOWER 1 #define HAL_PRIME_CHNL_OFFSET_LOWER 1
#define HAL_PRIME_CHNL_OFFSET_UPPER 2 #define HAL_PRIME_CHNL_OFFSET_UPPER 2
enum version_8190_loopback { enum version_8190_loopback {
VERSION_8190_BD = 0x3, VERSION_8190_BD = 0x3,
VERSION_8190_BE VERSION_8190_BE
...@@ -139,8 +138,6 @@ struct tx_fwinfo_8190pci { ...@@ -139,8 +138,6 @@ struct tx_fwinfo_8190pci {
u32 Retry_Limit:4; u32 Retry_Limit:4;
u32 Reserved2:1; u32 Reserved2:1;
u32 PacketID:13; u32 PacketID:13;
}; };
struct phy_ofdm_rx_status_rxsc_sgien_exintfflag { struct phy_ofdm_rx_status_rxsc_sgien_exintfflag {
...@@ -172,7 +169,6 @@ struct phy_sts_cck_819xpci { ...@@ -172,7 +169,6 @@ struct phy_sts_cck_819xpci {
u8 cck_agc_rpt; u8 cck_agc_rpt;
}; };
#define PHY_RSSI_SLID_WIN_MAX 100 #define PHY_RSSI_SLID_WIN_MAX 100
#define PHY_Beacon_RSSI_SLID_WIN_MAX 10 #define PHY_Beacon_RSSI_SLID_WIN_MAX 10
...@@ -214,7 +210,6 @@ struct tx_desc { ...@@ -214,7 +210,6 @@ struct tx_desc {
u32 Reserved7; u32 Reserved7;
}; };
struct tx_desc_cmd { struct tx_desc_cmd {
u16 PktSize; u16 PktSize;
u8 Reserved1; u8 Reserved1;
...@@ -256,10 +251,8 @@ struct rx_desc { ...@@ -256,10 +251,8 @@ struct rx_desc {
u32 Reserved3; u32 Reserved3;
u32 BufferAddress; u32 BufferAddress;
}; };
struct rx_fwinfo { struct rx_fwinfo {
u16 Reserved1:12; u16 Reserved1:12;
u16 PartAggr:1; u16 PartAggr:1;
...@@ -278,7 +271,6 @@ struct rx_fwinfo { ...@@ -278,7 +271,6 @@ struct rx_fwinfo {
u8 Reserved4:1; u8 Reserved4:1;
u32 TSFL; u32 TSFL;
}; };
#endif #endif
drivers/staging/rtl8192e/rtl8192e/r8192E_dev.c
View file @ c88af76f
...@@ -107,7 +107,6 @@ void rtl92e_set_reg(struct net_device *dev, u8 variable, u8 *val) ...@@ -107,7 +107,6 @@ void rtl92e_set_reg(struct net_device *dev, u8 variable, u8 *val)
} }
rtl92e_writeb(dev, MSR, btMsr); rtl92e_writeb(dev, MSR, btMsr);
} }
break; break;
...@@ -126,7 +125,6 @@ void rtl92e_set_reg(struct net_device *dev, u8 variable, u8 *val) ...@@ -126,7 +125,6 @@ void rtl92e_set_reg(struct net_device *dev, u8 variable, u8 *val)
rtl92e_writel(dev, RCR, RegRCR); rtl92e_writel(dev, RCR, RegRCR);
priv->receive_config = RegRCR; priv->receive_config = RegRCR;
} }
break; break;
...@@ -266,7 +264,6 @@ void rtl92e_set_reg(struct net_device *dev, u8 variable, u8 *val) ...@@ -266,7 +264,6 @@ void rtl92e_set_reg(struct net_device *dev, u8 variable, u8 *val)
default: default:
break; break;
} }
} }
static void _rtl92e_read_eeprom_info(struct net_device *dev) static void _rtl92e_read_eeprom_info(struct net_device *dev)
...@@ -714,7 +711,6 @@ bool rtl92e_start_adapter(struct net_device *dev) ...@@ -714,7 +711,6 @@ bool rtl92e_start_adapter(struct net_device *dev)
static void _rtl92e_net_update(struct net_device *dev) static void _rtl92e_net_update(struct net_device *dev)
{ {
struct r8192_priv *priv = rtllib_priv(dev); struct r8192_priv *priv = rtllib_priv(dev);
struct rtllib_network *net; struct rtllib_network *net;
u16 BcnTimeCfg = 0, BcnCW = 6, BcnIFS = 0xf; u16 BcnTimeCfg = 0, BcnCW = 6, BcnIFS = 0xf;
...@@ -1006,7 +1002,6 @@ void rtl92e_fill_tx_desc(struct net_device *dev, struct tx_desc *pdesc, ...@@ -1006,7 +1002,6 @@ void rtl92e_fill_tx_desc(struct net_device *dev, struct tx_desc *pdesc,
pdesc->SecCAMID = 0; pdesc->SecCAMID = 0;
pdesc->RATid = cb_desc->ratr_index; pdesc->RATid = cb_desc->ratr_index;
pdesc->NoEnc = 1; pdesc->NoEnc = 1;
pdesc->SecType = 0x0; pdesc->SecType = 0x0;
if (cb_desc->bHwSec) { if (cb_desc->bHwSec) {
...@@ -1213,7 +1208,6 @@ static long _rtl92e_signal_scale_mapping(struct r8192_priv *priv, long currsig) ...@@ -1213,7 +1208,6 @@ static long _rtl92e_signal_scale_mapping(struct r8192_priv *priv, long currsig)
return retsig; return retsig;
} }
#define rx_hal_is_cck_rate(_pdrvinfo)\ #define rx_hal_is_cck_rate(_pdrvinfo)\
((_pdrvinfo->RxRate == DESC90_RATE1M ||\ ((_pdrvinfo->RxRate == DESC90_RATE1M ||\
_pdrvinfo->RxRate == DESC90_RATE2M ||\ _pdrvinfo->RxRate == DESC90_RATE2M ||\
...@@ -1261,7 +1255,6 @@ static void _rtl92e_query_rxphystatus( ...@@ -1261,7 +1255,6 @@ static void _rtl92e_query_rxphystatus(
check_reg824 = 1; check_reg824 = 1;
} }
prxpkt = (u8 *)pdrvinfo; prxpkt = (u8 *)pdrvinfo;
prxpkt += sizeof(struct rx_fwinfo); prxpkt += sizeof(struct rx_fwinfo);
...@@ -1368,7 +1361,6 @@ static void _rtl92e_query_rxphystatus( ...@@ -1368,7 +1361,6 @@ static void _rtl92e_query_rxphystatus(
} }
} }
rx_pwr_all = (((pofdm_buf->pwdb_all) >> 1) & 0x7f) - 106; rx_pwr_all = (((pofdm_buf->pwdb_all) >> 1) & 0x7f) - 106;
pwdb_all = rtl92e_rx_db_to_percent(rx_pwr_all); pwdb_all = rtl92e_rx_db_to_percent(rx_pwr_all);
...@@ -1485,7 +1477,6 @@ static void _rtl92e_process_phyinfo(struct r8192_priv *priv, u8 *buffer, ...@@ -1485,7 +1477,6 @@ static void _rtl92e_process_phyinfo(struct r8192_priv *priv, u8 *buffer,
} }
} }
if (prev_st->bPacketBeacon) { if (prev_st->bPacketBeacon) {
if (slide_beacon_adc_pwdb_statistics++ >= if (slide_beacon_adc_pwdb_statistics++ >=
PHY_Beacon_RSSI_SLID_WIN_MAX) { PHY_Beacon_RSSI_SLID_WIN_MAX) {
...@@ -1802,7 +1793,6 @@ void rtl92e_stop_adapter(struct net_device *dev, bool reset) ...@@ -1802,7 +1793,6 @@ void rtl92e_stop_adapter(struct net_device *dev, bool reset)
rtl92e_writel(dev, WFCRC1, 0xffffffff); rtl92e_writel(dev, WFCRC1, 0xffffffff);
rtl92e_writel(dev, WFCRC2, 0xffffffff); rtl92e_writel(dev, WFCRC2, 0xffffffff);
rtl92e_writeb(dev, PMR, 0x5); rtl92e_writeb(dev, PMR, 0x5);
rtl92e_writeb(dev, MAC_BLK_CTRL, 0xa); rtl92e_writeb(dev, MAC_BLK_CTRL, 0xa);
} }
...@@ -1897,7 +1887,6 @@ void rtl92e_enable_irq(struct net_device *dev) ...@@ -1897,7 +1887,6 @@ void rtl92e_enable_irq(struct net_device *dev)
priv->irq_enabled = 1; priv->irq_enabled = 1;
rtl92e_writel(dev, INTA_MASK, priv->irq_mask[0]); rtl92e_writel(dev, INTA_MASK, priv->irq_mask[0]);
} }
void rtl92e_disable_irq(struct net_device *dev) void rtl92e_disable_irq(struct net_device *dev)
...@@ -1929,7 +1918,6 @@ void rtl92e_enable_tx(struct net_device *dev) ...@@ -1929,7 +1918,6 @@ void rtl92e_enable_tx(struct net_device *dev)
rtl92e_writel(dev, TX_DESC_BASE[i], priv->tx_ring[i].dma); rtl92e_writel(dev, TX_DESC_BASE[i], priv->tx_ring[i].dma);
} }
void rtl92e_ack_irq(struct net_device *dev, u32 *p_inta, u32 *p_intb) void rtl92e_ack_irq(struct net_device *dev, u32 *p_inta, u32 *p_intb)
{ {
*p_inta = rtl92e_readl(dev, ISR); *p_inta = rtl92e_readl(dev, ISR);
...@@ -1986,8 +1974,6 @@ bool rtl92e_is_rx_stuck(struct net_device *dev) ...@@ -1986,8 +1974,6 @@ bool rtl92e_is_rx_stuck(struct net_device *dev)
TotalRxStuckCount += TotalRxStuckCount +=
priv->silent_reset_rx_stuck_event[i]; priv->silent_reset_rx_stuck_event[i];
} }
} else { } else {
priv->silent_reset_rx_stuck_event[SlotIndex] = 0; priv->silent_reset_rx_stuck_event[SlotIndex] = 0;
} }
......
drivers/staging/rtl8192e/rtl8192e/r8192E_phy.c
View file @ c88af76f
...@@ -32,7 +32,6 @@ static u32 _rtl92e_calculate_bit_shift(u32 dwBitMask) ...@@ -32,7 +32,6 @@ static u32 _rtl92e_calculate_bit_shift(u32 dwBitMask)
void rtl92e_set_bb_reg(struct net_device *dev, u32 dwRegAddr, u32 dwBitMask, void rtl92e_set_bb_reg(struct net_device *dev, u32 dwRegAddr, u32 dwBitMask,
u32 dwData) u32 dwData)
{ {
u32 OriginalValue, BitShift, NewValue; u32 OriginalValue, BitShift, NewValue;
if (dwBitMask != bMaskDWord) { if (dwBitMask != bMaskDWord) {
...@@ -99,7 +98,6 @@ static u32 _rtl92e_phy_rf_read(struct net_device *dev, ...@@ -99,7 +98,6 @@ static u32 _rtl92e_phy_rf_read(struct net_device *dev,
rtl92e_set_bb_reg(dev, rFPGA0_AnalogParameter4, 0x300, 0x3); rtl92e_set_bb_reg(dev, rFPGA0_AnalogParameter4, 0x300, 0x3);
return ret; return ret;
} }
static void _rtl92e_phy_rf_write(struct net_device *dev, static void _rtl92e_phy_rf_write(struct net_device *dev,
...@@ -226,7 +224,6 @@ static u32 _rtl92e_phy_rf_fw_read(struct net_device *dev, ...@@ -226,7 +224,6 @@ static u32 _rtl92e_phy_rf_fw_read(struct net_device *dev,
return 0; return 0;
} }
return rtl92e_readl(dev, RF_DATA); return rtl92e_readl(dev, RF_DATA);
} }
static void _rtl92e_phy_rf_fw_write(struct net_device *dev, static void _rtl92e_phy_rf_fw_write(struct net_device *dev,
...@@ -247,10 +244,8 @@ static void _rtl92e_phy_rf_fw_write(struct net_device *dev, ...@@ -247,10 +244,8 @@ static void _rtl92e_phy_rf_fw_write(struct net_device *dev,
break; break;
} }
rtl92e_writel(dev, QPNR, Data); rtl92e_writel(dev, QPNR, Data);
} }
void rtl92e_config_mac(struct net_device *dev) void rtl92e_config_mac(struct net_device *dev)
{ {
u32 dwArrayLen = 0, i = 0; u32 dwArrayLen = 0, i = 0;
...@@ -272,7 +267,6 @@ void rtl92e_config_mac(struct net_device *dev) ...@@ -272,7 +267,6 @@ void rtl92e_config_mac(struct net_device *dev)
pdwArray[i + 2]); pdwArray[i + 2]);
} }
return; return;
} }
static void _rtl92e_phy_config_bb(struct net_device *dev, u8 ConfigType) static void _rtl92e_phy_config_bb(struct net_device *dev, u8 ConfigType)
...@@ -370,7 +364,6 @@ bool rtl92e_check_bb_and_rf(struct net_device *dev, enum hw90_block CheckBlock, ...@@ -370,7 +364,6 @@ bool rtl92e_check_bb_and_rf(struct net_device *dev, enum hw90_block CheckBlock,
break; break;
} }
if (dwRegRead != WriteData[i]) { if (dwRegRead != WriteData[i]) {
netdev_warn(dev, "%s(): Check failed.\n", __func__); netdev_warn(dev, "%s(): Check failed.\n", __func__);
ret = false; ret = false;
...@@ -415,7 +408,6 @@ static bool _rtl92e_bb_config_para_file(struct net_device *dev) ...@@ -415,7 +408,6 @@ static bool _rtl92e_bb_config_para_file(struct net_device *dev)
rtl92e_set_bb_reg(dev, rFPGA0_TxGainStage, rtl92e_set_bb_reg(dev, rFPGA0_TxGainStage,
(bXBTxAGC | bXCTxAGC | bXDTxAGC), dwRegValue); (bXBTxAGC | bXCTxAGC | bXDTxAGC), dwRegValue);
dwRegValue = priv->crystal_cap; dwRegValue = priv->crystal_cap;
rtl92e_set_bb_reg(dev, rFPGA0_AnalogParameter1, bXtalCap92x, rtl92e_set_bb_reg(dev, rFPGA0_AnalogParameter1, bXtalCap92x,
dwRegValue); dwRegValue);
...@@ -470,7 +462,6 @@ void rtl92e_set_tx_power(struct net_device *dev, u8 channel) ...@@ -470,7 +462,6 @@ void rtl92e_set_tx_power(struct net_device *dev, u8 channel)
u8 rtl92e_config_rf_path(struct net_device *dev, enum rf90_radio_path eRFPath) u8 rtl92e_config_rf_path(struct net_device *dev, enum rf90_radio_path eRFPath)
{ {
int i; int i;
switch (eRFPath) { switch (eRFPath) {
...@@ -483,7 +474,6 @@ u8 rtl92e_config_rf_path(struct net_device *dev, enum rf90_radio_path eRFPath) ...@@ -483,7 +474,6 @@ u8 rtl92e_config_rf_path(struct net_device *dev, enum rf90_radio_path eRFPath)
rtl92e_set_rf_reg(dev, eRFPath, RTL8192E_RADIO_A_ARR[i], rtl92e_set_rf_reg(dev, eRFPath, RTL8192E_RADIO_A_ARR[i],
bMask12Bits, bMask12Bits,
RTL8192E_RADIO_A_ARR[i + 1]); RTL8192E_RADIO_A_ARR[i + 1]);
} }
break; break;
case RF90_PATH_B: case RF90_PATH_B:
...@@ -495,7 +485,6 @@ u8 rtl92e_config_rf_path(struct net_device *dev, enum rf90_radio_path eRFPath) ...@@ -495,7 +485,6 @@ u8 rtl92e_config_rf_path(struct net_device *dev, enum rf90_radio_path eRFPath)
rtl92e_set_rf_reg(dev, eRFPath, RTL8192E_RADIO_B_ARR[i], rtl92e_set_rf_reg(dev, eRFPath, RTL8192E_RADIO_B_ARR[i],
bMask12Bits, bMask12Bits,
RTL8192E_RADIO_B_ARR[i + 1]); RTL8192E_RADIO_B_ARR[i + 1]);
} }
break; break;
default: default:
...@@ -503,7 +492,6 @@ u8 rtl92e_config_rf_path(struct net_device *dev, enum rf90_radio_path eRFPath) ...@@ -503,7 +492,6 @@ u8 rtl92e_config_rf_path(struct net_device *dev, enum rf90_radio_path eRFPath)
} }
return 0; return 0;
} }
static void _rtl92e_set_tx_power_level(struct net_device *dev, u8 channel) static void _rtl92e_set_tx_power_level(struct net_device *dev, u8 channel)
...@@ -677,7 +665,6 @@ static void _rtl92e_phy_switch_channel(struct net_device *dev, u8 channel) ...@@ -677,7 +665,6 @@ static void _rtl92e_phy_switch_channel(struct net_device *dev, u8 channel)
static void _rtl92e_phy_switch_channel_work_item(struct net_device *dev) static void _rtl92e_phy_switch_channel_work_item(struct net_device *dev)
{ {
struct r8192_priv *priv = rtllib_priv(dev); struct r8192_priv *priv = rtllib_priv(dev);
_rtl92e_phy_switch_channel(dev, priv->chan); _rtl92e_phy_switch_channel(dev, priv->chan);
...@@ -694,7 +681,6 @@ u8 rtl92e_set_channel(struct net_device *dev, u8 channel) ...@@ -694,7 +681,6 @@ u8 rtl92e_set_channel(struct net_device *dev, u8 channel)
if (priv->sw_chnl_in_progress) if (priv->sw_chnl_in_progress)
return false; return false;
switch (priv->rtllib->mode) { switch (priv->rtllib->mode) {
case WIRELESS_MODE_B: case WIRELESS_MODE_B:
if (channel > 14) { if (channel > 14) {
...@@ -824,7 +810,6 @@ static void _rtl92e_cck_tx_power_track_bw_switch(struct net_device *dev) ...@@ -824,7 +810,6 @@ static void _rtl92e_cck_tx_power_track_bw_switch(struct net_device *dev)
static void _rtl92e_set_bw_mode_work_item(struct net_device *dev) static void _rtl92e_set_bw_mode_work_item(struct net_device *dev)
{ {
struct r8192_priv *priv = rtllib_priv(dev); struct r8192_priv *priv = rtllib_priv(dev);
u8 regBwOpMode; u8 regBwOpMode;
...@@ -890,7 +875,6 @@ static void _rtl92e_set_bw_mode_work_item(struct net_device *dev) ...@@ -890,7 +875,6 @@ static void _rtl92e_set_bw_mode_work_item(struct net_device *dev)
netdev_err(dev, "%s(): unknown Bandwidth: %#X\n", __func__, netdev_err(dev, "%s(): unknown Bandwidth: %#X\n", __func__,
priv->current_chnl_bw); priv->current_chnl_bw);
break; break;
} }
rtl92e_set_bandwidth(dev, priv->current_chnl_bw); rtl92e_set_bandwidth(dev, priv->current_chnl_bw);
...@@ -904,7 +888,6 @@ void rtl92e_set_bw_mode(struct net_device *dev, enum ht_channel_width bandwidth, ...@@ -904,7 +888,6 @@ void rtl92e_set_bw_mode(struct net_device *dev, enum ht_channel_width bandwidth,
{ {
struct r8192_priv *priv = rtllib_priv(dev); struct r8192_priv *priv = rtllib_priv(dev);
if (priv->set_bw_mode_in_progress) if (priv->set_bw_mode_in_progress)
return; return;
...@@ -921,7 +904,6 @@ void rtl92e_set_bw_mode(struct net_device *dev, enum ht_channel_width bandwidth, ...@@ -921,7 +904,6 @@ void rtl92e_set_bw_mode(struct net_device *dev, enum ht_channel_width bandwidth,
priv->n_cur_40mhz_prime_sc = HAL_PRIME_CHNL_OFFSET_DONT_CARE; priv->n_cur_40mhz_prime_sc = HAL_PRIME_CHNL_OFFSET_DONT_CARE;
_rtl92e_set_bw_mode_work_item(dev); _rtl92e_set_bw_mode_work_item(dev);
} }
void rtl92e_init_gain(struct net_device *dev, u8 Operation) void rtl92e_init_gain(struct net_device *dev, u8 Operation)
...@@ -993,7 +975,6 @@ void rtl92e_init_gain(struct net_device *dev, u8 Operation) ...@@ -993,7 +975,6 @@ void rtl92e_init_gain(struct net_device *dev, u8 Operation)
void rtl92e_set_rf_off(struct net_device *dev) void rtl92e_set_rf_off(struct net_device *dev)
{ {
rtl92e_set_bb_reg(dev, rFPGA0_XA_RFInterfaceOE, BIT4, 0x0); rtl92e_set_bb_reg(dev, rFPGA0_XA_RFInterfaceOE, BIT4, 0x0);
rtl92e_set_bb_reg(dev, rFPGA0_AnalogParameter4, 0x300, 0x0); rtl92e_set_bb_reg(dev, rFPGA0_AnalogParameter4, 0x300, 0x0);
rtl92e_set_bb_reg(dev, rFPGA0_AnalogParameter1, 0x18, 0x0); rtl92e_set_bb_reg(dev, rFPGA0_AnalogParameter1, 0x18, 0x0);
...@@ -1002,7 +983,6 @@ void rtl92e_set_rf_off(struct net_device *dev) ...@@ -1002,7 +983,6 @@ void rtl92e_set_rf_off(struct net_device *dev)
rtl92e_set_bb_reg(dev, rFPGA0_AnalogParameter1, 0x60, 0x0); rtl92e_set_bb_reg(dev, rFPGA0_AnalogParameter1, 0x60, 0x0);
rtl92e_set_bb_reg(dev, rFPGA0_AnalogParameter1, 0x4, 0x0); rtl92e_set_bb_reg(dev, rFPGA0_AnalogParameter1, 0x4, 0x0);
rtl92e_writeb(dev, ANAPAR_FOR_8192PCIE, 0x07); rtl92e_writeb(dev, ANAPAR_FOR_8192PCIE, 0x07);
} }
static bool _rtl92e_set_rf_power_state(struct net_device *dev, static bool _rtl92e_set_rf_power_state(struct net_device *dev,
......
drivers/staging/rtl8192e/rtl8192e/r8192E_phyreg.h
View file @ c88af76f
...@@ -7,7 +7,6 @@ ...@@ -7,7 +7,6 @@
#ifndef _R819XU_PHYREG_H #ifndef _R819XU_PHYREG_H
#define _R819XU_PHYREG_H #define _R819XU_PHYREG_H
#define RF_DATA 0x1d4 #define RF_DATA 0x1d4
#define rPMAC_Reset 0x100 #define rPMAC_Reset 0x100
...@@ -125,7 +124,6 @@ ...@@ -125,7 +124,6 @@
#define rOFDM0_TxCoeff5 0xcb4 #define rOFDM0_TxCoeff5 0xcb4
#define rOFDM0_TxCoeff6 0xcb8 #define rOFDM0_TxCoeff6 0xcb8
#define rOFDM1_LSTF 0xd00 #define rOFDM1_LSTF 0xd00
#define rOFDM1_TRxPathEnable 0xd04 #define rOFDM1_TRxPathEnable 0xd04
#define rOFDM1_CFO 0xd08 #define rOFDM1_CFO 0xd08
...@@ -163,7 +161,6 @@ ...@@ -163,7 +161,6 @@
#define rTxAGC_Mcs11_Mcs08 0xe18 #define rTxAGC_Mcs11_Mcs08 0xe18
#define rTxAGC_Mcs15_Mcs12 0xe1c #define rTxAGC_Mcs15_Mcs12 0xe1c
#define rZebra1_HSSIEnable 0x0 #define rZebra1_HSSIEnable 0x0
#define rZebra1_TRxEnable1 0x1 #define rZebra1_TRxEnable1 0x1
#define rZebra1_TRxEnable2 0x2 #define rZebra1_TRxEnable2 0x2
...@@ -819,7 +816,6 @@ ...@@ -819,7 +816,6 @@
#define bOFDMPHY0_End 0xcff #define bOFDMPHY0_End 0xcff
#define bOFDMPHY1_End 0xdff #define bOFDMPHY1_End 0xdff
#define bPMACControl 0x0 #define bPMACControl 0x0
#define bWMACControl 0x1 #define bWMACControl 0x1
#define bWNICControl 0x2 #define bWNICControl 0x2
......
drivers/staging/rtl8192e/rtl8192e/rtl_cam.c
View file @ c88af76f
...@@ -101,7 +101,6 @@ void rtl92e_set_key(struct net_device *dev, u8 EntryNo, u8 KeyIndex, ...@@ -101,7 +101,6 @@ void rtl92e_set_key(struct net_device *dev, u8 EntryNo, u8 KeyIndex,
else else
usConfig |= BIT15 | (KeyType << 2) | KeyIndex; usConfig |= BIT15 | (KeyType << 2) | KeyIndex;
for (i = 0; i < CAM_CONTENT_COUNT; i++) { for (i = 0; i < CAM_CONTENT_COUNT; i++) {
TargetCommand = i + CAM_CONTENT_COUNT * EntryNo; TargetCommand = i + CAM_CONTENT_COUNT * EntryNo;
TargetCommand |= BIT31 | BIT16; TargetCommand |= BIT31 | BIT16;
...@@ -149,7 +148,6 @@ void rtl92e_cam_restore(struct net_device *dev) ...@@ -149,7 +148,6 @@ void rtl92e_cam_restore(struct net_device *dev)
if ((priv->rtllib->pairwise_key_type == KEY_TYPE_WEP40) || if ((priv->rtllib->pairwise_key_type == KEY_TYPE_WEP40) ||
(priv->rtllib->pairwise_key_type == KEY_TYPE_WEP104)) { (priv->rtllib->pairwise_key_type == KEY_TYPE_WEP104)) {
for (EntryId = 0; EntryId < 4; EntryId++) { for (EntryId = 0; EntryId < 4; EntryId++) {
MacAddr = CAM_CONST_ADDR[EntryId]; MacAddr = CAM_CONST_ADDR[EntryId];
if (priv->rtllib->swcamtable[EntryId].bused) { if (priv->rtllib->swcamtable[EntryId].bused) {
......
drivers/staging/rtl8192e/rtl8192e/rtl_dm.c
View file @ c88af76f
...@@ -159,7 +159,6 @@ static void _rtl92e_dm_check_rate_adaptive(struct net_device *dev); ...@@ -159,7 +159,6 @@ static void _rtl92e_dm_check_rate_adaptive(struct net_device *dev);
static void _rtl92e_dm_init_bandwidth_autoswitch(struct net_device *dev); static void _rtl92e_dm_init_bandwidth_autoswitch(struct net_device *dev);
static void _rtl92e_dm_bandwidth_autoswitch(struct net_device *dev); static void _rtl92e_dm_bandwidth_autoswitch(struct net_device *dev);
static void _rtl92e_dm_check_tx_power_tracking(struct net_device *dev); static void _rtl92e_dm_check_tx_power_tracking(struct net_device *dev);
static void _rtl92e_dm_bb_initialgain_restore(struct net_device *dev); static void _rtl92e_dm_bb_initialgain_restore(struct net_device *dev);
...@@ -179,7 +178,6 @@ static void _rtl92e_dm_check_rx_path_selection(struct net_device *dev); ...@@ -179,7 +178,6 @@ static void _rtl92e_dm_check_rx_path_selection(struct net_device *dev);
static void _rtl92e_dm_init_rx_path_selection(struct net_device *dev); static void _rtl92e_dm_init_rx_path_selection(struct net_device *dev);
static void _rtl92e_dm_rx_path_sel_byrssi(struct net_device *dev); static void _rtl92e_dm_rx_path_sel_byrssi(struct net_device *dev);
static void _rtl92e_dm_init_fsync(struct net_device *dev); static void _rtl92e_dm_init_fsync(struct net_device *dev);
static void _rtl92e_dm_deinit_fsync(struct net_device *dev); static void _rtl92e_dm_deinit_fsync(struct net_device *dev);
...@@ -219,9 +217,7 @@ void rtl92e_dm_init(struct net_device *dev) ...@@ -219,9 +217,7 @@ void rtl92e_dm_init(struct net_device *dev)
void rtl92e_dm_deinit(struct net_device *dev) void rtl92e_dm_deinit(struct net_device *dev)
{ {
_rtl92e_dm_deinit_fsync(dev); _rtl92e_dm_deinit_fsync(dev);
} }
void rtl92e_dm_watchdog(struct net_device *dev) void rtl92e_dm_watchdog(struct net_device *dev)
...@@ -250,7 +246,6 @@ void rtl92e_dm_watchdog(struct net_device *dev) ...@@ -250,7 +246,6 @@ void rtl92e_dm_watchdog(struct net_device *dev)
void rtl92e_init_adaptive_rate(struct net_device *dev) void rtl92e_init_adaptive_rate(struct net_device *dev)
{ {
struct r8192_priv *priv = rtllib_priv(dev); struct r8192_priv *priv = rtllib_priv(dev);
struct rate_adaptive *pra = &priv->rate_adaptive; struct rate_adaptive *pra = &priv->rate_adaptive;
...@@ -297,7 +292,6 @@ static void _rtl92e_dm_check_rate_adaptive(struct net_device *dev) ...@@ -297,7 +292,6 @@ static void _rtl92e_dm_check_rate_adaptive(struct net_device *dev)
return; return;
if (priv->rtllib->state == RTLLIB_LINKED) { if (priv->rtllib->state == RTLLIB_LINKED) {
bshort_gi_enabled = (ht_info->cur_tx_bw40mhz && bshort_gi_enabled = (ht_info->cur_tx_bw40mhz &&
ht_info->bCurShortGI40MHz) || ht_info->bCurShortGI40MHz) ||
(!ht_info->cur_tx_bw40mhz && (!ht_info->cur_tx_bw40mhz &&
...@@ -524,7 +518,6 @@ static void _rtl92e_dm_tx_power_tracking_callback_tssi(struct net_device *dev) ...@@ -524,7 +518,6 @@ static void _rtl92e_dm_tx_power_tracking_callback_tssi(struct net_device *dev)
priv->rtllib->bdynamic_txpower_enable = false; priv->rtllib->bdynamic_txpower_enable = false;
for (j = 0; j <= 30; j++) { for (j = 0; j <= 30; j++) {
tx_cmd.op = TXCMD_SET_TX_PWR_TRACKING; tx_cmd.op = TXCMD_SET_TX_PWR_TRACKING;
tx_cmd.length = 4; tx_cmd.length = 4;
tx_cmd.value = priv->pwr_track >> 24; tx_cmd.value = priv->pwr_track >> 24;
...@@ -756,20 +749,17 @@ void rtl92e_dm_txpower_tracking_wq(void *data) ...@@ -756,20 +749,17 @@ void rtl92e_dm_txpower_tracking_wq(void *data)
static void _rtl92e_dm_initialize_tx_power_tracking_tssi(struct net_device *dev) static void _rtl92e_dm_initialize_tx_power_tracking_tssi(struct net_device *dev)
{ {
struct r8192_priv *priv = rtllib_priv(dev); struct r8192_priv *priv = rtllib_priv(dev);
priv->btxpower_tracking = true; priv->btxpower_tracking = true;
priv->txpower_count = 0; priv->txpower_count = 0;
priv->tx_pwr_tracking_init = false; priv->tx_pwr_tracking_init = false;
} }
static void _rtl92e_dm_init_tx_power_tracking_thermal(struct net_device *dev) static void _rtl92e_dm_init_tx_power_tracking_thermal(struct net_device *dev)
{ {
struct r8192_priv *priv = rtllib_priv(dev); struct r8192_priv *priv = rtllib_priv(dev);
if (priv->rtllib->FwRWRF) if (priv->rtllib->FwRWRF)
priv->btxpower_tracking = true; priv->btxpower_tracking = true;
else else
...@@ -799,12 +789,10 @@ static void _rtl92e_dm_check_tx_power_tracking_tssi(struct net_device *dev) ...@@ -799,12 +789,10 @@ static void _rtl92e_dm_check_tx_power_tracking_tssi(struct net_device *dev)
return; return;
tx_power_track_counter++; tx_power_track_counter++;
if (tx_power_track_counter >= 180) { if (tx_power_track_counter >= 180) {
schedule_delayed_work(&priv->txpower_tracking_wq, 0); schedule_delayed_work(&priv->txpower_tracking_wq, 0);
tx_power_track_counter = 0; tx_power_track_counter = 0;
} }
} }
static void _rtl92e_dm_check_tx_power_tracking_thermal(struct net_device *dev) static void _rtl92e_dm_check_tx_power_tracking_thermal(struct net_device *dev)
...@@ -833,7 +821,6 @@ static void _rtl92e_dm_check_tx_power_tracking_thermal(struct net_device *dev) ...@@ -833,7 +821,6 @@ static void _rtl92e_dm_check_tx_power_tracking_thermal(struct net_device *dev)
netdev_info(dev, "===============>Schedule TxPowerTrackingWorkItem\n"); netdev_info(dev, "===============>Schedule TxPowerTrackingWorkItem\n");
schedule_delayed_work(&priv->txpower_tracking_wq, 0); schedule_delayed_work(&priv->txpower_tracking_wq, 0);
TM_Trigger = 0; TM_Trigger = 0;
} }
static void _rtl92e_dm_check_tx_power_tracking(struct net_device *dev) static void _rtl92e_dm_check_tx_power_tracking(struct net_device *dev)
...@@ -965,7 +952,6 @@ void rtl92e_dm_restore_state(struct net_device *dev) ...@@ -965,7 +952,6 @@ void rtl92e_dm_restore_state(struct net_device *dev)
_rtl92e_dm_tx_power_reset_recovery(dev); _rtl92e_dm_tx_power_reset_recovery(dev);
_rtl92e_dm_bb_initialgain_restore(dev); _rtl92e_dm_bb_initialgain_restore(dev);
} }
static void _rtl92e_dm_bb_initialgain_restore(struct net_device *dev) static void _rtl92e_dm_bb_initialgain_restore(struct net_device *dev)
...@@ -989,7 +975,6 @@ static void _rtl92e_dm_bb_initialgain_restore(struct net_device *dev) ...@@ -989,7 +975,6 @@ static void _rtl92e_dm_bb_initialgain_restore(struct net_device *dev)
rtl92e_set_bb_reg(dev, rCCK0_CCA, bit_mask, rtl92e_set_bb_reg(dev, rCCK0_CCA, bit_mask,
(u32)priv->initgain_backup.cca); (u32)priv->initgain_backup.cca);
rtl92e_set_bb_reg(dev, UFWP, bMaskByte1, 0x1); rtl92e_set_bb_reg(dev, UFWP, bMaskByte1, 0x1);
} }
void rtl92e_dm_backup_state(struct net_device *dev) void rtl92e_dm_backup_state(struct net_device *dev)
...@@ -1043,7 +1028,6 @@ static void _rtl92e_dm_dig_init(struct net_device *dev) ...@@ -1043,7 +1028,6 @@ static void _rtl92e_dm_dig_init(struct net_device *dev)
static void _rtl92e_dm_ctrl_initgain_byrssi(struct net_device *dev) static void _rtl92e_dm_ctrl_initgain_byrssi(struct net_device *dev)
{ {
if (!dm_digtable.dig_enable_flag) if (!dm_digtable.dig_enable_flag)
return; return;
...@@ -1096,7 +1080,6 @@ static void _rtl92e_dm_ctrl_initgain_byrssi_driver(struct net_device *dev) ...@@ -1096,7 +1080,6 @@ static void _rtl92e_dm_ctrl_initgain_byrssi_driver(struct net_device *dev)
else else
dm_digtable.cur_sta_connect_state = DIG_STA_DISCONNECT; dm_digtable.cur_sta_connect_state = DIG_STA_DISCONNECT;
dm_digtable.rssi_val = priv->undecorated_smoothed_pwdb; dm_digtable.rssi_val = priv->undecorated_smoothed_pwdb;
_rtl92e_dm_initial_gain(dev); _rtl92e_dm_initial_gain(dev);
_rtl92e_dm_pd_th(dev); _rtl92e_dm_pd_th(dev);
...@@ -1104,7 +1087,6 @@ static void _rtl92e_dm_ctrl_initgain_byrssi_driver(struct net_device *dev) ...@@ -1104,7 +1087,6 @@ static void _rtl92e_dm_ctrl_initgain_byrssi_driver(struct net_device *dev)
if (dm_digtable.dig_algorithm_switch) if (dm_digtable.dig_algorithm_switch)
dm_digtable.dig_algorithm_switch = 0; dm_digtable.dig_algorithm_switch = 0;
dm_digtable.pre_sta_connect_state = dm_digtable.cur_sta_connect_state; dm_digtable.pre_sta_connect_state = dm_digtable.cur_sta_connect_state;
} }
static void _rtl92e_dm_ctrl_initgain_byrssi_false_alarm(struct net_device *dev) static void _rtl92e_dm_ctrl_initgain_byrssi_false_alarm(struct net_device *dev)
...@@ -1194,7 +1176,6 @@ static void _rtl92e_dm_ctrl_initgain_byrssi_false_alarm(struct net_device *dev) ...@@ -1194,7 +1176,6 @@ static void _rtl92e_dm_ctrl_initgain_byrssi_false_alarm(struct net_device *dev)
_rtl92e_dm_ctrl_initgain_byrssi_highpwr(dev); _rtl92e_dm_ctrl_initgain_byrssi_highpwr(dev);
} }
static void _rtl92e_dm_ctrl_initgain_byrssi_highpwr(struct net_device *dev) static void _rtl92e_dm_ctrl_initgain_byrssi_highpwr(struct net_device *dev)
{ {
struct r8192_priv *priv = rtllib_priv(dev); struct r8192_priv *priv = rtllib_priv(dev);
...@@ -1392,7 +1373,6 @@ static void _rtl92e_dm_cs_ratio(struct net_device *dev) ...@@ -1392,7 +1373,6 @@ static void _rtl92e_dm_cs_ratio(struct net_device *dev)
reset_cnt = priv->reset_count; reset_cnt = priv->reset_count;
} }
if ((dm_digtable.precs_ratio_state != dm_digtable.curcs_ratio_state) || if ((dm_digtable.precs_ratio_state != dm_digtable.curcs_ratio_state) ||
!initialized || force_write) { !initialized || force_write) {
if (dm_digtable.curcs_ratio_state == DIG_CS_RATIO_LOWER) if (dm_digtable.curcs_ratio_state == DIG_CS_RATIO_LOWER)
...@@ -1474,7 +1454,6 @@ static void _rtl92e_dm_check_edca_turbo(struct net_device *dev) ...@@ -1474,7 +1454,6 @@ static void _rtl92e_dm_check_edca_turbo(struct net_device *dev)
edca_setting_UL[ht_info->IOTPeer]); edca_setting_UL[ht_info->IOTPeer]);
priv->bis_cur_rdlstate = false; priv->bis_cur_rdlstate = false;
} }
} }
priv->bcurrent_turbo_EDCA = true; priv->bcurrent_turbo_EDCA = true;
...@@ -1489,7 +1468,6 @@ static void _rtl92e_dm_check_edca_turbo(struct net_device *dev) ...@@ -1489,7 +1468,6 @@ static void _rtl92e_dm_check_edca_turbo(struct net_device *dev)
} }
} }
dm_CheckEdcaTurbo_EXIT: dm_CheckEdcaTurbo_EXIT:
priv->rtllib->bis_any_nonbepkts = false; priv->rtllib->bis_any_nonbepkts = false;
lastTxOkCnt = priv->stats.txbytesunicast; lastTxOkCnt = priv->stats.txbytesunicast;
...@@ -1746,7 +1724,6 @@ static void _rtl92e_dm_rx_path_sel_byrssi(struct net_device *dev) ...@@ -1746,7 +1724,6 @@ static void _rtl92e_dm_rx_path_sel_byrssi(struct net_device *dev)
tmp_cck_min_pwdb = cur_cck_pwdb; tmp_cck_min_pwdb = cur_cck_pwdb;
} }
} }
} }
} }
} }
...@@ -1812,7 +1789,6 @@ static void _rtl92e_dm_check_rx_path_selection(struct net_device *dev) ...@@ -1812,7 +1789,6 @@ static void _rtl92e_dm_check_rx_path_selection(struct net_device *dev)
schedule_delayed_work(&priv->rfpath_check_wq, 0); schedule_delayed_work(&priv->rfpath_check_wq, 0);
} }
static void _rtl92e_dm_init_fsync(struct net_device *dev) static void _rtl92e_dm_init_fsync(struct net_device *dev)
{ {
struct r8192_priv *priv = rtllib_priv(dev); struct r8192_priv *priv = rtllib_priv(dev);
...@@ -1829,7 +1805,6 @@ static void _rtl92e_dm_init_fsync(struct net_device *dev) ...@@ -1829,7 +1805,6 @@ static void _rtl92e_dm_init_fsync(struct net_device *dev)
timer_setup(&priv->fsync_timer, _rtl92e_dm_fsync_timer_callback, 0); timer_setup(&priv->fsync_timer, _rtl92e_dm_fsync_timer_callback, 0);
} }
static void _rtl92e_dm_deinit_fsync(struct net_device *dev) static void _rtl92e_dm_deinit_fsync(struct net_device *dev)
{ {
struct r8192_priv *priv = rtllib_priv(dev); struct r8192_priv *priv = rtllib_priv(dev);
...@@ -1864,7 +1839,6 @@ static void _rtl92e_dm_fsync_timer_callback(struct timer_list *t) ...@@ -1864,7 +1839,6 @@ static void _rtl92e_dm_fsync_timer_callback(struct timer_list *t)
else else
rate_count_diff = rate_count - priv->rate_record; rate_count_diff = rate_count - priv->rate_record;
if (rate_count_diff < priv->rate_count_diff_rec) { if (rate_count_diff < priv->rate_count_diff_rec) {
u32 DiffNum = priv->rate_count_diff_rec - u32 DiffNum = priv->rate_count_diff_rec -
rate_count_diff; rate_count_diff;
if (DiffNum >= if (DiffNum >=
...@@ -2005,7 +1979,6 @@ static void _rtl92e_dm_start_sw_fsync(struct net_device *dev) ...@@ -2005,7 +1979,6 @@ static void _rtl92e_dm_start_sw_fsync(struct net_device *dev)
add_timer(&priv->fsync_timer); add_timer(&priv->fsync_timer);
rtl92e_writel(dev, rOFDM0_RxDetector2, 0x465c12cd); rtl92e_writel(dev, rOFDM0_RxDetector2, 0x465c12cd);
} }
static void _rtl92e_dm_check_fsync(struct net_device *dev) static void _rtl92e_dm_check_fsync(struct net_device *dev)
...@@ -2048,7 +2021,6 @@ static void _rtl92e_dm_check_fsync(struct net_device *dev) ...@@ -2048,7 +2021,6 @@ static void _rtl92e_dm_check_fsync(struct net_device *dev)
case SW_Fsync: case SW_Fsync:
default: default:
break; break;
} }
} }
if (reg_c38_State != RegC38_Fsync_AP_BCM) { if (reg_c38_State != RegC38_Fsync_AP_BCM) {
...@@ -2164,7 +2136,6 @@ static void _rtl92e_dm_dynamic_tx_power(struct net_device *dev) ...@@ -2164,7 +2136,6 @@ static void _rtl92e_dm_dynamic_tx_power(struct net_device *dev)
} }
priv->last_dtp_flag_high = priv->dynamic_tx_high_pwr; priv->last_dtp_flag_high = priv->dynamic_tx_high_pwr;
priv->last_dtp_flag_low = priv->dynamic_tx_low_pwr; priv->last_dtp_flag_low = priv->dynamic_tx_low_pwr;
} }
static void _rtl92e_dm_check_txrateandretrycount(struct net_device *dev) static void _rtl92e_dm_check_txrateandretrycount(struct net_device *dev)
......
drivers/staging/rtl8192e/rtl8192e/rtl_pm.c
View file @ c88af76f
...@@ -9,7 +9,6 @@ ...@@ -9,7 +9,6 @@
#include "r8190P_rtl8256.h" #include "r8190P_rtl8256.h"
#include "rtl_pm.h" #include "rtl_pm.h"
int rtl92e_suspend(struct device *dev_d) int rtl92e_suspend(struct device *dev_d)
{ {
struct net_device *dev = dev_get_drvdata(dev_d); struct net_device *dev = dev_get_drvdata(dev_d);
...@@ -62,7 +61,6 @@ int rtl92e_resume(struct device *dev_d) ...@@ -62,7 +61,6 @@ int rtl92e_resume(struct device *dev_d)
netdev_info(dev, "================>r8192E resume call.\n"); netdev_info(dev, "================>r8192E resume call.\n");
pci_read_config_dword(pdev, 0x40, &val); pci_read_config_dword(pdev, 0x40, &val);
if ((val & 0x0000ff00) != 0) if ((val & 0x0000ff00) != 0)
pci_write_config_dword(pdev, 0x40, val & 0xffff00ff); pci_write_config_dword(pdev, 0x40, val & 0xffff00ff);
......
drivers/staging/rtl8192e/rtl819x_HT.h
View file @ c88af76f
...@@ -24,7 +24,6 @@ enum ht_extchnl_offset { ...@@ -24,7 +24,6 @@ enum ht_extchnl_offset {
}; };
struct ht_capab_ele { struct ht_capab_ele {
u8 AdvCoding:1; u8 AdvCoding:1;
u8 ChlWidth:1; u8 ChlWidth:1;
u8 MimoPwrSave:2; u8 MimoPwrSave:2;
...@@ -46,7 +45,6 @@ struct ht_capab_ele { ...@@ -46,7 +45,6 @@ struct ht_capab_ele {
u8 MCS[16]; u8 MCS[16];
u16 ExtHTCapInfo; u16 ExtHTCapInfo;
u8 TxBFCap[4]; u8 TxBFCap[4];
...@@ -55,7 +53,6 @@ struct ht_capab_ele { ...@@ -55,7 +53,6 @@ struct ht_capab_ele {
} __packed; } __packed;
struct ht_info_ele { struct ht_info_ele {
u8 ControlChl; u8 ControlChl;
...@@ -94,7 +91,6 @@ enum ht_aggre_mode { ...@@ -94,7 +91,6 @@ enum ht_aggre_mode {
HT_AGG_FORCE_DISABLE = 2, HT_AGG_FORCE_DISABLE = 2,
}; };
struct rt_hi_throughput { struct rt_hi_throughput {
u8 enable_ht; u8 enable_ht;
u8 bCurrentHTSupport; u8 bCurrentHTSupport;
...@@ -113,14 +109,12 @@ struct rt_hi_throughput { ...@@ -113,14 +109,12 @@ struct rt_hi_throughput {
enum ht_spec_ver ePeerHTSpecVer; enum ht_spec_ver ePeerHTSpecVer;
struct ht_capab_ele SelfHTCap; struct ht_capab_ele SelfHTCap;
struct ht_info_ele SelfHTInfo; struct ht_info_ele SelfHTInfo;
u8 PeerHTCapBuf[32]; u8 PeerHTCapBuf[32];
u8 PeerHTInfoBuf[32]; u8 PeerHTInfoBuf[32];
u8 bAMSDU_Support; u8 bAMSDU_Support;
u16 nAMSDU_MaxSize; u16 nAMSDU_MaxSize;
u8 bCurrent_AMSDU_Support; u8 bCurrent_AMSDU_Support;
......
drivers/staging/rtl8192e/rtl819x_Qos.h
View file @ c88af76f
...@@ -104,7 +104,6 @@ struct acm { ...@@ -104,7 +104,6 @@ struct acm {
}; };
union qos_tclas { union qos_tclas {
struct _TYPE_GENERAL { struct _TYPE_GENERAL {
u8 Priority; u8 Priority;
u8 ClassifierType; u8 ClassifierType;
......
drivers/staging/rtl8192e/rtl819x_TS.h
View file @ c88af76f
...@@ -53,6 +53,4 @@ struct rx_ts_record { ...@@ -53,6 +53,4 @@ struct rx_ts_record {
u8 num; u8 num;
}; };
#endif #endif
drivers/staging/rtl8192e/rtllib.h
View file @ c88af76f
...@@ -1137,7 +1137,6 @@ struct rtllib_network { ...@@ -1137,7 +1137,6 @@ struct rtllib_network {
}; };
enum rtllib_state { enum rtllib_state {
/* the card is not linked at all */ /* the card is not linked at all */
RTLLIB_NOLINK = 0, RTLLIB_NOLINK = 0,
...@@ -1298,7 +1297,6 @@ enum fw_cmd_io_type { ...@@ -1298,7 +1297,6 @@ enum fw_cmd_io_type {
#define RT_MAX_LD_SLOT_NUM 10 #define RT_MAX_LD_SLOT_NUM 10
struct rt_link_detect { struct rt_link_detect {
u32 NumRecvBcnInPeriod; u32 NumRecvBcnInPeriod;
u32 NumRecvDataInPeriod; u32 NumRecvDataInPeriod;
...@@ -1316,7 +1314,6 @@ struct rt_link_detect { ...@@ -1316,7 +1314,6 @@ struct rt_link_detect {
}; };
struct sw_cam_table { struct sw_cam_table {
u8 macaddr[ETH_ALEN]; u8 macaddr[ETH_ALEN];
bool bused; bool bused;
u8 key_buf[16]; u8 key_buf[16];
......
drivers/staging/rtl8192e/rtllib_softmac.c
View file @ c88af76f
...@@ -22,7 +22,6 @@ ...@@ -22,7 +22,6 @@
static void rtllib_sta_wakeup(struct rtllib_device *ieee, short nl); static void rtllib_sta_wakeup(struct rtllib_device *ieee, short nl);
static short rtllib_is_54g(struct rtllib_network *net) static short rtllib_is_54g(struct rtllib_network *net)
{ {
return (net->rates_ex_len > 0) || (net->rates_len > 4); return (net->rates_ex_len > 0) || (net->rates_len > 4);
...@@ -139,7 +138,6 @@ static void enqueue_mgmt(struct rtllib_device *ieee, struct sk_buff *skb) ...@@ -139,7 +138,6 @@ static void enqueue_mgmt(struct rtllib_device *ieee, struct sk_buff *skb)
*/ */
ieee->mgmt_queue_head = nh; ieee->mgmt_queue_head = nh;
ieee->mgmt_queue_ring[nh] = skb; ieee->mgmt_queue_ring[nh] = skb;
} }
static void init_mgmt_queue(struct rtllib_device *ieee) static void init_mgmt_queue(struct rtllib_device *ieee)
...@@ -147,14 +145,12 @@ static void init_mgmt_queue(struct rtllib_device *ieee) ...@@ -147,14 +145,12 @@ static void init_mgmt_queue(struct rtllib_device *ieee)
ieee->mgmt_queue_tail = ieee->mgmt_queue_head = 0; ieee->mgmt_queue_tail = ieee->mgmt_queue_head = 0;
} }
u8 MgntQuery_TxRateExcludeCCKRates(struct rtllib_device *ieee) u8 MgntQuery_TxRateExcludeCCKRates(struct rtllib_device *ieee)
{ {
u16 i; u16 i;
u8 QueryRate = 0; u8 QueryRate = 0;
u8 BasicRate; u8 BasicRate;
for (i = 0; i < ieee->current_network.rates_len; i++) { for (i = 0; i < ieee->current_network.rates_len; i++) {
BasicRate = ieee->current_network.rates[i] & 0x7F; BasicRate = ieee->current_network.rates[i] & 0x7F;
if (!rtllib_is_cck_rate(BasicRate)) { if (!rtllib_is_cck_rate(BasicRate)) {
...@@ -286,7 +282,6 @@ softmac_ps_mgmt_xmit(struct sk_buff *skb, ...@@ -286,7 +282,6 @@ softmac_ps_mgmt_xmit(struct sk_buff *skb,
type = WLAN_FC_GET_TYPE(fc); type = WLAN_FC_GET_TYPE(fc);
stype = WLAN_FC_GET_STYPE(fc); stype = WLAN_FC_GET_STYPE(fc);
if (stype != RTLLIB_STYPE_PSPOLL) if (stype != RTLLIB_STYPE_PSPOLL)
tcb_desc->queue_index = MGNT_QUEUE; tcb_desc->queue_index = MGNT_QUEUE;
else else
...@@ -295,7 +290,6 @@ softmac_ps_mgmt_xmit(struct sk_buff *skb, ...@@ -295,7 +290,6 @@ softmac_ps_mgmt_xmit(struct sk_buff *skb,
if (ieee->disable_mgnt_queue) if (ieee->disable_mgnt_queue)
tcb_desc->queue_index = HIGH_QUEUE; tcb_desc->queue_index = HIGH_QUEUE;
tcb_desc->data_rate = MgntQuery_MgntFrameTxRate(ieee); tcb_desc->data_rate = MgntQuery_MgntFrameTxRate(ieee);
tcb_desc->ratr_index = 7; tcb_desc->ratr_index = 7;
tcb_desc->tx_dis_rate_fallback = 1; tcb_desc->tx_dis_rate_fallback = 1;
...@@ -308,7 +302,6 @@ softmac_ps_mgmt_xmit(struct sk_buff *skb, ...@@ -308,7 +302,6 @@ softmac_ps_mgmt_xmit(struct sk_buff *skb,
ieee->seq_ctrl[0] = 0; ieee->seq_ctrl[0] = 0;
else else
ieee->seq_ctrl[0]++; ieee->seq_ctrl[0]++;
} }
/* avoid watchdog triggers */ /* avoid watchdog triggers */
ieee->softmac_data_hard_start_xmit(skb, ieee->dev, ieee->softmac_data_hard_start_xmit(skb, ieee->dev,
...@@ -324,7 +317,6 @@ softmac_ps_mgmt_xmit(struct sk_buff *skb, ...@@ -324,7 +317,6 @@ softmac_ps_mgmt_xmit(struct sk_buff *skb,
ieee->seq_ctrl[0]++; ieee->seq_ctrl[0]++;
} }
ieee->softmac_hard_start_xmit(skb, ieee->dev); ieee->softmac_hard_start_xmit(skb, ieee->dev);
} }
} }
...@@ -388,7 +380,6 @@ static void rtllib_send_beacon(struct rtllib_device *ieee) ...@@ -388,7 +380,6 @@ static void rtllib_send_beacon(struct rtllib_device *ieee)
(msecs_to_jiffies(ieee->current_network.beacon_interval - 5))); (msecs_to_jiffies(ieee->current_network.beacon_interval - 5)));
} }
static void rtllib_send_beacon_cb(struct timer_list *t) static void rtllib_send_beacon_cb(struct timer_list *t)
{ {
struct rtllib_device *ieee = struct rtllib_device *ieee =
...@@ -411,7 +402,6 @@ void rtllib_EnableNetMonitorMode(struct net_device *dev, ...@@ -411,7 +402,6 @@ void rtllib_EnableNetMonitorMode(struct net_device *dev,
ieee->AllowAllDestAddrHandler(dev, true, !bInitState); ieee->AllowAllDestAddrHandler(dev, true, !bInitState);
} }
/* Disables network monitor mode. Only packets destinated to /* Disables network monitor mode. Only packets destinated to
* us will be received. * us will be received.
*/ */
...@@ -425,7 +415,6 @@ void rtllib_DisableNetMonitorMode(struct net_device *dev, ...@@ -425,7 +415,6 @@ void rtllib_DisableNetMonitorMode(struct net_device *dev,
ieee->AllowAllDestAddrHandler(dev, false, !bInitState); ieee->AllowAllDestAddrHandler(dev, false, !bInitState);
} }
/* Enables the specialized promiscuous mode required by Intel. /* Enables the specialized promiscuous mode required by Intel.
* In this mode, Intel intends to hear traffics from/to other STAs in the * In this mode, Intel intends to hear traffics from/to other STAs in the
* same BSS. Therefore we don't have to disable checking BSSID and we only need * same BSS. Therefore we don't have to disable checking BSSID and we only need
...@@ -449,7 +438,6 @@ void rtllib_EnableIntelPromiscuousMode(struct net_device *dev, ...@@ -449,7 +438,6 @@ void rtllib_EnableIntelPromiscuousMode(struct net_device *dev,
} }
EXPORT_SYMBOL(rtllib_EnableIntelPromiscuousMode); EXPORT_SYMBOL(rtllib_EnableIntelPromiscuousMode);
/* Disables the specialized promiscuous mode required by Intel. /* Disables the specialized promiscuous mode required by Intel.
* See MgntEnableIntelPromiscuousMode for detail. * See MgntEnableIntelPromiscuousMode for detail.
*/ */
...@@ -481,7 +469,6 @@ static void rtllib_send_probe(struct rtllib_device *ieee, u8 is_mesh) ...@@ -481,7 +469,6 @@ static void rtllib_send_probe(struct rtllib_device *ieee, u8 is_mesh)
} }
} }
static void rtllib_send_probe_requests(struct rtllib_device *ieee, u8 is_mesh) static void rtllib_send_probe_requests(struct rtllib_device *ieee, u8 is_mesh)
{ {
if (ieee->active_scan && (ieee->softmac_features & if (ieee->active_scan && (ieee->softmac_features &
...@@ -629,8 +616,6 @@ static void rtllib_softmac_scan_wq(void *data) ...@@ -629,8 +616,6 @@ static void rtllib_softmac_scan_wq(void *data)
mutex_unlock(&ieee->scan_mutex); mutex_unlock(&ieee->scan_mutex);
} }
static void rtllib_beacons_start(struct rtllib_device *ieee) static void rtllib_beacons_start(struct rtllib_device *ieee)
{ {
unsigned long flags; unsigned long flags;
...@@ -653,10 +638,8 @@ static void rtllib_beacons_stop(struct rtllib_device *ieee) ...@@ -653,10 +638,8 @@ static void rtllib_beacons_stop(struct rtllib_device *ieee)
spin_unlock_irqrestore(&ieee->beacon_lock, flags); spin_unlock_irqrestore(&ieee->beacon_lock, flags);
del_timer_sync(&ieee->beacon_timer); del_timer_sync(&ieee->beacon_timer);
} }
void rtllib_stop_send_beacons(struct rtllib_device *ieee) void rtllib_stop_send_beacons(struct rtllib_device *ieee)
{ {
ieee->stop_send_beacons(ieee->dev); ieee->stop_send_beacons(ieee->dev);
...@@ -665,7 +648,6 @@ void rtllib_stop_send_beacons(struct rtllib_device *ieee) ...@@ -665,7 +648,6 @@ void rtllib_stop_send_beacons(struct rtllib_device *ieee)
} }
EXPORT_SYMBOL(rtllib_stop_send_beacons); EXPORT_SYMBOL(rtllib_stop_send_beacons);
void rtllib_start_send_beacons(struct rtllib_device *ieee) void rtllib_start_send_beacons(struct rtllib_device *ieee)
{ {
ieee->start_send_beacons(ieee->dev); ieee->start_send_beacons(ieee->dev);
...@@ -674,7 +656,6 @@ void rtllib_start_send_beacons(struct rtllib_device *ieee) ...@@ -674,7 +656,6 @@ void rtllib_start_send_beacons(struct rtllib_device *ieee)
} }
EXPORT_SYMBOL(rtllib_start_send_beacons); EXPORT_SYMBOL(rtllib_start_send_beacons);
static void rtllib_softmac_stop_scan(struct rtllib_device *ieee) static void rtllib_softmac_stop_scan(struct rtllib_device *ieee)
{ {
mutex_lock(&ieee->scan_mutex); mutex_lock(&ieee->scan_mutex);
...@@ -888,7 +869,6 @@ static struct sk_buff *rtllib_probe_resp(struct rtllib_device *ieee, ...@@ -888,7 +869,6 @@ static struct sk_buff *rtllib_probe_resp(struct rtllib_device *ieee,
if (encrypt) if (encrypt)
beacon_buf->capability |= cpu_to_le16(WLAN_CAPABILITY_PRIVACY); beacon_buf->capability |= cpu_to_le16(WLAN_CAPABILITY_PRIVACY);
beacon_buf->header.frame_ctl = cpu_to_le16(RTLLIB_STYPE_PROBE_RESP); beacon_buf->header.frame_ctl = cpu_to_le16(RTLLIB_STYPE_PROBE_RESP);
beacon_buf->info_element[0].id = MFIE_TYPE_SSID; beacon_buf->info_element[0].id = MFIE_TYPE_SSID;
beacon_buf->info_element[0].len = ssid_len; beacon_buf->info_element[0].len = ssid_len;
...@@ -967,7 +947,6 @@ static struct sk_buff *rtllib_assoc_resp(struct rtllib_device *ieee, u8 *dest) ...@@ -967,7 +947,6 @@ static struct sk_buff *rtllib_assoc_resp(struct rtllib_device *ieee, u8 *dest)
assoc->capability = cpu_to_le16(ieee->iw_mode == IW_MODE_MASTER ? assoc->capability = cpu_to_le16(ieee->iw_mode == IW_MODE_MASTER ?
WLAN_CAPABILITY_ESS : WLAN_CAPABILITY_IBSS); WLAN_CAPABILITY_ESS : WLAN_CAPABILITY_IBSS);
if (ieee->short_slot) if (ieee->short_slot)
assoc->capability |= assoc->capability |=
cpu_to_le16(WLAN_CAPABILITY_SHORT_SLOT_TIME); cpu_to_le16(WLAN_CAPABILITY_SHORT_SLOT_TIME);
...@@ -1022,8 +1001,6 @@ static struct sk_buff *rtllib_auth_resp(struct rtllib_device *ieee, int status, ...@@ -1022,8 +1001,6 @@ static struct sk_buff *rtllib_auth_resp(struct rtllib_device *ieee, int status,
ether_addr_copy(auth->header.addr1, dest); ether_addr_copy(auth->header.addr1, dest);
auth->header.frame_ctl = cpu_to_le16(RTLLIB_STYPE_AUTH); auth->header.frame_ctl = cpu_to_le16(RTLLIB_STYPE_AUTH);
return skb; return skb;
} }
static struct sk_buff *rtllib_null_func(struct rtllib_device *ieee, short pwr) static struct sk_buff *rtllib_null_func(struct rtllib_device *ieee, short pwr)
...@@ -1048,8 +1025,6 @@ static struct sk_buff *rtllib_null_func(struct rtllib_device *ieee, short pwr) ...@@ -1048,8 +1025,6 @@ static struct sk_buff *rtllib_null_func(struct rtllib_device *ieee, short pwr)
(pwr ? RTLLIB_FCTL_PM : 0)); (pwr ? RTLLIB_FCTL_PM : 0));
return skb; return skb;
} }
static struct sk_buff *rtllib_pspoll_func(struct rtllib_device *ieee) static struct sk_buff *rtllib_pspoll_func(struct rtllib_device *ieee)
...@@ -1073,7 +1048,6 @@ static struct sk_buff *rtllib_pspoll_func(struct rtllib_device *ieee) ...@@ -1073,7 +1048,6 @@ static struct sk_buff *rtllib_pspoll_func(struct rtllib_device *ieee)
RTLLIB_FCTL_PM); RTLLIB_FCTL_PM);
return skb; return skb;
} }
static void rtllib_resp_to_assoc_rq(struct rtllib_device *ieee, u8 *dest) static void rtllib_resp_to_assoc_rq(struct rtllib_device *ieee, u8 *dest)
...@@ -1084,7 +1058,6 @@ static void rtllib_resp_to_assoc_rq(struct rtllib_device *ieee, u8 *dest) ...@@ -1084,7 +1058,6 @@ static void rtllib_resp_to_assoc_rq(struct rtllib_device *ieee, u8 *dest)
softmac_mgmt_xmit(buf, ieee); softmac_mgmt_xmit(buf, ieee);
} }
static void rtllib_resp_to_auth(struct rtllib_device *ieee, int s, u8 *dest) static void rtllib_resp_to_auth(struct rtllib_device *ieee, int s, u8 *dest)
{ {
struct sk_buff *buf = rtllib_auth_resp(ieee, s, dest); struct sk_buff *buf = rtllib_auth_resp(ieee, s, dest);
...@@ -1093,7 +1066,6 @@ static void rtllib_resp_to_auth(struct rtllib_device *ieee, int s, u8 *dest) ...@@ -1093,7 +1066,6 @@ static void rtllib_resp_to_auth(struct rtllib_device *ieee, int s, u8 *dest)
softmac_mgmt_xmit(buf, ieee); softmac_mgmt_xmit(buf, ieee);
} }
static void rtllib_resp_to_probe(struct rtllib_device *ieee, u8 *dest) static void rtllib_resp_to_probe(struct rtllib_device *ieee, u8 *dest)
{ {
struct sk_buff *buf = rtllib_probe_resp(ieee, dest); struct sk_buff *buf = rtllib_probe_resp(ieee, dest);
...@@ -1102,7 +1074,6 @@ static void rtllib_resp_to_probe(struct rtllib_device *ieee, u8 *dest) ...@@ -1102,7 +1074,6 @@ static void rtllib_resp_to_probe(struct rtllib_device *ieee, u8 *dest)
softmac_mgmt_xmit(buf, ieee); softmac_mgmt_xmit(buf, ieee);
} }
static inline int SecIsInPMKIDList(struct rtllib_device *ieee, u8 *bssid) static inline int SecIsInPMKIDList(struct rtllib_device *ieee, u8 *bssid)
{ {
int i = 0; int i = 0;
...@@ -1215,7 +1186,6 @@ rtllib_association_req(struct rtllib_network *beacon, ...@@ -1215,7 +1186,6 @@ rtllib_association_req(struct rtllib_network *beacon,
hdr = skb_put(skb, sizeof(struct rtllib_assoc_request_frame) + 2); hdr = skb_put(skb, sizeof(struct rtllib_assoc_request_frame) + 2);
hdr->header.frame_ctl = cpu_to_le16(RTLLIB_STYPE_ASSOC_REQ); hdr->header.frame_ctl = cpu_to_le16(RTLLIB_STYPE_ASSOC_REQ);
hdr->header.duration_id = cpu_to_le16(37); hdr->header.duration_id = cpu_to_le16(37);
ether_addr_copy(hdr->header.addr1, beacon->bssid); ether_addr_copy(hdr->header.addr1, beacon->bssid);
...@@ -1235,7 +1205,6 @@ rtllib_association_req(struct rtllib_network *beacon, ...@@ -1235,7 +1205,6 @@ rtllib_association_req(struct rtllib_network *beacon,
(beacon->capability & WLAN_CAPABILITY_SHORT_SLOT_TIME)) (beacon->capability & WLAN_CAPABILITY_SHORT_SLOT_TIME))
hdr->capability |= cpu_to_le16(WLAN_CAPABILITY_SHORT_SLOT_TIME); hdr->capability |= cpu_to_le16(WLAN_CAPABILITY_SHORT_SLOT_TIME);
hdr->listen_interval = cpu_to_le16(beacon->listen_interval); hdr->listen_interval = cpu_to_le16(beacon->listen_interval);
hdr->info_element[0].id = MFIE_TYPE_SSID; hdr->info_element[0].id = MFIE_TYPE_SSID;
...@@ -1713,7 +1682,6 @@ static void rtllib_softmac_check_all_nets(struct rtllib_device *ieee) ...@@ -1713,7 +1682,6 @@ static void rtllib_softmac_check_all_nets(struct rtllib_device *ieee)
spin_lock_irqsave(&ieee->lock, flags); spin_lock_irqsave(&ieee->lock, flags);
list_for_each_entry(target, &ieee->network_list, list) { list_for_each_entry(target, &ieee->network_list, list) {
/* if the state become different that NOLINK means /* if the state become different that NOLINK means
* we had found what we are searching for * we had found what we are searching for
*/ */
...@@ -1900,7 +1868,6 @@ static inline void rtllib_rx_assoc_rq(struct rtllib_device *ieee, ...@@ -1900,7 +1868,6 @@ static inline void rtllib_rx_assoc_rq(struct rtllib_device *ieee,
{ {
u8 dest[ETH_ALEN]; u8 dest[ETH_ALEN];
ieee->softmac_stats.rx_ass_rq++; ieee->softmac_stats.rx_ass_rq++;
if (assoc_rq_parse(ieee->dev, skb, dest) != -1) if (assoc_rq_parse(ieee->dev, skb, dest) != -1)
rtllib_resp_to_assoc_rq(ieee, dest); rtllib_resp_to_assoc_rq(ieee, dest);
...@@ -1910,7 +1877,6 @@ static inline void rtllib_rx_assoc_rq(struct rtllib_device *ieee, ...@@ -1910,7 +1877,6 @@ static inline void rtllib_rx_assoc_rq(struct rtllib_device *ieee,
void rtllib_sta_ps_send_null_frame(struct rtllib_device *ieee, short pwr) void rtllib_sta_ps_send_null_frame(struct rtllib_device *ieee, short pwr)
{ {
struct sk_buff *buf = rtllib_null_func(ieee, pwr); struct sk_buff *buf = rtllib_null_func(ieee, pwr);
if (buf) if (buf)
...@@ -2008,8 +1974,6 @@ static short rtllib_sta_ps_sleep(struct rtllib_device *ieee, u64 *time) ...@@ -2008,8 +1974,6 @@ static short rtllib_sta_ps_sleep(struct rtllib_device *ieee, u64 *time)
} }
return 1; return 1;
} }
static inline void rtllib_sta_ps(struct work_struct *work) static inline void rtllib_sta_ps(struct work_struct *work)
...@@ -2048,7 +2012,6 @@ static inline void rtllib_sta_ps(struct work_struct *work) ...@@ -2048,7 +2012,6 @@ static inline void rtllib_sta_ps(struct work_struct *work)
ieee->ps_time = time; ieee->ps_time = time;
} }
spin_unlock_irqrestore(&ieee->mgmt_tx_lock, flags2); spin_unlock_irqrestore(&ieee->mgmt_tx_lock, flags2);
} }
ieee->bAwakePktSent = false; ieee->bAwakePktSent = false;
...@@ -2063,7 +2026,6 @@ static inline void rtllib_sta_ps(struct work_struct *work) ...@@ -2063,7 +2026,6 @@ static inline void rtllib_sta_ps(struct work_struct *work)
out: out:
spin_unlock_irqrestore(&ieee->lock, flags); spin_unlock_irqrestore(&ieee->lock, flags);
} }
static void rtllib_sta_wakeup(struct rtllib_device *ieee, short nl) static void rtllib_sta_wakeup(struct rtllib_device *ieee, short nl)
...@@ -2080,7 +2042,6 @@ static void rtllib_sta_wakeup(struct rtllib_device *ieee, short nl) ...@@ -2080,7 +2042,6 @@ static void rtllib_sta_wakeup(struct rtllib_device *ieee, short nl)
} }
} }
return; return;
} }
if (ieee->sta_sleep == LPS_IS_SLEEP) if (ieee->sta_sleep == LPS_IS_SLEEP)
...@@ -2300,7 +2261,6 @@ static inline int ...@@ -2300,7 +2261,6 @@ static inline int
rtllib_rx_auth(struct rtllib_device *ieee, struct sk_buff *skb, rtllib_rx_auth(struct rtllib_device *ieee, struct sk_buff *skb,
struct rtllib_rx_stats *rx_stats) struct rtllib_rx_stats *rx_stats)
{ {
if (ieee->softmac_features & IEEE_SOFTMAC_ASSOCIATE) { if (ieee->softmac_features & IEEE_SOFTMAC_ASSOCIATE) {
if (ieee->state == RTLLIB_ASSOCIATING_AUTHENTICATING && if (ieee->state == RTLLIB_ASSOCIATING_AUTHENTICATING &&
(ieee->iw_mode == IW_MODE_INFRA)) { (ieee->iw_mode == IW_MODE_INFRA)) {
...@@ -2408,7 +2368,6 @@ inline int rtllib_rx_frame_softmac(struct rtllib_device *ieee, ...@@ -2408,7 +2368,6 @@ inline int rtllib_rx_frame_softmac(struct rtllib_device *ieee,
*/ */
void rtllib_softmac_xmit(struct rtllib_txb *txb, struct rtllib_device *ieee) void rtllib_softmac_xmit(struct rtllib_txb *txb, struct rtllib_device *ieee)
{ {
unsigned int queue_index = txb->queue_index; unsigned int queue_index = txb->queue_index;
unsigned long flags; unsigned long flags;
int i; int i;
...@@ -2453,7 +2412,6 @@ void rtllib_softmac_xmit(struct rtllib_txb *txb, struct rtllib_device *ieee) ...@@ -2453,7 +2412,6 @@ void rtllib_softmac_xmit(struct rtllib_txb *txb, struct rtllib_device *ieee)
rtllib_txb_free(txb); rtllib_txb_free(txb);
spin_unlock_irqrestore(&ieee->lock, flags); spin_unlock_irqrestore(&ieee->lock, flags);
} }
void rtllib_reset_queue(struct rtllib_device *ieee) void rtllib_reset_queue(struct rtllib_device *ieee)
...@@ -2468,7 +2426,6 @@ void rtllib_reset_queue(struct rtllib_device *ieee) ...@@ -2468,7 +2426,6 @@ void rtllib_reset_queue(struct rtllib_device *ieee)
} }
ieee->queue_stop = 0; ieee->queue_stop = 0;
spin_unlock_irqrestore(&ieee->lock, flags); spin_unlock_irqrestore(&ieee->lock, flags);
} }
EXPORT_SYMBOL(rtllib_reset_queue); EXPORT_SYMBOL(rtllib_reset_queue);
...@@ -2547,7 +2504,6 @@ static void rtllib_start_ibss_wq(void *data) ...@@ -2547,7 +2504,6 @@ static void rtllib_start_ibss_wq(void *data)
/* check if we have this cell in our network list */ /* check if we have this cell in our network list */
rtllib_softmac_check_all_nets(ieee); rtllib_softmac_check_all_nets(ieee);
/* if not then the state is not linked. Maybe the user switched to /* if not then the state is not linked. Maybe the user switched to
* ad-hoc mode just after being in monitor mode, or just after * ad-hoc mode just after being in monitor mode, or just after
* being very few time in managed mode (so the card have had no * being very few time in managed mode (so the card have had no
...@@ -2573,7 +2529,6 @@ static void rtllib_start_ibss_wq(void *data) ...@@ -2573,7 +2529,6 @@ static void rtllib_start_ibss_wq(void *data)
eth_random_addr(ieee->current_network.bssid); eth_random_addr(ieee->current_network.bssid);
if (ieee->modulation & RTLLIB_CCK_MODULATION) { if (ieee->modulation & RTLLIB_CCK_MODULATION) {
ieee->current_network.rates_len = 4; ieee->current_network.rates_len = 4;
ieee->current_network.rates[0] = ieee->current_network.rates[0] =
...@@ -2760,7 +2715,6 @@ static struct sk_buff *rtllib_get_beacon_(struct rtllib_device *ieee) ...@@ -2760,7 +2715,6 @@ static struct sk_buff *rtllib_get_beacon_(struct rtllib_device *ieee)
b->header.frame_ctl = cpu_to_le16(RTLLIB_STYPE_BEACON); b->header.frame_ctl = cpu_to_le16(RTLLIB_STYPE_BEACON);
return skb; return skb;
} }
struct sk_buff *rtllib_get_beacon(struct rtllib_device *ieee) struct sk_buff *rtllib_get_beacon(struct rtllib_device *ieee)
...@@ -2794,7 +2748,6 @@ void rtllib_softmac_stop_protocol(struct rtllib_device *ieee, u8 mesh_flag, ...@@ -2794,7 +2748,6 @@ void rtllib_softmac_stop_protocol(struct rtllib_device *ieee, u8 mesh_flag,
} }
EXPORT_SYMBOL(rtllib_softmac_stop_protocol); EXPORT_SYMBOL(rtllib_softmac_stop_protocol);
void rtllib_stop_protocol(struct rtllib_device *ieee, u8 shutdown) void rtllib_stop_protocol(struct rtllib_device *ieee, u8 shutdown)
{ {
if (!ieee->proto_started) if (!ieee->proto_started)
...@@ -3103,7 +3056,6 @@ static void rtllib_MgntDisconnectIBSS(struct rtllib_device *rtllib) ...@@ -3103,7 +3056,6 @@ static void rtllib_MgntDisconnectIBSS(struct rtllib_device *rtllib)
rtllib->SetHwRegHandler(rtllib->dev, HW_VAR_CECHK_BSSID, rtllib->SetHwRegHandler(rtllib->dev, HW_VAR_CECHK_BSSID,
(u8 *)(&bFilterOutNonAssociatedBSSID)); (u8 *)(&bFilterOutNonAssociatedBSSID));
notify_wx_assoc_event(rtllib); notify_wx_assoc_event(rtllib);
} }
static void rtllib_MlmeDisassociateRequest(struct rtllib_device *rtllib, static void rtllib_MlmeDisassociateRequest(struct rtllib_device *rtllib,
...@@ -3127,9 +3079,7 @@ static void rtllib_MlmeDisassociateRequest(struct rtllib_device *rtllib, ...@@ -3127,9 +3079,7 @@ static void rtllib_MlmeDisassociateRequest(struct rtllib_device *rtllib,
rtllib->SetHwRegHandler(rtllib->dev, HW_VAR_BSSID, rtllib->SetHwRegHandler(rtllib->dev, HW_VAR_BSSID,
rtllib->current_network.bssid); rtllib->current_network.bssid);
} }
} }
static void static void
...@@ -3159,7 +3109,6 @@ bool rtllib_MgntDisconnect(struct rtllib_device *rtllib, u8 asRsn) ...@@ -3159,7 +3109,6 @@ bool rtllib_MgntDisconnect(struct rtllib_device *rtllib, u8 asRsn)
rtllib_MgntDisconnectIBSS(rtllib); rtllib_MgntDisconnectIBSS(rtllib);
if (rtllib->iw_mode == IW_MODE_INFRA) if (rtllib->iw_mode == IW_MODE_INFRA)
rtllib_MgntDisconnectAP(rtllib, asRsn); rtllib_MgntDisconnectAP(rtllib, asRsn);
} }
return true; return true;
...@@ -3178,7 +3127,6 @@ void notify_wx_assoc_event(struct rtllib_device *ieee) ...@@ -3178,7 +3127,6 @@ void notify_wx_assoc_event(struct rtllib_device *ieee)
memcpy(wrqu.ap_addr.sa_data, ieee->current_network.bssid, memcpy(wrqu.ap_addr.sa_data, ieee->current_network.bssid,
ETH_ALEN); ETH_ALEN);
else { else {
netdev_info(ieee->dev, "%s(): Tell user space disconnected\n", netdev_info(ieee->dev, "%s(): Tell user space disconnected\n",
__func__); __func__);
eth_zero_addr(wrqu.ap_addr.sa_data); eth_zero_addr(wrqu.ap_addr.sa_data);
......
drivers/staging/rtl8192e/rtllib_softmac_wx.c
View file @ c88af76f
...@@ -25,7 +25,6 @@ const long rtllib_wlan_frequencies[] = { ...@@ -25,7 +25,6 @@ const long rtllib_wlan_frequencies[] = {
}; };
EXPORT_SYMBOL(rtllib_wlan_frequencies); EXPORT_SYMBOL(rtllib_wlan_frequencies);
int rtllib_wx_set_freq(struct rtllib_device *ieee, struct iw_request_info *a, int rtllib_wx_set_freq(struct rtllib_device *ieee, struct iw_request_info *a,
union iwreq_data *wrqu, char *b) union iwreq_data *wrqu, char *b)
{ {
...@@ -83,7 +82,6 @@ int rtllib_wx_set_freq(struct rtllib_device *ieee, struct iw_request_info *a, ...@@ -83,7 +82,6 @@ int rtllib_wx_set_freq(struct rtllib_device *ieee, struct iw_request_info *a,
} }
EXPORT_SYMBOL(rtllib_wx_set_freq); EXPORT_SYMBOL(rtllib_wx_set_freq);
int rtllib_wx_get_freq(struct rtllib_device *ieee, int rtllib_wx_get_freq(struct rtllib_device *ieee,
struct iw_request_info *a, struct iw_request_info *a,
union iwreq_data *wrqu, char *b) union iwreq_data *wrqu, char *b)
...@@ -128,13 +126,11 @@ int rtllib_wx_get_wap(struct rtllib_device *ieee, ...@@ -128,13 +126,11 @@ int rtllib_wx_get_wap(struct rtllib_device *ieee,
} }
EXPORT_SYMBOL(rtllib_wx_get_wap); EXPORT_SYMBOL(rtllib_wx_get_wap);
int rtllib_wx_set_wap(struct rtllib_device *ieee, int rtllib_wx_set_wap(struct rtllib_device *ieee,
struct iw_request_info *info, struct iw_request_info *info,
union iwreq_data *awrq, union iwreq_data *awrq,
char *extra) char *extra)
{ {
int ret = 0; int ret = 0;
unsigned long flags; unsigned long flags;
...@@ -164,7 +160,6 @@ int rtllib_wx_set_wap(struct rtllib_device *ieee, ...@@ -164,7 +160,6 @@ int rtllib_wx_set_wap(struct rtllib_device *ieee,
goto out; goto out;
} }
if (ifup) if (ifup)
rtllib_stop_protocol(ieee, true); rtllib_stop_protocol(ieee, true);
...@@ -220,7 +215,6 @@ int rtllib_wx_get_essid(struct rtllib_device *ieee, struct iw_request_info *a, ...@@ -220,7 +215,6 @@ int rtllib_wx_get_essid(struct rtllib_device *ieee, struct iw_request_info *a,
spin_unlock_irqrestore(&ieee->lock, flags); spin_unlock_irqrestore(&ieee->lock, flags);
return ret; return ret;
} }
EXPORT_SYMBOL(rtllib_wx_get_essid); EXPORT_SYMBOL(rtllib_wx_get_essid);
...@@ -228,7 +222,6 @@ int rtllib_wx_set_rate(struct rtllib_device *ieee, ...@@ -228,7 +222,6 @@ int rtllib_wx_set_rate(struct rtllib_device *ieee,
struct iw_request_info *info, struct iw_request_info *info,
union iwreq_data *wrqu, char *extra) union iwreq_data *wrqu, char *extra)
{ {
u32 target_rate = wrqu->bitrate.value; u32 target_rate = wrqu->bitrate.value;
ieee->rate = target_rate / 100000; ieee->rate = target_rate / 100000;
...@@ -250,7 +243,6 @@ int rtllib_wx_get_rate(struct rtllib_device *ieee, ...@@ -250,7 +243,6 @@ int rtllib_wx_get_rate(struct rtllib_device *ieee,
} }
EXPORT_SYMBOL(rtllib_wx_get_rate); EXPORT_SYMBOL(rtllib_wx_get_rate);
int rtllib_wx_set_rts(struct rtllib_device *ieee, int rtllib_wx_set_rts(struct rtllib_device *ieee,
struct iw_request_info *info, struct iw_request_info *info,
union iwreq_data *wrqu, char *extra) union iwreq_data *wrqu, char *extra)
...@@ -397,7 +389,6 @@ void rtllib_wx_sync_scan_wq(void *data) ...@@ -397,7 +389,6 @@ void rtllib_wx_sync_scan_wq(void *data)
out: out:
mutex_unlock(&ieee->wx_mutex); mutex_unlock(&ieee->wx_mutex);
} }
int rtllib_wx_set_scan(struct rtllib_device *ieee, struct iw_request_info *a, int rtllib_wx_set_scan(struct rtllib_device *ieee, struct iw_request_info *a,
...@@ -425,7 +416,6 @@ int rtllib_wx_set_essid(struct rtllib_device *ieee, ...@@ -425,7 +416,6 @@ int rtllib_wx_set_essid(struct rtllib_device *ieee,
struct iw_request_info *a, struct iw_request_info *a,
union iwreq_data *wrqu, char *extra) union iwreq_data *wrqu, char *extra)
{ {
int ret = 0, len; int ret = 0, len;
short proto_started; short proto_started;
unsigned long flags; unsigned long flags;
...@@ -445,7 +435,6 @@ int rtllib_wx_set_essid(struct rtllib_device *ieee, ...@@ -445,7 +435,6 @@ int rtllib_wx_set_essid(struct rtllib_device *ieee,
if (proto_started) if (proto_started)
rtllib_stop_protocol(ieee, true); rtllib_stop_protocol(ieee, true);
/* this is just to be sure that the GET wx callback /* this is just to be sure that the GET wx callback
* has consistent infos. not needed otherwise * has consistent infos. not needed otherwise
*/ */
...@@ -483,7 +472,6 @@ int rtllib_wx_set_rawtx(struct rtllib_device *ieee, ...@@ -483,7 +472,6 @@ int rtllib_wx_set_rawtx(struct rtllib_device *ieee,
struct iw_request_info *info, struct iw_request_info *info,
union iwreq_data *wrqu, char *extra) union iwreq_data *wrqu, char *extra)
{ {
int *parms = (int *)extra; int *parms = (int *)extra;
int enable = (parms[0] > 0); int enable = (parms[0] > 0);
short prev = ieee->raw_tx; short prev = ieee->raw_tx;
...@@ -524,7 +512,6 @@ int rtllib_wx_get_name(struct rtllib_device *ieee, struct iw_request_info *info, ...@@ -524,7 +512,6 @@ int rtllib_wx_get_name(struct rtllib_device *ieee, struct iw_request_info *info,
} }
EXPORT_SYMBOL(rtllib_wx_get_name); EXPORT_SYMBOL(rtllib_wx_get_name);
/* this is mostly stolen from hostap */ /* this is mostly stolen from hostap */
int rtllib_wx_set_power(struct rtllib_device *ieee, int rtllib_wx_set_power(struct rtllib_device *ieee,
struct iw_request_info *info, struct iw_request_info *info,
...@@ -570,12 +557,10 @@ int rtllib_wx_set_power(struct rtllib_device *ieee, ...@@ -570,12 +557,10 @@ int rtllib_wx_set_power(struct rtllib_device *ieee,
default: default:
ret = -EINVAL; ret = -EINVAL;
goto exit; goto exit;
} }
exit: exit:
mutex_unlock(&ieee->wx_mutex); mutex_unlock(&ieee->wx_mutex);
return ret; return ret;
} }
EXPORT_SYMBOL(rtllib_wx_set_power); EXPORT_SYMBOL(rtllib_wx_set_power);
...@@ -612,6 +597,5 @@ int rtllib_wx_get_power(struct rtllib_device *ieee, ...@@ -612,6 +597,5 @@ int rtllib_wx_get_power(struct rtllib_device *ieee,
exit: exit:
mutex_unlock(&ieee->wx_mutex); mutex_unlock(&ieee->wx_mutex);
return 0; return 0;
} }
EXPORT_SYMBOL(rtllib_wx_get_power); EXPORT_SYMBOL(rtllib_wx_get_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