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

Commit d1398b5b authored by Igor Mitsyanko's avatar Igor Mitsyanko Committed by Kalle Valo
Browse files

qtnfmac: get rid of PHYMODE capabilities flags 



Supported WiFi operation modes are now identified per-band based on
HT/VHT capabilities of each band.

Signed-off-by: default avatarIgor Mitsyanko <igor.mitsyanko.os@quantenna.com>
Signed-off-by: default avatarKalle Valo <kvalo@codeaurora.org>
parent d42df85f

drivers/net/wireless/quantenna/qtnfmac/cfg80211.c

+0 −3
Original line number Diff line number Diff line
@@ -891,9 +891,6 @@ int qtnf_wiphy_register(struct qtnf_hw_info *hw_info, struct qtnf_wmac *mac) 
	if (ret)

		goto out;



	pr_info("MAC%u: phymode=%#x radar=%#x\n", mac->macid,

		mac->macinfo.phymode_cap, mac->macinfo.radar_detect_widths);



	wiphy->frag_threshold = mac->macinfo.frag_thr;

	wiphy->rts_threshold = mac->macinfo.rts_thr;

	wiphy->retry_short = mac->macinfo.sretry_limit;

drivers/net/wireless/quantenna/qtnfmac/commands.c

+0 −1
Original line number Diff line number Diff line
@@ -1090,7 +1090,6 @@ qtnf_cmd_resp_proc_mac_info(struct qtnf_wmac *mac, 
	mac_info = &mac->macinfo;



	mac_info->bands_cap = resp_info->bands_cap;

	mac_info->phymode_cap = resp_info->phymode_cap;

	memcpy(&mac_info->dev_mac, &resp_info->dev_mac,

	       sizeof(mac_info->dev_mac));

drivers/net/wireless/quantenna/qtnfmac/core.h

+0 −1
Original line number Diff line number Diff line
@@ -92,7 +92,6 @@ struct qtnf_vif { 


struct qtnf_mac_info {

	u8 bands_cap;

	u8 phymode_cap;

	u8 dev_mac[ETH_ALEN];

	u8 num_tx_chain;

	u8 num_rx_chain;

drivers/net/wireless/quantenna/qtnfmac/qlink.h

+2 −9
Original line number Diff line number Diff line
@@ -74,12 +74,6 @@ enum qlink_hw_capab { 
	QLINK_HW_CAPAB_STA_INACT_TIMEOUT = BIT(1),

};



enum qlink_phy_mode {

	QLINK_PHYMODE_BGN	= BIT(0),

	QLINK_PHYMODE_AN	= BIT(1),

	QLINK_PHYMODE_AC	= BIT(2),

};



enum qlink_iface_type {

	QLINK_IFTYPE_AP		= 1,

	QLINK_IFTYPE_STATION	= 2,
@@ -639,7 +633,6 @@ struct qlink_resp { 
 * @vht_cap_mod_mask: mask specifying which VHT capabilities can be altered.

 * @ht_cap_mod_mask: mask specifying which HT capabilities can be altered.

 * @bands_cap: wireless bands WMAC can operate in, bitmap of &enum qlink_band.

 * @phymode_cap: PHY modes WMAC can operate in, bitmap of &enum qlink_phy_mode.

 * @max_ap_assoc_sta: Maximum number of associations supported by WMAC.

 * @radar_detect_widths: bitmask of channels BW for which WMAC can detect radar.

 * @var_info: variable-length WMAC info data.
@@ -651,10 +644,10 @@ struct qlink_resp_get_mac_info { 
	u8 num_rx_chain;

	struct ieee80211_vht_cap vht_cap_mod_mask;

	struct ieee80211_ht_cap ht_cap_mod_mask;

	u8 bands_cap;

	u8 phymode_cap;

	__le16 max_ap_assoc_sta;

	__le16 radar_detect_widths;

	u8 bands_cap;

	u8 rsvd[1];

	u8 var_info[0];

} __packed;