Commit e28487ea authored by Felix Fietkau's avatar Felix Fietkau
Browse files

mt76: replace sta_add/remove ops with common sta_state function 



Allows adding unassociated stations from mac80211

Signed-off-by: default avatarFelix Fietkau <nbd@nbd.name>
Signed-off-by: default avatarLorenzo Bianconi <lorenzo.bianconi@redhat.com>
parent 54f1bf8a

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

+61 −3
Original line number Diff line number Diff line
@@ -631,7 +631,42 @@ void mt76_rx_poll_complete(struct mt76_dev *dev, enum mt76_rxq_id q, 
}

EXPORT_SYMBOL_GPL(mt76_rx_poll_complete);



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

static int

mt76_sta_add(struct mt76_dev *dev, struct ieee80211_vif *vif,

	     struct ieee80211_sta *sta)

{

	struct mt76_wcid *wcid = (struct mt76_wcid *)sta->drv_priv;

	int ret;

	int i;



	mutex_lock(&dev->mutex);



	ret = dev->drv->sta_add(dev, vif, sta);

	if (ret)

		goto out;



	for (i = 0; i < ARRAY_SIZE(sta->txq); i++) {

		struct mt76_txq *mtxq;



		if (!sta->txq[i])

			continue;



		mtxq = (struct mt76_txq *)sta->txq[i]->drv_priv;

		mtxq->wcid = wcid;



		mt76_txq_init(dev, sta->txq[i]);

	}



	rcu_assign_pointer(dev->wcid[wcid->idx], wcid);



out:

	mutex_unlock(&dev->mutex);



	return ret;

}



static void

mt76_sta_remove(struct mt76_dev *dev, struct ieee80211_vif *vif,

	        struct ieee80211_sta *sta)

{

	struct mt76_wcid *wcid = (struct mt76_wcid *)sta->drv_priv;
@@ -642,10 +677,33 @@ void mt76_sta_remove(struct mt76_dev *dev, struct ieee80211_vif *vif, 
	synchronize_rcu();



	mutex_lock(&dev->mutex);



	if (dev->drv->sta_remove)

		dev->drv->sta_remove(dev, vif, sta);



	mt76_tx_status_check(dev, wcid, true);

	for (i = 0; i < ARRAY_SIZE(sta->txq); i++)

		mt76_txq_remove(dev, sta->txq[i]);

	mt76_wcid_free(dev->wcid_mask, idx);



	mutex_unlock(&dev->mutex);

}

EXPORT_SYMBOL_GPL(mt76_sta_remove);
 


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

		   struct ieee80211_sta *sta,

		   enum ieee80211_sta_state old_state,

		   enum ieee80211_sta_state new_state)

{

	struct mt76_dev *dev = hw->priv;



	if (old_state == IEEE80211_STA_NOTEXIST &&

	    new_state == IEEE80211_STA_NONE)

		return mt76_sta_add(dev, vif, sta);



	if (old_state == IEEE80211_STA_NONE &&

		 new_state == IEEE80211_STA_NOTEXIST)

		mt76_sta_remove(dev, vif, sta);



	return 0;

}

EXPORT_SYMBOL_GPL(mt76_sta_state);

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

+10 −2
Original line number Diff line number Diff line
@@ -288,6 +288,12 @@ struct mt76_driver_ops { 


	void (*sta_ps)(struct mt76_dev *dev, struct ieee80211_sta *sta,

		       bool ps);



	int (*sta_add)(struct mt76_dev *dev, struct ieee80211_vif *vif,

		       struct ieee80211_sta *sta);



	void (*sta_remove)(struct mt76_dev *dev, struct ieee80211_vif *vif,

			   struct ieee80211_sta *sta);

};



struct mt76_channel_state {
@@ -664,8 +670,10 @@ void mt76_tx_status_skb_done(struct mt76_dev *dev, struct sk_buff *skb, 
void mt76_tx_complete_skb(struct mt76_dev *dev, struct sk_buff *skb);

void mt76_tx_status_check(struct mt76_dev *dev, struct mt76_wcid *wcid,

			  bool flush);

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

		     struct ieee80211_sta *sta);

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

		   struct ieee80211_sta *sta,

		   enum ieee80211_sta_state old_state,

		   enum ieee80211_sta_state new_state);



struct ieee80211_sta *mt76_rx_convert(struct sk_buff *skb);

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

+3 −2
Original line number Diff line number Diff line
@@ -90,8 +90,7 @@ static const struct ieee80211_ops mt76x0e_ops = { 
	.config = mt76x0_config,

	.configure_filter = mt76x02_configure_filter,

	.bss_info_changed = mt76x02_bss_info_changed,

	.sta_add = mt76x02_sta_add,

	.sta_remove = mt76x02_sta_remove,

	.sta_state = mt76_sta_state,

	.set_key = mt76x02_set_key,

	.conf_tx = mt76x02_conf_tx,

	.sw_scan_start = mt76x02_sw_scan,
@@ -162,6 +161,8 @@ mt76x0e_probe(struct pci_dev *pdev, const struct pci_device_id *id) 
		.rx_skb = mt76x02_queue_rx_skb,

		.rx_poll_complete = mt76x02_rx_poll_complete,

		.sta_ps = mt76x02_sta_ps,

		.sta_add = mt76x02_sta_add,

		.sta_remove = mt76x02_sta_remove,

	};

	struct mt76x02_dev *dev;

	int ret;

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

+3 −2
Original line number Diff line number Diff line
@@ -146,8 +146,7 @@ static const struct ieee80211_ops mt76x0u_ops = { 
	.config = mt76x0_config,

	.configure_filter = mt76x02_configure_filter,

	.bss_info_changed = mt76x02_bss_info_changed,

	.sta_add = mt76x02_sta_add,

	.sta_remove = mt76x02_sta_remove,

	.sta_state = mt76_sta_state,

	.set_key = mt76x02_set_key,

	.conf_tx = mt76x02_conf_tx,

	.sw_scan_start = mt76x02_sw_scan,
@@ -219,6 +218,8 @@ static int mt76x0u_probe(struct usb_interface *usb_intf, 
		.tx_complete_skb = mt76x02u_tx_complete_skb,

		.tx_status_data = mt76x02_tx_status_data,

		.rx_skb = mt76x02_queue_rx_skb,

		.sta_add = mt76x02_sta_add,

		.sta_remove = mt76x02_sta_remove,

	};

	struct usb_device *usb_dev = interface_to_usbdev(usb_intf);

	struct mt76x02_dev *dev;

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

+4 −4
Original line number Diff line number Diff line
@@ -110,9 +110,9 @@ void mt76x02_init_device(struct mt76x02_dev *dev); 
void mt76x02_configure_filter(struct ieee80211_hw *hw,

			     unsigned int changed_flags,

			     unsigned int *total_flags, u64 multicast);

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

int mt76x02_sta_add(struct mt76_dev *mdev, struct ieee80211_vif *vif,

		    struct ieee80211_sta *sta);

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

void mt76x02_sta_remove(struct mt76_dev *mdev, struct ieee80211_vif *vif,

			struct ieee80211_sta *sta);



void mt76x02_config_mac_addr_list(struct mt76x02_dev *dev);

CRA Git | Maintained and supported by SUSTech CRA and CCSE