Commit 88900631 authored by Malcolm Priestley's avatar Malcolm Priestley Committed by Greg Kroah-Hartman
Browse files

staging: vt6656: Fix return for unsupported cipher modes. 



mac80211 expect to see -EOPNOTSUPP on unsupported ciphers so
these can be done on stack.

correct all the returns to do this.

Signed-off-by: default avatarMalcolm Priestley <tvboxspy@gmail.com>
Link: https://lore.kernel.org/r/b65a3b23-735f-f679-0f16-a54c3266b5ae@gmail.com


Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent be9bca8c

drivers/staging/vt6656/key.c

+4 −1
Original line number Diff line number Diff line
@@ -144,11 +144,14 @@ int vnt_set_keys(struct ieee80211_hw *hw, struct ieee80211_sta *sta, 
		break;

	case WLAN_CIPHER_SUITE_CCMP:

		if (priv->local_id <= MAC_REVISION_A1)

			return -EINVAL;

			return -EOPNOTSUPP;



		key_dec_mode = KEY_CTL_CCMP;



		key->flags |= IEEE80211_KEY_FLAG_GENERATE_IV;

		break;

	default:

		return -EOPNOTSUPP;

	}



	if (key->flags & IEEE80211_KEY_FLAG_PAIRWISE) {

drivers/staging/vt6656/main_usb.c

+1 −3
Original line number Diff line number Diff line
@@ -858,9 +858,7 @@ static int vnt_set_key(struct ieee80211_hw *hw, enum set_key_cmd cmd, 


	switch (cmd) {

	case SET_KEY:

		if (vnt_set_keys(hw, sta, vif, key))

			return -EOPNOTSUPP;

		break;

		return vnt_set_keys(hw, sta, vif, key);

	case DISABLE_KEY:

		if (test_bit(key->hw_key_idx, &priv->key_entry_inuse))

			clear_bit(key->hw_key_idx, &priv->key_entry_inuse);

CRA Git | Maintained and supported by SUSTech CRA and CCSE