Skip to content

Commit

Permalink
mt76: mt7915: fix unused 'mode' variable
Browse files Browse the repository at this point in the history
clang points out a possible corner case in the mt7915_tm_set_tx_cont()
function if called with invalid arguments:

drivers/net/wireless/mediatek/mt76/mt7915/testmode.c:593:2: warning: variable 'mode' is used uninitialized whenever switch default is taken [-Wsometimes-uninitialized]
        default:
        ^~~~~~~
drivers/net/wireless/mediatek/mt76/mt7915/testmode.c:597:13: note: uninitialized use occurs here
        rateval =  mode << 6 | rate_idx;
                   ^~~~
drivers/net/wireless/mediatek/mt76/mt7915/testmode.c:506:37: note: initialize the variable 'mode' to silence this warning
        u8 rate_idx = td->tx_rate_idx, mode;
                                           ^

Change it to return an error instead of continuing with invalid data
here.

Fixes: 3f0caa3cbf94 ("mt76: mt7915: add support for continuous tx in testmode")
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Signed-off-by: Kalle Valo <kvalo@codeaurora.org>
  • Loading branch information
arndb authored and nbd168 committed Mar 12, 2021
1 parent ab90451 commit 7e1eff6
Showing 1 changed file with 5 additions and 4 deletions.
9 changes: 5 additions & 4 deletions mt7915/testmode.c
Expand Up @@ -543,7 +543,7 @@ mt7915_tm_set_tx_cont(struct mt7915_phy *phy, bool en)
tx_cont->bw = CMD_CBW_20MHZ;
break;
default:
break;
return -EINVAL;
}

if (!en) {
Expand All @@ -569,6 +569,9 @@ mt7915_tm_set_tx_cont(struct mt7915_phy *phy, bool en)
case MT76_TM_TX_MODE_CCK:
mode = MT_PHY_TYPE_CCK;
break;
case MT76_TM_TX_MODE_OFDM:
mode = MT_PHY_TYPE_OFDM;
break;
case MT76_TM_TX_MODE_HT:
mode = MT_PHY_TYPE_HT;
break;
Expand All @@ -587,10 +590,8 @@ mt7915_tm_set_tx_cont(struct mt7915_phy *phy, bool en)
case MT76_TM_TX_MODE_HE_MU:
mode = MT_PHY_TYPE_HE_MU;
break;
case MT76_TM_TX_MODE_OFDM:
default:
mode = MT_PHY_TYPE_OFDM;
break;
return -EINVAL;
}

rateval = mode << 6 | rate_idx;
Expand Down

0 comments on commit 7e1eff6

Please sign in to comment.