Commit 0cd47bae authored by Stanislaw Gruszka's avatar Stanislaw Gruszka Committed by Felix Fietkau
Browse files

mt76: unify remove_interface 



Use common remove_interface callback in mt76x0 and mt76x2.

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

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

+1 −9
Original line number Diff line number Diff line
@@ -62,14 +62,6 @@ static int mt76x0_add_interface(struct ieee80211_hw *hw, 
	return 0;

}



static void mt76x0_remove_interface(struct ieee80211_hw *hw,

				     struct ieee80211_vif *vif)

{

	struct mt76x0_dev *dev = hw->priv;



	mt76_txq_remove(&dev->mt76, vif->txq);

}



static int mt76x0_config(struct ieee80211_hw *hw, u32 changed)

{

	struct mt76x0_dev *dev = hw->priv;
@@ -203,7 +195,7 @@ const struct ieee80211_ops mt76x0_ops = { 
	.start = mt76x0_start,

	.stop = mt76x0_stop,

	.add_interface = mt76x0_add_interface,

	.remove_interface = mt76x0_remove_interface,

	.remove_interface = mt76x02_remove_interface,

	.config = mt76x0_config,

	.configure_filter = mt76x02_configure_filter,

	.bss_info_changed = mt76x0_bss_info_changed,

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

+9 −0
Original line number Diff line number Diff line
@@ -127,6 +127,15 @@ void mt76x02_vif_init(struct mt76_dev *dev, struct ieee80211_vif *vif, 
}

EXPORT_SYMBOL_GPL(mt76x02_vif_init);



void mt76x02_remove_interface(struct ieee80211_hw *hw,

			     struct ieee80211_vif *vif)

{

	struct mt76_dev *dev = hw->priv;



	mt76_txq_remove(dev, vif->txq);

}

EXPORT_SYMBOL_GPL(mt76x02_remove_interface);



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

			struct ieee80211_ampdu_params *params)

{

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

+2 −0
Original line number Diff line number Diff line
@@ -28,6 +28,8 @@ 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);

void mt76x02_remove_interface(struct ieee80211_hw *hw,

			     struct ieee80211_vif *vif);



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

			struct ieee80211_ampdu_params *params);

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

+0 −9
Original line number Diff line number Diff line
@@ -18,15 +18,6 @@ 
#include "mt76x2.h"

#include "mt76x02_mac.h"



void mt76x2_remove_interface(struct ieee80211_hw *hw,

			     struct ieee80211_vif *vif)

{

	struct mt76x2_dev *dev = hw->priv;



	mt76_txq_remove(&dev->mt76, vif->txq);

}

EXPORT_SYMBOL_GPL(mt76x2_remove_interface);



void mt76x2_sta_rate_tbl_update(struct ieee80211_hw *hw,

				struct ieee80211_vif *vif,

				struct ieee80211_sta *sta)

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

+1 −1
Original line number Diff line number Diff line
@@ -314,7 +314,7 @@ const struct ieee80211_ops mt76x2_ops = { 
	.start = mt76x2_start,

	.stop = mt76x2_stop,

	.add_interface = mt76x2_add_interface,

	.remove_interface = mt76x2_remove_interface,

	.remove_interface = mt76x02_remove_interface,

	.config = mt76x2_config,

	.configure_filter = mt76x02_configure_filter,

	.bss_info_changed = mt76x2_bss_info_changed,

CRA Git | Maintained and supported by SUSTech CRA and CCSE