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

mt76: unify mac_wcid_set_key 



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

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

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

+3 −0
Original line number Diff line number Diff line
@@ -423,6 +423,9 @@ struct mt76_rx_status { 
#define mt76_rmw_field(_dev, _reg, _field, _val)	\

	mt76_rmw(_dev, _reg, _field, FIELD_PREP(_field, _val))



#define __mt76_rmw_field(_dev, _reg, _field, _val)	\

	__mt76_rmw(_dev, _reg, _field, FIELD_PREP(_field, _val))



#define mt76_hw(dev) (dev)->mt76.hw



bool __mt76_poll(struct mt76_dev *dev, u32 offset, u32 mask, u32 val,

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

+0 −41
Original line number Diff line number Diff line
@@ -565,44 +565,3 @@ u32 mt76x0_mac_process_rx(struct mt76x0_dev *dev, struct sk_buff *skb, 


	return len;

}
 


int mt76x0_mac_wcid_set_key(struct mt76x0_dev *dev, u8 idx,

			  struct ieee80211_key_conf *key)

{

	enum mt76x02_cipher_type cipher;

	u8 key_data[32];

	u8 iv_data[8];

	u32 val;



	cipher = mt76x02_mac_get_key_info(key, key_data);

	if (cipher == MT_CIPHER_NONE && key)

		return -EINVAL;



	trace_mt76x0_set_key(&dev->mt76, idx);



	mt76_wr_copy(dev, MT_WCID_KEY(idx), key_data, sizeof(key_data));



	memset(iv_data, 0, sizeof(iv_data));

	if (key) {

		iv_data[3] = key->keyidx << 6;

		if (cipher >= MT_CIPHER_TKIP) {

			/* Note: start with 1 to comply with spec,

			 *	 (see comment on common/cmm_wpa.c:4291).

			 */

			iv_data[0] |= 1;

			iv_data[3] |= 0x20;

		}

	}

	mt76_wr_copy(dev, MT_WCID_IV(idx), iv_data, sizeof(iv_data));



	val = mt76_rr(dev, MT_WCID_ATTR(idx));

	val &= ~MT_WCID_ATTR_PKEY_MODE & ~MT_WCID_ATTR_PKEY_MODE_EXT;

	val |= FIELD_PREP(MT_WCID_ATTR_PKEY_MODE, cipher & 7) |

	       FIELD_PREP(MT_WCID_ATTR_PKEY_MODE_EXT, cipher >> 3);

	val &= ~MT_WCID_ATTR_PAIRWISE;

	val |= MT_WCID_ATTR_PAIRWISE *

		!!(key && key->flags & IEEE80211_KEY_FLAG_PAIRWISE);

	mt76_wr(dev, MT_WCID_ATTR(idx), val);



	return 0;

}

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

+0 −2
Original line number Diff line number Diff line
@@ -138,8 +138,6 @@ struct mt76_txwi { 


u32 mt76x0_mac_process_rx(struct mt76x0_dev *dev, struct sk_buff *skb,

			u8 *data, void *rxi);

int mt76x0_mac_wcid_set_key(struct mt76x0_dev *dev, u8 idx,

			  struct ieee80211_key_conf *key);

void mt76x0_mac_wcid_set_rate(struct mt76x0_dev *dev, struct mt76_wcid *wcid,

			    const struct ieee80211_tx_rate *rate);

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

+2 −2
Original line number Diff line number Diff line
@@ -259,7 +259,7 @@ mt76x0_set_key(struct ieee80211_hw *hw, enum set_key_cmd cmd, 


	if (!msta) {

		if (key || wcid->hw_key_idx == idx) {

			ret = mt76x0_mac_wcid_set_key(dev, wcid->idx, key);

			ret = mt76x02_mac_wcid_set_key(&dev->mt76, wcid->idx, key);

			if (ret)

				return ret;

		}
@@ -267,7 +267,7 @@ mt76x0_set_key(struct ieee80211_hw *hw, enum set_key_cmd cmd, 
		return mt76x02_mac_shared_key_setup(&dev->mt76, mvif->idx, idx, key);

	}



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

	return mt76x02_mac_wcid_set_key(&dev->mt76, msta->wcid.idx, key);

}



static int mt76x0_set_rts_threshold(struct ieee80211_hw *hw, u32 value)

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

+29 −0
Original line number Diff line number Diff line
@@ -67,3 +67,32 @@ int mt76x02_mac_shared_key_setup(struct mt76_dev *dev, u8 vif_idx, u8 key_idx, 
	return 0;

}

EXPORT_SYMBOL_GPL(mt76x02_mac_shared_key_setup);



int mt76x02_mac_wcid_set_key(struct mt76_dev *dev, u8 idx,

			    struct ieee80211_key_conf *key)

{

	enum mt76x02_cipher_type cipher;

	u8 key_data[32];

	u8 iv_data[8];



	cipher = mt76x02_mac_get_key_info(key, key_data);

	if (cipher == MT_CIPHER_NONE && key)

		return -EOPNOTSUPP;



	__mt76_wr_copy(dev, MT_WCID_KEY(idx), key_data, sizeof(key_data));

	__mt76_rmw_field(dev, MT_WCID_ATTR(idx), MT_WCID_ATTR_PKEY_MODE, cipher);



	memset(iv_data, 0, sizeof(iv_data));

	if (key) {

		__mt76_rmw_field(dev, MT_WCID_ATTR(idx), MT_WCID_ATTR_PAIRWISE,

				 !!(key->flags & IEEE80211_KEY_FLAG_PAIRWISE));

		iv_data[3] = key->keyidx << 6;

		if (cipher >= MT_CIPHER_TKIP)

			iv_data[3] |= 0x20;

	}



	__mt76_wr_copy(dev, MT_WCID_IV(idx), iv_data, sizeof(iv_data));



	return 0;

}

EXPORT_SYMBOL_GPL(mt76x02_mac_wcid_set_key);

CRA Git | Maintained and supported by SUSTech CRA and CCSE