Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit d0df71dc authored by Larry Finger's avatar Larry Finger Committed by John W. Linville
Browse files

rtlwifi: rtl8192_common: Fix smatch errors and warnings in rtl8192c/dm_common.c 



Smatch lists the following:
  CHECK   drivers/net/wireless/rtlwifi/rtl8192c/dm_common.c
drivers/net/wireless/rtlwifi/rtl8192c/dm_common.c:551 rtl92c_dm_pwdb_monitor() info: ignoring unreachable code.
drivers/net/wireless/rtlwifi/rtl8192c/dm_common.c:551 rtl92c_dm_pwdb_monitor() info: ignoring unreachable code.
drivers/net/wireless/rtlwifi/rtl8192c/dm_common.c:870 rtl92c_dm_txpower_tracking_callback_thermalmeter() error: buffer overflow 'txpwr_level' 2 <= 2
drivers/net/wireless/rtlwifi/rtl8192c/dm_common.c:870 rtl92c_dm_txpower_tracking_callback_thermalmeter() error: buffer overflow 'txpwr_level' 2 <= 2
drivers/net/wireless/rtlwifi/rtl8192c/dm_common.c:882 rtl92c_dm_txpower_tracking_callback_thermalmeter() error: buffer overflow 'txpwr_level' 2 <= 2
drivers/net/wireless/rtlwifi/rtl8192c/dm_common.c:883 rtl92c_dm_txpower_tracking_callback_thermalmeter() error: buffer overflow 'txpwr_level' 2 <= 2
drivers/net/wireless/rtlwifi/rtl8192c/dm_common.c:891 rtl92c_dm_txpower_tracking_callback_thermalmeter() error: buffer overflow 'txpwr_level' 2 <= 2
drivers/net/wireless/rtlwifi/rtl8192c/dm_common.c:892 rtl92c_dm_txpower_tracking_callback_thermalmeter() error: buffer overflow 'txpwr_level' 2 <= 2

The unreachable code message is fixed by deleting the code that follows a return.

The errors are fixed by increasing the size of txpwr_level.

Signed-off-by: default avatarLarry Finger <Larry.Finger@lwfinger.net>
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent 61800b27

drivers/net/wireless/rtlwifi/rtl8192c/dm_common.c

+1 −24
Original line number Diff line number Diff line
@@ -541,29 +541,6 @@ EXPORT_SYMBOL(rtl92c_dm_write_dig); 


static void rtl92c_dm_pwdb_monitor(struct ieee80211_hw *hw)

{

	struct rtl_priv *rtlpriv = rtl_priv(hw);

	long tmpentry_max_pwdb = 0, tmpentry_min_pwdb = 0xff;



	u8 h2c_parameter[3] = { 0 };



	return;



	if (tmpentry_max_pwdb != 0) {

		rtlpriv->dm.entry_max_undec_sm_pwdb = tmpentry_max_pwdb;

	} else {

		rtlpriv->dm.entry_max_undec_sm_pwdb = 0;

	}



	if (tmpentry_min_pwdb != 0xff) {

		rtlpriv->dm.entry_min_undec_sm_pwdb = tmpentry_min_pwdb;

	} else {

		rtlpriv->dm.entry_min_undec_sm_pwdb = 0;

	}



	h2c_parameter[2] = (u8) (rtlpriv->dm.undec_sm_pwdb & 0xFF);

	h2c_parameter[0] = 0;



	rtl92c_fill_h2c_cmd(hw, H2C_RSSI_REPORT, 3, h2c_parameter);

}



void rtl92c_dm_init_edca_turbo(struct ieee80211_hw *hw)
@@ -673,7 +650,7 @@ static void rtl92c_dm_txpower_tracking_callback_thermalmeter(struct ieee80211_hw 
	s8 cck_index = 0;

	int i;

	bool is2t = IS_92C_SERIAL(rtlhal->version);

	s8 txpwr_level[2] = {0, 0};

	s8 txpwr_level[3] = {0, 0, 0};

	u8 ofdm_min_index = 6, rf;



	rtlpriv->dm.txpower_trackinginit = true;