| Message ID | 20250115171750.259917-1-dmantipov@yandex.ru |
|---|---|
| State | New |
| Headers | show |
| Series | [1/2] wifi: ath9k: cleanup struct ath_tx_control and ath_tx_prepare() | expand |
Dmitry Antipov <dmantipov@yandex.ru> writes: > After switching to mac80211 software queues, pointer to 'struct ath_node' > in 'struct ath_tx_control' is still assigned but not actually used. So drop > it and cleanup related things in 'ath_tx_prepare()'. Compile tested only. > > Fixes: 50f08edf9809 ("ath9k: Switch to using mac80211 intermediate software queues.") > Signed-off-by: Dmitry Antipov <dmantipov@yandex.ru> Acked-by: Toke Høiland-Jørgensen <toke@toke.dk>
Dmitry Antipov <dmantipov@yandex.ru> writes: > After switching to mac80211 software queues, pointer to 'struct ath_node' > in 'struct ath_tx_control' is still assigned but not actually used. So drop > it and cleanup related things in 'ath_tx_prepare()'. Compile tested only. > > Fixes: 50f08edf9809 ("ath9k: Switch to using mac80211 intermediate software queues.") > Signed-off-by: Dmitry Antipov <dmantipov@yandex.ru> I don't think cleanup patches should have a Fixes tag. This is not fixing a user visible issue.
On 1/16/2025 3:19 AM, Kalle Valo wrote: > Dmitry Antipov <dmantipov@yandex.ru> writes: > >> After switching to mac80211 software queues, pointer to 'struct ath_node' >> in 'struct ath_tx_control' is still assigned but not actually used. So drop >> it and cleanup related things in 'ath_tx_prepare()'. Compile tested only. >> >> Fixes: 50f08edf9809 ("ath9k: Switch to using mac80211 intermediate software queues.") >> Signed-off-by: Dmitry Antipov <dmantipov@yandex.ru> > > I don't think cleanup patches should have a Fixes tag. This is not > fixing a user visible issue. > ACK
diff --git a/drivers/net/wireless/ath/ath9k/ath9k.h b/drivers/net/wireless/ath/ath9k/ath9k.h index bcfc8df0efe5..65c2250db33d 100644 --- a/drivers/net/wireless/ath/ath9k/ath9k.h +++ b/drivers/net/wireless/ath/ath9k/ath9k.h @@ -274,7 +274,6 @@ struct ath_node { struct ath_tx_control { struct ath_txq *txq; - struct ath_node *an; struct ieee80211_sta *sta; u8 paprd; }; diff --git a/drivers/net/wireless/ath/ath9k/xmit.c b/drivers/net/wireless/ath/ath9k/xmit.c index 0a24439dd30d..84f8c28b038b 100644 --- a/drivers/net/wireless/ath/ath9k/xmit.c +++ b/drivers/net/wireless/ath/ath9k/xmit.c @@ -2295,19 +2295,10 @@ static int ath_tx_prepare(struct ieee80211_hw *hw, struct sk_buff *skb, struct ieee80211_tx_info *info = IEEE80211_SKB_CB(skb); struct ieee80211_sta *sta = txctl->sta; struct ieee80211_vif *vif = info->control.vif; - struct ath_vif *avp; struct ath_softc *sc = hw->priv; int frmlen = skb->len + FCS_LEN; int padpos, padsize; - /* NOTE: sta can be NULL according to net/mac80211.h */ - if (sta) - txctl->an = (struct ath_node *)sta->drv_priv; - else if (vif && ieee80211_is_data(hdr->frame_control)) { - avp = (void *)vif->drv_priv; - txctl->an = &avp->mcast_node; - } - if (info->control.hw_key) frmlen += info->control.hw_key->icv_len;
After switching to mac80211 software queues, pointer to 'struct ath_node' in 'struct ath_tx_control' is still assigned but not actually used. So drop it and cleanup related things in 'ath_tx_prepare()'. Compile tested only. Fixes: 50f08edf9809 ("ath9k: Switch to using mac80211 intermediate software queues.") Signed-off-by: Dmitry Antipov <dmantipov@yandex.ru> --- drivers/net/wireless/ath/ath9k/ath9k.h | 1 - drivers/net/wireless/ath/ath9k/xmit.c | 9 --------- 2 files changed, 10 deletions(-)