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

Commit 9c2e90ff authored by Ben Greear's avatar Ben Greear Committed by Kalle Valo
Browse files

ath6kl: report antenna configuration 



This lets 'iw phy phy0 info' report antennas for
the radio device:

...
	Available Antennas: TX 0x2 RX 0x2
	Configured Antennas: TX 0x2 RX 0x2
...

Signed-off-by: default avatarBen Greear <greearb@candelatech.com>
Signed-off-by: default avatarKalle Valo <kvalo@qca.qualcomm.com>
parent 5140a5fd

drivers/net/wireless/ath/ath6kl/cfg80211.c

+17 −0
Original line number Original line Diff line number Diff line
@@ -3231,6 +3231,15 @@ static int ath6kl_mgmt_tx(struct wiphy *wiphy, struct wireless_dev *wdev, 
					wait, buf, len, no_cck);

					wait, buf, len, no_cck);

}

}





static int ath6kl_get_antenna(struct wiphy *wiphy,

			      u32 *tx_ant, u32 *rx_ant)

{

	struct ath6kl *ar = wiphy_priv(wiphy);

	*tx_ant = ar->hw.tx_ant;

	*rx_ant = ar->hw.rx_ant;

	return 0;

}



static void ath6kl_mgmt_frame_register(struct wiphy *wiphy,

static void ath6kl_mgmt_frame_register(struct wiphy *wiphy,

				       struct wireless_dev *wdev,

				       struct wireless_dev *wdev,

				       u16 frame_type, bool reg)

				       u16 frame_type, bool reg)
@@ -3447,6 +3456,7 @@ static struct cfg80211_ops ath6kl_cfg80211_ops = { 
	.cancel_remain_on_channel = ath6kl_cancel_remain_on_channel,

	.cancel_remain_on_channel = ath6kl_cancel_remain_on_channel,

	.mgmt_tx = ath6kl_mgmt_tx,

	.mgmt_tx = ath6kl_mgmt_tx,

	.mgmt_frame_register = ath6kl_mgmt_frame_register,

	.mgmt_frame_register = ath6kl_mgmt_frame_register,

	.get_antenna = ath6kl_get_antenna,

	.sched_scan_start = ath6kl_cfg80211_sscan_start,

	.sched_scan_start = ath6kl_cfg80211_sscan_start,

	.sched_scan_stop = ath6kl_cfg80211_sscan_stop,

	.sched_scan_stop = ath6kl_cfg80211_sscan_stop,

	.set_bitrate_mask = ath6kl_cfg80211_set_bitrate,

	.set_bitrate_mask = ath6kl_cfg80211_set_bitrate,
@@ -3794,11 +3804,18 @@ int ath6kl_cfg80211_init(struct ath6kl *ar) 
		ath6kl_band_5ghz.ht_cap.mcs.rx_mask[0] = 0xff;

		ath6kl_band_5ghz.ht_cap.mcs.rx_mask[0] = 0xff;

		ath6kl_band_2ghz.ht_cap.mcs.rx_mask[1] = 0xff;

		ath6kl_band_2ghz.ht_cap.mcs.rx_mask[1] = 0xff;

		ath6kl_band_5ghz.ht_cap.mcs.rx_mask[1] = 0xff;

		ath6kl_band_5ghz.ht_cap.mcs.rx_mask[1] = 0xff;

		ar->hw.tx_ant = 2;

		ar->hw.rx_ant = 2;

	} else {

	} else {

		ath6kl_band_2ghz.ht_cap.mcs.rx_mask[0] = 0xff;

		ath6kl_band_2ghz.ht_cap.mcs.rx_mask[0] = 0xff;

		ath6kl_band_5ghz.ht_cap.mcs.rx_mask[0] = 0xff;

		ath6kl_band_5ghz.ht_cap.mcs.rx_mask[0] = 0xff;

		ar->hw.tx_ant = 1;

		ar->hw.rx_ant = 1;

	}

	}





	wiphy->available_antennas_tx = ar->hw.tx_ant;

	wiphy->available_antennas_rx = ar->hw.rx_ant;



	if (band_2gig)

	if (band_2gig)

		wiphy->bands[IEEE80211_BAND_2GHZ] = &ath6kl_band_2ghz;

		wiphy->bands[IEEE80211_BAND_2GHZ] = &ath6kl_band_2ghz;

	if (band_5gig)

	if (band_5gig)

drivers/net/wireless/ath/ath6kl/core.h

+2 −0
Original line number Original line Diff line number Diff line
@@ -782,6 +782,8 @@ struct ath6kl { 
		u32 refclk_hz;

		u32 refclk_hz;

		u32 uarttx_pin;

		u32 uarttx_pin;

		u32 testscript_addr;

		u32 testscript_addr;

		u8 tx_ant;

		u8 rx_ant;

		enum wmi_phy_cap cap;

		enum wmi_phy_cap cap;





		u32 flags;

		u32 flags;