Commit 60c26859 authored by Stanislaw Gruszka's avatar Stanislaw Gruszka Committed by Felix Fietkau
Browse files

mt76: unify set_key 



Merge mt76x0 and mt76x2 set_key mac80211 callback.

Signed-off-by: default avatarStanislaw Gruszka <sgruszka@redhat.com>
Signed-off-by: default avatarFelix Fietkau <nbd@nbd.name>
parent 22c575c4

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

+1 −36
Original line number Diff line number Diff line
@@ -181,41 +181,6 @@ mt76x0_sw_scan_complete(struct ieee80211_hw *hw, 
				     MT_CALIBRATE_INTERVAL);

}



static int

mt76x0_set_key(struct ieee80211_hw *hw, enum set_key_cmd cmd,

		struct ieee80211_vif *vif, struct ieee80211_sta *sta,

		struct ieee80211_key_conf *key)

{

	struct mt76x0_dev *dev = hw->priv;

	struct mt76x02_vif *mvif = (struct mt76x02_vif *) vif->drv_priv;

	struct mt76x02_sta *msta = sta ? (struct mt76x02_sta *) sta->drv_priv : NULL;

	struct mt76_wcid *wcid = msta ? &msta->wcid : &mvif->group_wcid;

	int idx = key->keyidx;

	int ret;



	if (cmd == SET_KEY) {

		key->hw_key_idx = wcid->idx;

		wcid->hw_key_idx = idx;

	} else {

		if (idx == wcid->hw_key_idx)

			wcid->hw_key_idx = -1;



		key = NULL;

	}



	if (!msta) {

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

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

			if (ret)

				return ret;

		}



		return mt76x02_mac_shared_key_setup(&dev->mt76, mvif->idx, 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)

{

	struct mt76x0_dev *dev = hw->priv;
@@ -260,7 +225,7 @@ const struct ieee80211_ops mt76x0_ops = { 
	.sta_add = mt76x02_sta_add,

	.sta_remove = mt76x02_sta_remove,

	.sta_notify = mt76x0_sta_notify,

	.set_key = mt76x0_set_key,

	.set_key = mt76x02_set_key,

	.conf_tx = mt76x0_conf_tx,

	.sw_scan_start = mt76x0_sw_scan,

	.sw_scan_complete = mt76x0_sw_scan_complete,

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

+67 −0
Original line number Diff line number Diff line
@@ -177,4 +177,71 @@ int mt76x02_ampdu_action(struct ieee80211_hw *hw, struct ieee80211_vif *vif, 
}

EXPORT_SYMBOL_GPL(mt76x02_ampdu_action);



int mt76x02_set_key(struct ieee80211_hw *hw, enum set_key_cmd cmd,

		   struct ieee80211_vif *vif, struct ieee80211_sta *sta,

		   struct ieee80211_key_conf *key)

{

	struct mt76_dev *dev = hw->priv;

	struct mt76x02_vif *mvif = (struct mt76x02_vif *) vif->drv_priv;

	struct mt76x02_sta *msta;

	struct mt76_wcid *wcid;

	int idx = key->keyidx;

	int ret;



	/* fall back to sw encryption for unsupported ciphers */

	switch (key->cipher) {

	case WLAN_CIPHER_SUITE_WEP40:

	case WLAN_CIPHER_SUITE_WEP104:

	case WLAN_CIPHER_SUITE_TKIP:

	case WLAN_CIPHER_SUITE_CCMP:

		break;

	default:

		return -EOPNOTSUPP;

	}



	/*

	 * The hardware does not support per-STA RX GTK, fall back

	 * to software mode for these.

	 */

	if ((vif->type == NL80211_IFTYPE_ADHOC ||

	     vif->type == NL80211_IFTYPE_MESH_POINT) &&

	    (key->cipher == WLAN_CIPHER_SUITE_TKIP ||

	     key->cipher == WLAN_CIPHER_SUITE_CCMP) &&

	    !(key->flags & IEEE80211_KEY_FLAG_PAIRWISE))

		return -EOPNOTSUPP;



	msta = sta ? (struct mt76x02_sta *) sta->drv_priv : NULL;

	wcid = msta ? &msta->wcid : &mvif->group_wcid;



	if (cmd == SET_KEY) {

		key->hw_key_idx = wcid->idx;

		wcid->hw_key_idx = idx;

		if (key->flags & IEEE80211_KEY_FLAG_RX_MGMT) {

			key->flags |= IEEE80211_KEY_FLAG_SW_MGMT_TX;

			wcid->sw_iv = true;

		}

	} else {

		if (idx == wcid->hw_key_idx) {

			wcid->hw_key_idx = -1;

			wcid->sw_iv = true;

		}



		key = NULL;

	}

	mt76_wcid_key_setup(dev, wcid, key);



	if (!msta) {

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

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

			if (ret)

				return ret;

		}



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

	}



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

}

EXPORT_SYMBOL_GPL(mt76x02_set_key);



MODULE_LICENSE("Dual BSD/GPL");

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

+4 −0
Original line number Diff line number Diff line
@@ -31,4 +31,8 @@ void mt76x02_vif_init(struct mt76_dev *dev, struct ieee80211_vif *vif, 


int mt76x02_ampdu_action(struct ieee80211_hw *hw, struct ieee80211_vif *vif,

			struct ieee80211_ampdu_params *params);



int mt76x02_set_key(struct ieee80211_hw *hw, enum set_key_cmd cmd,

		   struct ieee80211_vif *vif, struct ieee80211_sta *sta,

		   struct ieee80211_key_conf *key);

#endif

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

+0 −3
Original line number Diff line number Diff line
@@ -256,9 +256,6 @@ int mt76x2_sta_remove(struct ieee80211_hw *hw, struct ieee80211_vif *vif, 
		      struct ieee80211_sta *sta);

void mt76x2_remove_interface(struct ieee80211_hw *hw,

			     struct ieee80211_vif *vif);

int mt76x2_set_key(struct ieee80211_hw *hw, enum set_key_cmd cmd,

		   struct ieee80211_vif *vif, struct ieee80211_sta *sta,

		   struct ieee80211_key_conf *key);

int mt76x2_conf_tx(struct ieee80211_hw *hw, struct ieee80211_vif *vif,

		   u16 queue, const struct ieee80211_tx_queue_params *params);

void mt76x2_txq_init(struct mt76x2_dev *dev, struct ieee80211_txq *txq);

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

+0 −67
Original line number Diff line number Diff line
@@ -27,73 +27,6 @@ void mt76x2_remove_interface(struct ieee80211_hw *hw, 
}

EXPORT_SYMBOL_GPL(mt76x2_remove_interface);



int mt76x2_set_key(struct ieee80211_hw *hw, enum set_key_cmd cmd,

		   struct ieee80211_vif *vif, struct ieee80211_sta *sta,

		   struct ieee80211_key_conf *key)

{

	struct mt76x2_dev *dev = hw->priv;

	struct mt76x02_vif *mvif = (struct mt76x02_vif *) vif->drv_priv;

	struct mt76x02_sta *msta;

	struct mt76_wcid *wcid;

	int idx = key->keyidx;

	int ret;



	/* fall back to sw encryption for unsupported ciphers */

	switch (key->cipher) {

	case WLAN_CIPHER_SUITE_WEP40:

	case WLAN_CIPHER_SUITE_WEP104:

	case WLAN_CIPHER_SUITE_TKIP:

	case WLAN_CIPHER_SUITE_CCMP:

		break;

	default:

		return -EOPNOTSUPP;

	}



	/*

	 * The hardware does not support per-STA RX GTK, fall back

	 * to software mode for these.

	 */

	if ((vif->type == NL80211_IFTYPE_ADHOC ||

	     vif->type == NL80211_IFTYPE_MESH_POINT) &&

	    (key->cipher == WLAN_CIPHER_SUITE_TKIP ||

	     key->cipher == WLAN_CIPHER_SUITE_CCMP) &&

	    !(key->flags & IEEE80211_KEY_FLAG_PAIRWISE))

		return -EOPNOTSUPP;



	msta = sta ? (struct mt76x02_sta *) sta->drv_priv : NULL;

	wcid = msta ? &msta->wcid : &mvif->group_wcid;



	if (cmd == SET_KEY) {

		key->hw_key_idx = wcid->idx;

		wcid->hw_key_idx = idx;

		if (key->flags & IEEE80211_KEY_FLAG_RX_MGMT) {

			key->flags |= IEEE80211_KEY_FLAG_SW_MGMT_TX;

			wcid->sw_iv = true;

		}

	} else {

		if (idx == wcid->hw_key_idx) {

			wcid->hw_key_idx = -1;

			wcid->sw_iv = true;

		}



		key = NULL;

	}

	mt76_wcid_key_setup(&dev->mt76, wcid, key);



	if (!msta) {

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

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

			if (ret)

				return ret;

		}



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

	}



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

}

EXPORT_SYMBOL_GPL(mt76x2_set_key);



int mt76x2_conf_tx(struct ieee80211_hw *hw, struct ieee80211_vif *vif,

		   u16 queue, const struct ieee80211_tx_queue_params *params)

{