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

Commit 6a22f10c authored by Johannes Berg's avatar Johannes Berg Committed by John W. Linville
Browse files

iwlwifi: remove scan_rx_antennas 



This is not (no longer?) used by any device
so just remove it.

Signed-off-by: default avatarJohannes Berg <johannes.berg@intel.com>
Signed-off-by: default avatarWey-Yi Guy <wey-yi.w.guy@intel.com>
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent cf61686a

drivers/net/wireless/iwlwifi/iwl-scan.c

+0 −3
Original line number Diff line number Diff line
@@ -793,9 +793,6 @@ static int iwlagn_request_scan(struct iwl_priv *priv, struct ieee80211_vif *vif) 


	band = priv->scan_band;



	if (cfg(priv)->scan_rx_antennas[band])

		rx_ant = cfg(priv)->scan_rx_antennas[band];



	if (band == IEEE80211_BAND_2GHZ &&

	    cfg(priv)->bt_params &&

	    cfg(priv)->bt_params->advanced_bt_coexist) {

drivers/net/wireless/iwlwifi/iwl-shared.h

+0 −2
Original line number Diff line number Diff line
@@ -297,7 +297,6 @@ struct iwl_ht_params { 
 * @need_temp_offset_calib: need to perform temperature offset calibration

 * @no_xtal_calib: some devices do not need crystal calibration data,

 *	don't send it to those

 * @scan_rx_antennas: available antenna for scan operation

 * @led_mode: 0=blinking, 1=On(RF On)/Off(RF Off)

 * @adv_pm: advance power management

 * @rx_with_siso_diversity: 1x1 device with rx antenna diversity
@@ -330,7 +329,6 @@ struct iwl_cfg { 
	const struct iwl_bt_params *bt_params;

	const bool need_temp_offset_calib; /* if used set to true */

	const bool no_xtal_calib;

	u8 scan_rx_antennas[IEEE80211_NUM_BANDS];

	enum iwl_led_mode led_mode;

	const bool adv_pm;

	const bool rx_with_siso_diversity;