Commit d74385fd authored by horms@vergenet.net's avatar horms@vergenet.net Committed by Greg Kroah-Hartman

Staging: otus: remove unused variables

Signed-off-by: default avatarSimon Horman <horms@verge.net.au>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
parent d0279369
...@@ -1832,8 +1832,7 @@ u16_t zfAggRxClear(zdev_t* dev, u32_t time) ...@@ -1832,8 +1832,7 @@ u16_t zfAggRxClear(zdev_t* dev, u32_t time)
struct agg_tid_rx* zfAggRxEnabled(zdev_t* dev, zbuf_t* buf) struct agg_tid_rx* zfAggRxEnabled(zdev_t* dev, zbuf_t* buf)
{ {
u16_t dst0, src[3], ac, aid, fragOff; u16_t dst0, src[3], aid;
u8_t up;
u16_t offset = 0; u16_t offset = 0;
u16_t seq_no; u16_t seq_no;
u16_t frameType; u16_t frameType;
......
...@@ -1194,8 +1194,6 @@ u16_t zfFindMinimumUtilizationChannelIndex(zdev_t* dev, u16_t* array, u16_t coun ...@@ -1194,8 +1194,6 @@ u16_t zfFindMinimumUtilizationChannelIndex(zdev_t* dev, u16_t* array, u16_t coun
u8_t i; u8_t i;
u16_t tempMinIndex, tempMinValue; u16_t tempMinIndex, tempMinValue;
zmw_get_wlan_dev(dev);
i = 1; i = 1;
tempMinIndex = 0; tempMinIndex = 0;
tempMinValue = array[tempMinIndex]; tempMinValue = array[tempMinIndex];
......
...@@ -346,8 +346,6 @@ u16_t zfFindSuperGElement(zdev_t* dev, zbuf_t* buf, u8_t type) ...@@ -346,8 +346,6 @@ u16_t zfFindSuperGElement(zdev_t* dev, zbuf_t* buf, u8_t type)
u8_t super_feature; u8_t super_feature;
u8_t ouiSuperG[6] = {0x00,0x03,0x7f,0x01, 0x01, 0x00}; u8_t ouiSuperG[6] = {0x00,0x03,0x7f,0x01, 0x01, 0x00};
zmw_get_wlan_dev(dev);
/* Get offset of first element */ /* Get offset of first element */
subType = (zmw_rx_buf_readb(dev, buf, 0) >> 4); subType = (zmw_rx_buf_readb(dev, buf, 0) >> 4);
if ((offset = zgElementOffsetTable[subType]) == 0xff) if ((offset = zgElementOffsetTable[subType]) == 0xff)
...@@ -411,8 +409,6 @@ u16_t zfFindXRElement(zdev_t* dev, zbuf_t* buf, u8_t type) ...@@ -411,8 +409,6 @@ u16_t zfFindXRElement(zdev_t* dev, zbuf_t* buf, u8_t type)
u8_t id; u8_t id;
u8_t ouixr[6] = {0x00,0x03,0x7f,0x03, 0x01, 0x00}; u8_t ouixr[6] = {0x00,0x03,0x7f,0x03, 0x01, 0x00};
zmw_get_wlan_dev(dev);
/* Get offset of first element */ /* Get offset of first element */
subType = (zmw_rx_buf_readb(dev, buf, 0) >> 4); subType = (zmw_rx_buf_readb(dev, buf, 0) >> 4);
if ((offset = zgElementOffsetTable[subType]) == 0xff) if ((offset = zgElementOffsetTable[subType]) == 0xff)
......
...@@ -4848,8 +4848,6 @@ u16_t zfStaAddIePowerCap(zdev_t* dev, zbuf_t* buf, u16_t offset) ...@@ -4848,8 +4848,6 @@ u16_t zfStaAddIePowerCap(zdev_t* dev, zbuf_t* buf, u16_t offset)
u8_t MaxTxPower; u8_t MaxTxPower;
u8_t MinTxPower; u8_t MinTxPower;
zmw_get_wlan_dev(dev);
/* Element ID */ /* Element ID */
zmw_tx_buf_writeb(dev, buf, offset++, ZM_WLAN_EID_POWER_CAPABILITY); zmw_tx_buf_writeb(dev, buf, offset++, ZM_WLAN_EID_POWER_CAPABILITY);
...@@ -5276,7 +5274,6 @@ u16_t zfStaRxValidateFrame(zdev_t* dev, zbuf_t* buf) ...@@ -5276,7 +5274,6 @@ u16_t zfStaRxValidateFrame(zdev_t* dev, zbuf_t* buf)
u8_t da0; u8_t da0;
//u16_t sa[3]; //u16_t sa[3];
u16_t ret; u16_t ret;
u16_t i;
//u8_t sa0; //u8_t sa0;
zmw_get_wlan_dev(dev); zmw_get_wlan_dev(dev);
...@@ -5738,8 +5735,6 @@ u16_t zfComputeBssInfoWeightValue(zdev_t *dev, u8_t isBMode, u8_t isHT, u8_t isH ...@@ -5738,8 +5735,6 @@ u16_t zfComputeBssInfoWeightValue(zdev_t *dev, u8_t isBMode, u8_t isHT, u8_t isH
u8_t weightOfN40BelowThr = 16; u8_t weightOfN40BelowThr = 16;
u8_t weightOfN40UpThr = 32; u8_t weightOfN40UpThr = 32;
zmw_get_wlan_dev(dev);
if( isBMode == 0 ) if( isBMode == 0 )
return (signalStrength + weightOfB); // pure b mode , do not add the weight value for this AP ! return (signalStrength + weightOfB); // pure b mode , do not add the weight value for this AP !
else else
......
...@@ -381,8 +381,6 @@ static void zfPowerSavingMgrSleepIfIdle(zdev_t *dev) ...@@ -381,8 +381,6 @@ static void zfPowerSavingMgrSleepIfIdle(zdev_t *dev)
static void zfPowerSavingMgrDisconnectMain(zdev_t* dev) static void zfPowerSavingMgrDisconnectMain(zdev_t* dev)
{ {
zmw_get_wlan_dev(dev);
#ifdef ZM_ENABLE_DISCONNECT_PS #ifdef ZM_ENABLE_DISCONNECT_PS
switch(wd->sta.psMgr.state) switch(wd->sta.psMgr.state)
{ {
......
...@@ -289,8 +289,6 @@ static void zfScanMgrEventSetFreqCompleteCb(zdev_t* dev) ...@@ -289,8 +289,6 @@ static void zfScanMgrEventSetFreqCompleteCb(zdev_t* dev)
static void zfScanMgrEventScanCompleteCb(zdev_t* dev) static void zfScanMgrEventScanCompleteCb(zdev_t* dev)
{ {
zmw_get_wlan_dev(dev);
if ((zfStaIsConnected(dev)) && (!zfPowerSavingMgrIsSleeping(dev))) if ((zfStaIsConnected(dev)) && (!zfPowerSavingMgrIsSleeping(dev)))
{ {
zfSendNullData(dev, 0); zfSendNullData(dev, 0);
......
...@@ -882,7 +882,6 @@ u16_t zfiTxSendEth(zdev_t* dev, zbuf_t* buf, u16_t port) ...@@ -882,7 +882,6 @@ u16_t zfiTxSendEth(zdev_t* dev, zbuf_t* buf, u16_t port)
/************************************************************************/ /************************************************************************/
u16_t zfTxSendEth(zdev_t* dev, zbuf_t* buf, u16_t port, u16_t bufType, u16_t flag) u16_t zfTxSendEth(zdev_t* dev, zbuf_t* buf, u16_t port, u16_t bufType, u16_t flag)
{ {
u16_t err;
//u16_t addrTblSize; //u16_t addrTblSize;
//struct zsAddrTbl addrTbl; //struct zsAddrTbl addrTbl;
u16_t removeLen; u16_t removeLen;
...@@ -904,7 +903,6 @@ u16_t zfTxSendEth(zdev_t* dev, zbuf_t* buf, u16_t port, u16_t bufType, u16_t fla ...@@ -904,7 +903,6 @@ u16_t zfTxSendEth(zdev_t* dev, zbuf_t* buf, u16_t port, u16_t bufType, u16_t fla
u8_t qosType, keyIdx = 0; u8_t qosType, keyIdx = 0;
u16_t fragOff; u16_t fragOff;
u16_t newFlag; u16_t newFlag;
struct zsMicVar* pMicKey;
u8_t tkipFrameOffset = 0; u8_t tkipFrameOffset = 0;
zmw_get_wlan_dev(dev); zmw_get_wlan_dev(dev);
...@@ -1692,8 +1690,6 @@ void zfShowTxEAPOL(zdev_t* dev, zbuf_t* buf, u16_t offset) ...@@ -1692,8 +1690,6 @@ void zfShowTxEAPOL(zdev_t* dev, zbuf_t* buf, u16_t offset)
u16_t packetLen, keyInfo, keyLen, keyDataLen, length, Op_Code; u16_t packetLen, keyInfo, keyLen, keyDataLen, length, Op_Code;
u32_t replayCounterH, replayCounterL, vendorId, VendorType; u32_t replayCounterH, replayCounterL, vendorId, VendorType;
zmw_get_wlan_dev(dev);
zm_debug_msg1("EAPOL Packet size = ", zfwBufGetSize(dev, buf)); zm_debug_msg1("EAPOL Packet size = ", zfwBufGetSize(dev, buf));
/* EAPOL packet type */ /* EAPOL packet type */
...@@ -2436,7 +2432,6 @@ void zfiRecv80211(zdev_t* dev, zbuf_t* buf, struct zsAdditionInfo* addInfo) ...@@ -2436,7 +2432,6 @@ void zfiRecv80211(zdev_t* dev, zbuf_t* buf, struct zsAdditionInfo* addInfo)
u16_t IvOffset; u16_t IvOffset;
u8_t keyLen = 5; u8_t keyLen = 5;
u8_t iv[3]; u8_t iv[3];
u8_t *wepKey;
u8_t keyIdx; u8_t keyIdx;
IvOffset = offset + ZM_SIZE_OF_WLAN_DATA_HEADER; IvOffset = offset + ZM_SIZE_OF_WLAN_DATA_HEADER;
......
...@@ -187,7 +187,6 @@ void zfLedCtrlType2_scan(zdev_t* dev); ...@@ -187,7 +187,6 @@ void zfLedCtrlType2_scan(zdev_t* dev);
void zfLedCtrlType2(zdev_t* dev) void zfLedCtrlType2(zdev_t* dev)
{ {
u32_t ton, toff, tmp, period;
u16_t OperateLED; u16_t OperateLED;
zmw_get_wlan_dev(dev); zmw_get_wlan_dev(dev);
......
...@@ -1316,7 +1316,6 @@ void zfHpSetFrequencyEx(zdev_t* dev, u32_t frequency, u8_t bw40, ...@@ -1316,7 +1316,6 @@ void zfHpSetFrequencyEx(zdev_t* dev, u32_t frequency, u8_t bw40,
u8_t extOffset, u8_t initRF) u8_t extOffset, u8_t initRF)
{ {
u32_t cmd[9]; u32_t cmd[9];
u32_t cmdB[3];
u16_t ret; u16_t ret;
u8_t old_band; u8_t old_band;
u8_t new_band; u8_t new_band;
...@@ -3434,7 +3433,6 @@ void zfSetPowerCalTable(zdev_t* dev, u32_t frequency, u8_t bw40, u8_t extOffset) ...@@ -3434,7 +3433,6 @@ void zfSetPowerCalTable(zdev_t* dev, u32_t frequency, u8_t bw40, u8_t extOffset)
/* Write PHY regs 672-703 */ /* Write PHY regs 672-703 */
for (i=0; i<128; i+=4) for (i=0; i<128; i+=4)
{ {
u32_t regAddr = 0x9800 + (672 * 4);
u32_t val; u32_t val;
val = ((u32_t)vpd_chain1[i+3]<<24) | val = ((u32_t)vpd_chain1[i+3]<<24) |
...@@ -3485,7 +3483,6 @@ void zfSetPowerCalTable(zdev_t* dev, u32_t frequency, u8_t bw40, u8_t extOffset) ...@@ -3485,7 +3483,6 @@ void zfSetPowerCalTable(zdev_t* dev, u32_t frequency, u8_t bw40, u8_t extOffset)
/* Write PHY regs 672-703 + 0x1000 */ /* Write PHY regs 672-703 + 0x1000 */
for (i=0; i<128; i+=4) for (i=0; i<128; i+=4)
{ {
u32_t regAddr = 0x9800 + (672 * 4) + 0x1000;
u32_t val; u32_t val;
val = ((u32_t)vpd_chain3[i+3]<<24) | val = ((u32_t)vpd_chain3[i+3]<<24) |
...@@ -4584,7 +4581,6 @@ void zfHpSetRollCallTable(zdev_t* dev) ...@@ -4584,7 +4581,6 @@ void zfHpSetRollCallTable(zdev_t* dev)
void zfHpSetTTSIFSTime(zdev_t* dev, u8_t sifs_time) void zfHpSetTTSIFSTime(zdev_t* dev, u8_t sifs_time)
{ {
u32_t reg_value = 0; u32_t reg_value = 0;
zmw_get_wlan_dev(dev);
sifs_time &= 0x3f; sifs_time &= 0x3f;
reg_value = 0x14400b | (((u32_t)sifs_time)<<24); reg_value = 0x14400b | (((u32_t)sifs_time)<<24);
......
...@@ -282,7 +282,6 @@ void zfIdlRsp(zdev_t* dev, u32_t* rsp, u16_t rspLen) ...@@ -282,7 +282,6 @@ void zfIdlRsp(zdev_t* dev, u32_t* rsp, u16_t rspLen)
else if (src == ZM_OID_FLASH_READ) else if (src == ZM_OID_FLASH_READ)
{ {
u32_t datalen; u32_t datalen;
u16_t i;
datalen = (rsp[0] & 255); datalen = (rsp[0] & 255);
......
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