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

Commit 6caffd4f authored by Johannes Berg's avatar Johannes Berg
Browse files

iwlwifi: mvm: suppress key error messages in AP mode 



In AP mode, don't attempt to program GTKs into the
device, they're used for TX only so not needed and
programming them causes error messages. Also, in
this case and if key programming fails, avoid trying
to remove the key that isn't present later.

Reviewed-by: default avatarEmmanuel Grumbach <emmanuel.grumbach@intel.com>
Signed-off-by: default avatarJohannes Berg <johannes.berg@intel.com>
parent b9545b48

drivers/net/wireless/iwlwifi/mvm/mac80211.c

+13 −0
Original line number Original line Diff line number Diff line
@@ -1087,6 +1087,13 @@ static int iwl_mvm_mac_set_key(struct ieee80211_hw *hw, 




	switch (cmd) {

	switch (cmd) {

	case SET_KEY:

	case SET_KEY:

		if (vif->type == NL80211_IFTYPE_AP && !sta) {

			/* GTK on AP interface is a TX-only key, return 0 */

			ret = 0;

			key->hw_key_idx = STA_KEY_IDX_INVALID;

			break;

		}



		IWL_DEBUG_MAC80211(mvm, "set hwcrypto key\n");

		IWL_DEBUG_MAC80211(mvm, "set hwcrypto key\n");

		ret = iwl_mvm_set_sta_key(mvm, vif, sta, key, false);

		ret = iwl_mvm_set_sta_key(mvm, vif, sta, key, false);

		if (ret) {

		if (ret) {
@@ -1095,11 +1102,17 @@ static int iwl_mvm_mac_set_key(struct ieee80211_hw *hw, 
			 * can't add key for RX, but we don't need it

			 * can't add key for RX, but we don't need it

			 * in the device for TX so still return 0

			 * in the device for TX so still return 0

			 */

			 */

			key->hw_key_idx = STA_KEY_IDX_INVALID;

			ret = 0;

			ret = 0;

		}

		}





		break;

		break;

	case DISABLE_KEY:

	case DISABLE_KEY:

		if (key->hw_key_idx == STA_KEY_IDX_INVALID) {

			ret = 0;

			break;

		}



		IWL_DEBUG_MAC80211(mvm, "disable hwcrypto key\n");

		IWL_DEBUG_MAC80211(mvm, "disable hwcrypto key\n");

		ret = iwl_mvm_remove_sta_key(mvm, vif, sta, key);

		ret = iwl_mvm_remove_sta_key(mvm, vif, sta, key);

		break;

		break;