Commit c378f247 authored by Stanislaw Gruszka's avatar Stanislaw Gruszka Committed by Kalle Valo
Browse files

mt76: unify mac_get_key_info 



Merge mt76x{0,2} mac_get_key_info into new mt76x02_mac.c file.

Signed-off-by: default avatarStanislaw Gruszka <sgruszka@redhat.com>
Signed-off-by: default avatarKalle Valo <kvalo@codeaurora.org>
parent 108a4861

drivers/net/wireless/mediatek/mt76/Makefile

+1 −1
Original line number Diff line number Diff line
@@ -14,7 +14,7 @@ mt76-usb-y := usb.o usb_trace.o usb_mcu.o 
CFLAGS_trace.o := -I$(src)

CFLAGS_usb_trace.o := -I$(src)



mt76x02-lib-y := mt76x02_util.o

mt76x02-lib-y := mt76x02_util.o mt76x02_mac.o



mt76x2-common-y := \

	mt76x2_eeprom.o mt76x2_tx_common.o mt76x2_mac_common.o \

drivers/net/wireless/mediatek/mt76/mt76x0/mac.c

+2 −28
Original line number Diff line number Diff line
@@ -566,32 +566,6 @@ u32 mt76x0_mac_process_rx(struct mt76x0_dev *dev, struct sk_buff *skb, 
	return len;

}



static enum mt76x02_cipher_type

mt76_mac_get_key_info(struct ieee80211_key_conf *key, u8 *key_data)

{

	memset(key_data, 0, 32);

	if (!key)

		return MT_CIPHER_NONE;



	if (key->keylen > 32)

		return MT_CIPHER_NONE;



	memcpy(key_data, key->key, key->keylen);



	switch (key->cipher) {

	case WLAN_CIPHER_SUITE_WEP40:

		return MT_CIPHER_WEP40;

	case WLAN_CIPHER_SUITE_WEP104:

		return MT_CIPHER_WEP104;

	case WLAN_CIPHER_SUITE_TKIP:

		return MT_CIPHER_TKIP;

	case WLAN_CIPHER_SUITE_CCMP:

		return MT_CIPHER_AES_CCMP;

	default:

		return MT_CIPHER_NONE;

	}

}



int mt76x0_mac_wcid_set_key(struct mt76x0_dev *dev, u8 idx,

			  struct ieee80211_key_conf *key)

{
@@ -600,7 +574,7 @@ int mt76x0_mac_wcid_set_key(struct mt76x0_dev *dev, u8 idx, 
	u8 iv_data[8];

	u32 val;



	cipher = mt76_mac_get_key_info(key, key_data);

	cipher = mt76x02_mac_get_key_info(key, key_data);

	if (cipher == MT_CIPHER_NONE && key)

		return -EINVAL;
@@ -640,7 +614,7 @@ int mt76x0_mac_shared_key_setup(struct mt76x0_dev *dev, u8 vif_idx, u8 key_idx, 
	u8 key_data[32];

	u32 val;



	cipher = mt76_mac_get_key_info(key, key_data);

	cipher = mt76x02_mac_get_key_info(key, key_data);

	if (cipher == MT_CIPHER_NONE && key)

		return -EINVAL;

drivers/net/wireless/mediatek/mt76/mt76x02_mac.c

0 → 100644
+46 −0
Original line number Diff line number Diff line 
/*

 * Copyright (C) 2016 Felix Fietkau <nbd@nbd.name>

 * Copyright (C) 2018 Stanislaw Gruszka <stf_xl@wp.pl>

 *

 * Permission to use, copy, modify, and/or distribute this software for any

 * purpose with or without fee is hereby granted, provided that the above

 * copyright notice and this permission notice appear in all copies.

 *

 * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES

 * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF

 * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR

 * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES

 * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN

 * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF

 * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.

 */



#include "mt76.h"

#include "mt76x02_regs.h"



enum mt76x02_cipher_type

mt76x02_mac_get_key_info(struct ieee80211_key_conf *key, u8 *key_data)

{

	memset(key_data, 0, 32);

	if (!key)

		return MT_CIPHER_NONE;



	if (key->keylen > 32)

		return MT_CIPHER_NONE;



	memcpy(key_data, key->key, key->keylen);



	switch (key->cipher) {

	case WLAN_CIPHER_SUITE_WEP40:

		return MT_CIPHER_WEP40;

	case WLAN_CIPHER_SUITE_WEP104:

		return MT_CIPHER_WEP104;

	case WLAN_CIPHER_SUITE_TKIP:

		return MT_CIPHER_TKIP;

	case WLAN_CIPHER_SUITE_CCMP:

		return MT_CIPHER_AES_CCMP;

	default:

		return MT_CIPHER_NONE;

	}

}

EXPORT_SYMBOL_GPL(mt76x02_mac_get_key_info);

drivers/net/wireless/mediatek/mt76/mt76x02_mac.h

+3 −0
Original line number Diff line number Diff line
@@ -39,4 +39,7 @@ static inline bool mt76x02_wait_for_mac(struct mt76_dev *dev) 
	return false;

}



enum mt76x02_cipher_type

mt76x02_mac_get_key_info(struct ieee80211_key_conf *key, u8 *key_data);



#endif

drivers/net/wireless/mediatek/mt76/mt76x2_mac_common.c

+2 −28
Original line number Diff line number Diff line
@@ -229,32 +229,6 @@ void mt76x2_send_tx_status(struct mt76x2_dev *dev, 
}

EXPORT_SYMBOL_GPL(mt76x2_send_tx_status);



static enum mt76x02_cipher_type

mt76x2_mac_get_key_info(struct ieee80211_key_conf *key, u8 *key_data)

{

	memset(key_data, 0, 32);

	if (!key)

		return MT_CIPHER_NONE;



	if (key->keylen > 32)

		return MT_CIPHER_NONE;



	memcpy(key_data, key->key, key->keylen);



	switch (key->cipher) {

	case WLAN_CIPHER_SUITE_WEP40:

		return MT_CIPHER_WEP40;

	case WLAN_CIPHER_SUITE_WEP104:

		return MT_CIPHER_WEP104;

	case WLAN_CIPHER_SUITE_TKIP:

		return MT_CIPHER_TKIP;

	case WLAN_CIPHER_SUITE_CCMP:

		return MT_CIPHER_AES_CCMP;

	default:

		return MT_CIPHER_NONE;

	}

}



int mt76x2_mac_shared_key_setup(struct mt76x2_dev *dev, u8 vif_idx, u8 key_idx,

				struct ieee80211_key_conf *key)

{
@@ -262,7 +236,7 @@ int mt76x2_mac_shared_key_setup(struct mt76x2_dev *dev, u8 vif_idx, u8 key_idx, 
	u8 key_data[32];

	u32 val;



	cipher = mt76x2_mac_get_key_info(key, key_data);

	cipher = mt76x02_mac_get_key_info(key, key_data);

	if (cipher == MT_CIPHER_NONE && key)

		return -EOPNOTSUPP;
@@ -285,7 +259,7 @@ int mt76x2_mac_wcid_set_key(struct mt76x2_dev *dev, u8 idx, 
	u8 key_data[32];

	u8 iv_data[8];



	cipher = mt76x2_mac_get_key_info(key, key_data);

	cipher = mt76x02_mac_get_key_info(key, key_data);

	if (cipher == MT_CIPHER_NONE && key)

		return -EOPNOTSUPP;