Commit 0a44dfc0 authored by Johannes Berg's avatar Johannes Berg
Browse files

wifi: mac80211: simplify non-chanctx drivers 

There are still surprisingly many non-chanctx drivers, but in
mac80211 that code is a bit awkward. Simplify this by having
those drivers assign 'emulated' ops, so that the mac80211 code
can be more unified between non-chanctx/chanctx drivers. This
cuts the number of places caring about it by about 15, which
are scattered across - now they're fewer and no longer in the
channel context handling.

Link: https://msgid.link/20240129194108.6d0ead50f5cf.I60d093b2fc81ca1853925a4d0ac3a2337d5baa5b@changeid


Signed-off-by: default avatarJohannes Berg <johannes.berg@intel.com>
parent 2d9698dd

drivers/net/wireless/admtek/adm8211.c

+4 −0
Original line number Diff line number Diff line
@@ -1759,6 +1759,10 @@ static int adm8211_alloc_rings(struct ieee80211_hw *dev) 
}



static const struct ieee80211_ops adm8211_ops = {

	.add_chanctx = ieee80211_emulate_add_chanctx,

	.remove_chanctx = ieee80211_emulate_remove_chanctx,

	.change_chanctx = ieee80211_emulate_change_chanctx,

	.switch_vif_chanctx = ieee80211_emulate_switch_vif_chanctx,

	.tx			= adm8211_tx,

	.wake_tx_queue		= ieee80211_handle_wake_tx_queue,

	.start			= adm8211_start,

drivers/net/wireless/ath/ar5523/ar5523.c

+4 −0
Original line number Diff line number Diff line
@@ -1358,6 +1358,10 @@ static void ar5523_configure_filter(struct ieee80211_hw *hw, 
}



static const struct ieee80211_ops ar5523_ops = {

	.add_chanctx = ieee80211_emulate_add_chanctx,

	.remove_chanctx = ieee80211_emulate_remove_chanctx,

	.change_chanctx = ieee80211_emulate_change_chanctx,

	.switch_vif_chanctx = ieee80211_emulate_switch_vif_chanctx,

	.start			= ar5523_start,

	.stop			= ar5523_stop,

	.tx			= ar5523_tx,

drivers/net/wireless/ath/ath5k/mac80211-ops.c

+4 −0
Original line number Diff line number Diff line
@@ -779,6 +779,10 @@ static int ath5k_set_ringparam(struct ieee80211_hw *hw, u32 tx, u32 rx) 




const struct ieee80211_ops ath5k_hw_ops = {

	.add_chanctx = ieee80211_emulate_add_chanctx,

	.remove_chanctx = ieee80211_emulate_remove_chanctx,

	.change_chanctx = ieee80211_emulate_change_chanctx,

	.switch_vif_chanctx = ieee80211_emulate_switch_vif_chanctx,

	.tx			= ath5k_tx,

	.wake_tx_queue		= ieee80211_handle_wake_tx_queue,

	.start			= ath5k_start,

drivers/net/wireless/ath/ath9k/htc_drv_main.c

+4 −0
Original line number Diff line number Diff line
@@ -1868,6 +1868,10 @@ static void ath9k_htc_channel_switch_beacon(struct ieee80211_hw *hw, 
}



struct ieee80211_ops ath9k_htc_ops = {

	.add_chanctx = ieee80211_emulate_add_chanctx,

	.remove_chanctx = ieee80211_emulate_remove_chanctx,

	.change_chanctx = ieee80211_emulate_change_chanctx,

	.switch_vif_chanctx = ieee80211_emulate_switch_vif_chanctx,

	.tx                 = ath9k_htc_tx,

	.wake_tx_queue      = ieee80211_handle_wake_tx_queue,

	.start              = ath9k_htc_start,

drivers/net/wireless/ath/ath9k/main.c

+4 −0
Original line number Diff line number Diff line
@@ -2786,6 +2786,10 @@ static int ath9k_get_txpower(struct ieee80211_hw *hw, struct ieee80211_vif *vif, 
}



struct ieee80211_ops ath9k_ops = {

	.add_chanctx = ieee80211_emulate_add_chanctx,

	.remove_chanctx = ieee80211_emulate_remove_chanctx,

	.change_chanctx = ieee80211_emulate_change_chanctx,

	.switch_vif_chanctx = ieee80211_emulate_switch_vif_chanctx,

	.tx 		    = ath9k_tx,

	.start 		    = ath9k_start,

	.stop 		    = ath9k_stop,