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

Commit fddc7dd7 authored by Juuso Oikarinen's avatar Juuso Oikarinen Committed by John W. Linville
Browse files

wl1271: Fix key-remove error 



The new firmware does not allow removal of unicast keys - they will be
automatically removed on the next CMD_JOIN.

Signed-off-by: default avatarJuuso Oikarinen <juuso.oikarinen@nokia.com>
Reviewed-by: default avatarKalle Valo <kalle.valo@nokia.com>
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent 6c71b0ea

drivers/net/wireless/wl12xx/wl1271_main.c

+7 −0
Original line number Diff line number Diff line
@@ -1478,6 +1478,13 @@ static int wl1271_op_set_key(struct ieee80211_hw *hw, enum set_key_cmd cmd, 
		break;



	case DISABLE_KEY:

		/* The wl1271 does not allow to remove unicast keys - they

		   will be cleared automatically on next CMD_JOIN. Ignore the

		   request silently, as we dont want the mac80211 to emit

		   an error message. */

		if (!is_broadcast_ether_addr(addr))

			break;



		ret = wl1271_cmd_set_key(wl, KEY_REMOVE,

					 key_conf->keyidx, key_type,

					 key_conf->keylen, key_conf->key,