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

Commit 4ecc631d authored by Sergey Matyukevich's avatar Sergey Matyukevich Committed by Greg Kroah-Hartman
Browse files

qtnfmac: inform wireless core about supported extended capabilities 



[ Upstream commit ab1c64a1d349cc7f1090a60ce85a53298e3d371d ]

Driver retrieves information about supported extended capabilities
from wireless card. However this information is not propagated
further to Linux wireless core. Fix this by setting extended
capabilities fields of wiphy structure.

Signed-off-by: default avatarSergey Matyukevich <sergey.matyukevich.os@quantenna.com>
Signed-off-by: default avatarKalle Valo <kvalo@codeaurora.org>
Signed-off-by: default avatarSasha Levin <sashal@kernel.org>
parent 28d5342b

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

+9 −0
Original line number Diff line number Diff line
@@ -1126,6 +1126,15 @@ int qtnf_wiphy_register(struct qtnf_hw_info *hw_info, struct qtnf_wmac *mac) 
		wiphy->regulatory_flags |= REGULATORY_WIPHY_SELF_MANAGED;

	}



	if (mac->macinfo.extended_capabilities_len) {

		wiphy->extended_capabilities =

			mac->macinfo.extended_capabilities;

		wiphy->extended_capabilities_mask =

			mac->macinfo.extended_capabilities_mask;

		wiphy->extended_capabilities_len =

			mac->macinfo.extended_capabilities_len;

	}



	strlcpy(wiphy->fw_version, hw_info->fw_version,

		sizeof(wiphy->fw_version));

	wiphy->hw_version = hw_info->hw_version;

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

+1 −2
Original line number Diff line number Diff line
@@ -1356,8 +1356,7 @@ static int qtnf_parse_variable_mac_info(struct qtnf_wmac *mac, 
		ext_capa_mask = NULL;

	}



	kfree(mac->macinfo.extended_capabilities);

	kfree(mac->macinfo.extended_capabilities_mask);

	qtnf_mac_ext_caps_free(mac);

	mac->macinfo.extended_capabilities = ext_capa;

	mac->macinfo.extended_capabilities_mask = ext_capa_mask;

	mac->macinfo.extended_capabilities_len = ext_capa_len;

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

+14 −2
Original line number Diff line number Diff line
@@ -304,6 +304,19 @@ void qtnf_mac_iface_comb_free(struct qtnf_wmac *mac) 
	}

}



void qtnf_mac_ext_caps_free(struct qtnf_wmac *mac)

{

	if (mac->macinfo.extended_capabilities_len) {

		kfree(mac->macinfo.extended_capabilities);

		mac->macinfo.extended_capabilities = NULL;



		kfree(mac->macinfo.extended_capabilities_mask);

		mac->macinfo.extended_capabilities_mask = NULL;



		mac->macinfo.extended_capabilities_len = 0;

	}

}



static void qtnf_vif_reset_handler(struct work_struct *work)

{

	struct qtnf_vif *vif = container_of(work, struct qtnf_vif, reset_work);
@@ -493,8 +506,7 @@ static void qtnf_core_mac_detach(struct qtnf_bus *bus, unsigned int macid) 
	}



	qtnf_mac_iface_comb_free(mac);

	kfree(mac->macinfo.extended_capabilities);

	kfree(mac->macinfo.extended_capabilities_mask);

	qtnf_mac_ext_caps_free(mac);

	kfree(mac->macinfo.wowlan);

	wiphy_free(wiphy);

	bus->mac[macid] = NULL;

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

+1 −0
Original line number Diff line number Diff line
@@ -151,6 +151,7 @@ struct qtnf_hw_info { 
struct qtnf_vif *qtnf_mac_get_free_vif(struct qtnf_wmac *mac);

struct qtnf_vif *qtnf_mac_get_base_vif(struct qtnf_wmac *mac);

void qtnf_mac_iface_comb_free(struct qtnf_wmac *mac);

void qtnf_mac_ext_caps_free(struct qtnf_wmac *mac);

struct wiphy *qtnf_wiphy_allocate(struct qtnf_bus *bus);

int qtnf_core_net_attach(struct qtnf_wmac *mac, struct qtnf_vif *priv,

			 const char *name, unsigned char name_assign_type);