| Message ID | 20180426130138.GA440@embeddedor.com (mailing list archive) |
|---|---|
| State | Accepted |
| Commit | e1fd7ceec194225a822760a40dfa73efdd59881b |
| Delegated to: | Kalle Valo |
| Headers | show |
"Gustavo A. R. Silva" <gustavo@embeddedor.com> wrote: > Function rsi_hal_key_config returns before reaching code at line > 922 if (status), hence this code is structurally dead. > > Fix this by storing the value returned by rsi_hal_load_key > into _status_ for its further evaluation and use. > > Addresses-Coverity-ID: 1468409 ("Structurally dead code") > Fixes: 4fd6c4762f37 ("rsi: roaming enhancements") > Signed-off-by: Gustavo A. R. Silva <gustavo@embeddedor.com> Patch applied to wireless-drivers-next.git, thanks. e1fd7ceec194 rsi_91x: fix structurally dead code
diff --git a/drivers/net/wireless/rsi/rsi_91x_mac80211.c b/drivers/net/wireless/rsi/rsi_91x_mac80211.c index 766d874..80e7f4f 100644 --- a/drivers/net/wireless/rsi/rsi_91x_mac80211.c +++ b/drivers/net/wireless/rsi/rsi_91x_mac80211.c @@ -911,14 +911,14 @@ static int rsi_hal_key_config(struct ieee80211_hw *hw, } } - return rsi_hal_load_key(adapter->priv, - key->key, - key->keylen, - key_type, - key->keyidx, - key->cipher, - sta_id, - vif); + status = rsi_hal_load_key(adapter->priv, + key->key, + key->keylen, + key_type, + key->keyidx, + key->cipher, + sta_id, + vif); if (status) return status;
Function rsi_hal_key_config returns before reaching code at line 922 if (status), hence this code is structurally dead. Fix this by storing the value returned by rsi_hal_load_key into _status_ for its further evaluation and use. Addresses-Coverity-ID: 1468409 ("Structurally dead code") Fixes: 4fd6c4762f37 ("rsi: roaming enhancements") Signed-off-by: Gustavo A. R. Silva <gustavo@embeddedor.com> --- drivers/net/wireless/rsi/rsi_91x_mac80211.c | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-)