Commit 22c575c4 authored by Stanislaw Gruszka's avatar Stanislaw Gruszka Committed by Felix Fietkau
Browse files

mt76: unify ampdu_action 



Use mt76x2_ampdu_action as common function, mt76x0 ampdu_action was
diffrent, but mt76x2 version should work for this driver as well.

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

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

+3 −0
Original line number Diff line number Diff line
@@ -427,6 +427,9 @@ struct mt76_rx_status { 
#define __mt76_rmw(dev, ...)	(dev)->bus->rmw((dev), __VA_ARGS__)

#define __mt76_wr_copy(dev, ...)	(dev)->bus->copy((dev), __VA_ARGS__)



#define __mt76_set(dev, offset, val)	__mt76_rmw(dev, offset, 0, val)

#define __mt76_clear(dev, offset, val)	__mt76_rmw(dev, offset, val, 0)



#define mt76_rr(dev, ...)	(dev)->mt76.bus->rr(&((dev)->mt76), __VA_ARGS__)

#define mt76_wr(dev, ...)	(dev)->mt76.bus->wr(&((dev)->mt76), __VA_ARGS__)

#define mt76_rmw(dev, ...)	(dev)->mt76.bus->rmw(&((dev)->mt76), __VA_ARGS__)

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

+1 −44
Original line number Diff line number Diff line
@@ -225,49 +225,6 @@ static int mt76x0_set_rts_threshold(struct ieee80211_hw *hw, u32 value) 
	return 0;

}



static int

mt76_ampdu_action(struct ieee80211_hw *hw, struct ieee80211_vif *vif,

		  struct ieee80211_ampdu_params *params)

{

	struct mt76x0_dev *dev = hw->priv;

	struct ieee80211_sta *sta = params->sta;

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

	enum ieee80211_ampdu_mlme_action action = params->action;

	struct ieee80211_txq *txq = sta->txq[params->tid];

	u16 tid = params->tid;

	u16 *ssn = &params->ssn;

	struct mt76_txq *mtxq;



	if (!txq)

		return -EINVAL;



	mtxq = (struct mt76_txq *)txq->drv_priv;



	switch (action) {

	case IEEE80211_AMPDU_RX_START:

		mt76_set(dev, MT_WCID_ADDR(msta->wcid.idx) + 4, BIT(16 + tid));

		break;

	case IEEE80211_AMPDU_RX_STOP:

		mt76_clear(dev, MT_WCID_ADDR(msta->wcid.idx) + 4, BIT(16 + tid));

		break;

	case IEEE80211_AMPDU_TX_OPERATIONAL:

		ieee80211_send_bar(vif, sta->addr, tid, mtxq->agg_ssn);

		break;

	case IEEE80211_AMPDU_TX_STOP_FLUSH:

	case IEEE80211_AMPDU_TX_STOP_FLUSH_CONT:

		break;

	case IEEE80211_AMPDU_TX_START:

		mtxq->agg_ssn = *ssn << 4;

		ieee80211_start_tx_ba_cb_irqsafe(vif, sta->addr, tid);

		break;

	case IEEE80211_AMPDU_TX_STOP_CONT:

		ieee80211_stop_tx_ba_cb_irqsafe(vif, sta->addr, tid);

		break;

	}



	return 0;

}



static void

mt76_sta_rate_tbl_update(struct ieee80211_hw *hw, struct ieee80211_vif *vif,

			 struct ieee80211_sta *sta)
@@ -307,7 +264,7 @@ const struct ieee80211_ops mt76x0_ops = { 
	.conf_tx = mt76x0_conf_tx,

	.sw_scan_start = mt76x0_sw_scan,

	.sw_scan_complete = mt76x0_sw_scan_complete,

	.ampdu_action = mt76_ampdu_action,

	.ampdu_action = mt76x02_ampdu_action,

	.sta_rate_tbl_update = mt76_sta_rate_tbl_update,

	.set_rts_threshold = mt76x0_set_rts_threshold,

};

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

+50 −0
Original line number Diff line number Diff line
@@ -127,4 +127,54 @@ void mt76x02_vif_init(struct mt76_dev *dev, struct ieee80211_vif *vif, 
}

EXPORT_SYMBOL_GPL(mt76x02_vif_init);



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

			struct ieee80211_ampdu_params *params)

{

	enum ieee80211_ampdu_mlme_action action = params->action;

	struct ieee80211_sta *sta = params->sta;

	struct mt76_dev *dev = hw->priv;

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

	struct ieee80211_txq *txq = sta->txq[params->tid];

	u16 tid = params->tid;

	u16 *ssn = &params->ssn;

	struct mt76_txq *mtxq;



	if (!txq)

		return -EINVAL;



	mtxq = (struct mt76_txq *)txq->drv_priv;



	switch (action) {

	case IEEE80211_AMPDU_RX_START:

		mt76_rx_aggr_start(dev, &msta->wcid, tid, *ssn, params->buf_size);

		__mt76_set(dev, MT_WCID_ADDR(msta->wcid.idx) + 4, BIT(16 + tid));

		break;

	case IEEE80211_AMPDU_RX_STOP:

		mt76_rx_aggr_stop(dev, &msta->wcid, tid);

		__mt76_clear(dev, MT_WCID_ADDR(msta->wcid.idx) + 4, BIT(16 + tid));

		break;

	case IEEE80211_AMPDU_TX_OPERATIONAL:

		mtxq->aggr = true;

		mtxq->send_bar = false;

		ieee80211_send_bar(vif, sta->addr, tid, mtxq->agg_ssn);

		break;

	case IEEE80211_AMPDU_TX_STOP_FLUSH:

	case IEEE80211_AMPDU_TX_STOP_FLUSH_CONT:

		mtxq->aggr = false;

		ieee80211_send_bar(vif, sta->addr, tid, mtxq->agg_ssn);

		break;

	case IEEE80211_AMPDU_TX_START:

		mtxq->agg_ssn = *ssn << 4;

		ieee80211_start_tx_ba_cb_irqsafe(vif, sta->addr, tid);

		break;

	case IEEE80211_AMPDU_TX_STOP_CONT:

		mtxq->aggr = false;

		ieee80211_stop_tx_ba_cb_irqsafe(vif, sta->addr, tid);

		break;

	}



	return 0;

}

EXPORT_SYMBOL_GPL(mt76x02_ampdu_action);



MODULE_LICENSE("Dual BSD/GPL");

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

+3 −0
Original line number Diff line number Diff line
@@ -28,4 +28,7 @@ int mt76x02_sta_remove(struct ieee80211_hw *hw, struct ieee80211_vif *vif, 


void mt76x02_vif_init(struct mt76_dev *dev, struct ieee80211_vif *vif,

		     unsigned int idx);



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

			struct ieee80211_ampdu_params *params);

#endif

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

+0 −2
Original line number Diff line number Diff line
@@ -250,8 +250,6 @@ void mt76x2_init_txpower(struct mt76x2_dev *dev, 
			 struct ieee80211_supported_band *sband);

void mt76_write_mac_initvals(struct mt76x2_dev *dev);



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

			struct ieee80211_ampdu_params *params);

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

		   struct ieee80211_sta *sta);

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