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

Commit ae30bdaa authored by Ganapathi Bhat's avatar Ganapathi Bhat Committed by Kalle Valo
Browse files

mwifiex: skip sending GT_REKEY_OFFLOAD_CFG if firmware has no support 



If firmware does not support embedded supplicant, then it in turn
will not support GT rekey offloading. If this is the case, then
driver must not advertise WOWLAN flags related to GTK rekey and
it must also skip sending the GT_REKEY_OFFLOAD_CFG command.

Signed-off-by: default avatarShrenik Shikhare <shrenik@marvell.com>
Signed-off-by: default avatarCathy Luo <cluo@marvell.com>
Signed-off-by: default avatarGanapathi Bhat <gbhat@marvell.com>
Signed-off-by: default avatarKalle Valo <kvalo@codeaurora.org>
parent b817047a

drivers/net/wireless/marvell/mwifiex/cfg80211.c

+17 −1
Original line number Diff line number Diff line
@@ -3555,6 +3555,9 @@ static int mwifiex_set_rekey_data(struct wiphy *wiphy, struct net_device *dev, 
{

	struct mwifiex_private *priv = mwifiex_netdev_get_priv(dev);



	if (!ISSUPP_FIRMWARE_SUPPLICANT(priv->adapter->fw_cap_info))

		return -EOPNOTSUPP;



	return mwifiex_send_cmd(priv, HostCmd_CMD_GTK_REKEY_OFFLOAD_CFG,

				HostCmd_ACT_GEN_SET, 0, data, true);

}
@@ -4190,6 +4193,16 @@ static const struct wiphy_wowlan_support mwifiex_wowlan_support = { 
	.max_pkt_offset = MWIFIEX_MAX_OFFSET_LEN,

	.max_nd_match_sets = MWIFIEX_MAX_ND_MATCH_SETS,

};



static const struct wiphy_wowlan_support mwifiex_wowlan_support_no_gtk = {

	.flags = WIPHY_WOWLAN_MAGIC_PKT | WIPHY_WOWLAN_DISCONNECT |

		 WIPHY_WOWLAN_NET_DETECT,

	.n_patterns = MWIFIEX_MEF_MAX_FILTERS,

	.pattern_min_len = 1,

	.pattern_max_len = MWIFIEX_MAX_PATTERN_LEN,

	.max_pkt_offset = MWIFIEX_MAX_OFFSET_LEN,

	.max_nd_match_sets = MWIFIEX_MAX_ND_MATCH_SETS,

};

#endif



static bool mwifiex_is_valid_alpha2(const char *alpha2)
@@ -4308,7 +4321,10 @@ int mwifiex_register_cfg80211(struct mwifiex_adapter *adapter) 
				WIPHY_FLAG_TDLS_EXTERNAL_SETUP;



#ifdef CONFIG_PM

	if (ISSUPP_FIRMWARE_SUPPLICANT(priv->adapter->fw_cap_info))

		wiphy->wowlan = &mwifiex_wowlan_support;

	else

		wiphy->wowlan = &mwifiex_wowlan_support_no_gtk;

#endif



	wiphy->coalesce = &mwifiex_coalesce_support;

drivers/net/wireless/marvell/mwifiex/fw.h

+1 −0
Original line number Diff line number Diff line
@@ -249,6 +249,7 @@ enum MWIFIEX_802_11_PRIVACY_FILTER { 
#define ISSUPP_SDIO_SPA_ENABLED(FwCapInfo) (FwCapInfo & BIT(16))

#define ISSUPP_ADHOC_ENABLED(FwCapInfo) (FwCapInfo & BIT(25))

#define ISSUPP_RANDOM_MAC(FwCapInfo) (FwCapInfo & BIT(27))

#define ISSUPP_FIRMWARE_SUPPLICANT(FwCapInfo) (FwCapInfo & BIT(21))



#define MWIFIEX_DEF_HT_CAP	(IEEE80211_HT_CAP_DSSSCCK40 | \

				 (1 << IEEE80211_HT_CAP_RX_STBC_SHIFT) | \

drivers/net/wireless/marvell/mwifiex/sta_event.c

+3 −0
Original line number Diff line number Diff line
@@ -241,6 +241,9 @@ void mwifiex_reset_connect_state(struct mwifiex_private *priv, u16 reason_code, 
	if (netif_carrier_ok(priv->netdev))

		netif_carrier_off(priv->netdev);



	if (!ISSUPP_FIRMWARE_SUPPLICANT(priv->adapter->fw_cap_info))

		return;



	mwifiex_send_cmd(priv, HostCmd_CMD_GTK_REKEY_OFFLOAD_CFG,

			 HostCmd_ACT_GEN_REMOVE, 0, NULL, false);

}