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

mt76: unify mac_shared_key_setup 



Merge mt76x{0,2} mac_shared_key_setup into common code.

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

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

+0 −24
Original line number Diff line number Diff line
@@ -606,27 +606,3 @@ int mt76x0_mac_wcid_set_key(struct mt76x0_dev *dev, u8 idx, 


	return 0;

}
 


int mt76x0_mac_shared_key_setup(struct mt76x0_dev *dev, u8 vif_idx, u8 key_idx,

			      struct ieee80211_key_conf *key)

{

	enum mt76x02_cipher_type cipher;

	u8 key_data[32];

	u32 val;



	cipher = mt76x02_mac_get_key_info(key, key_data);

	if (cipher == MT_CIPHER_NONE && key)

		return -EINVAL;



	trace_mt76x0_set_shared_key(&dev->mt76, vif_idx, key_idx);



	mt76_wr_copy(dev, MT_SKEY(vif_idx, key_idx),

			key_data, sizeof(key_data));



	val = mt76_rr(dev, MT_SKEY_MODE(vif_idx));

	val &= ~(MT_SKEY_MODE_MASK << MT_SKEY_MODE_SHIFT(vif_idx, key_idx));

	val |= cipher << MT_SKEY_MODE_SHIFT(vif_idx, key_idx);

	mt76_wr(dev, MT_SKEY_MODE(vif_idx), val);



	return 0;

}

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

+0 −2
Original line number Diff line number Diff line
@@ -143,8 +143,6 @@ int mt76x0_mac_wcid_set_key(struct mt76x0_dev *dev, u8 idx, 
void mt76x0_mac_wcid_set_rate(struct mt76x0_dev *dev, struct mt76_wcid *wcid,

			    const struct ieee80211_tx_rate *rate);



int mt76x0_mac_shared_key_setup(struct mt76x0_dev *dev, u8 vif_idx, u8 key_idx,

			      struct ieee80211_key_conf *key);

u16 mt76x0_mac_tx_rate_val(struct mt76x0_dev *dev,

			 const struct ieee80211_tx_rate *rate, u8 *nss_val);

struct mt76_tx_status

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

+1 −1
Original line number Diff line number Diff line
@@ -264,7 +264,7 @@ mt76x0_set_key(struct ieee80211_hw *hw, enum set_key_cmd cmd, 
				return ret;

		}



		return mt76x0_mac_shared_key_setup(dev, mvif->idx, idx, key);

		return mt76x02_mac_shared_key_setup(&dev->mt76, mvif->idx, idx, key);

	}



	return mt76x0_mac_wcid_set_key(dev, msta->wcid.idx, key);

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

+23 −0
Original line number Diff line number Diff line
@@ -44,3 +44,26 @@ mt76x02_mac_get_key_info(struct ieee80211_key_conf *key, u8 *key_data) 
	}

}

EXPORT_SYMBOL_GPL(mt76x02_mac_get_key_info);



int mt76x02_mac_shared_key_setup(struct mt76_dev *dev, u8 vif_idx, u8 key_idx,

				struct ieee80211_key_conf *key)

{

	enum mt76x02_cipher_type cipher;

	u8 key_data[32];

	u32 val;



	cipher = mt76x02_mac_get_key_info(key, key_data);

	if (cipher == MT_CIPHER_NONE && key)

		return -EOPNOTSUPP;



	val = __mt76_rr(dev, MT_SKEY_MODE(vif_idx));

	val &= ~(MT_SKEY_MODE_MASK << MT_SKEY_MODE_SHIFT(vif_idx, key_idx));

	val |= cipher << MT_SKEY_MODE_SHIFT(vif_idx, key_idx);

	__mt76_wr(dev, MT_SKEY_MODE(vif_idx), val);



	__mt76_wr_copy(dev, MT_SKEY(vif_idx, key_idx), key_data,

		       sizeof(key_data));



	return 0;

}

EXPORT_SYMBOL_GPL(mt76x02_mac_shared_key_setup);

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

+2 −0
Original line number Diff line number Diff line
@@ -42,4 +42,6 @@ static inline bool mt76x02_wait_for_mac(struct mt76_dev *dev) 
enum mt76x02_cipher_type

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



int mt76x02_mac_shared_key_setup(struct mt76_dev *dev, u8 vif_idx, u8 key_idx,

				struct ieee80211_key_conf *key);

#endif

CRA Git | Maintained and supported by SUSTech CRA and CCSE