Commit 2703bc85 authored by Kalle Valo's avatar Kalle Valo Committed by Johannes Berg
Browse files

wifi: mac80211: rename ieee80211_tx_status() to ieee80211_tx_status_skb() 

make htmldocs warns:

Documentation/driver-api/80211/mac80211:109: ./include/net/mac80211.h:5170: WARNING: Duplicate C declaration, also defined at mac80211:1117.
Declaration is '.. c:function:: void ieee80211_tx_status (struct ieee80211_hw *hw, struct sk_buff *skb)'.

This is because there's a function named ieee80211_tx_status() and a struct named
ieee80211_tx_status. This has been discussed previously but no solution found:

https://lore.kernel.org/all/20220521114629.6ee9fc06@coco.lan/

There's also a bug open for three years with no solution in sight:

https://github.com/sphinx-doc/sphinx/pull/8313



So I guess we have no other solution than to a workaround this in the code,
for example to rename the function to ieee80211_tx_status_skb() to avoid the
name conflict. I got the idea for the name from ieee80211_tx_status_noskb() in
which the skb is not provided as an argument, instead with
ieee80211_tx_status_skb() the skb is provided.

Compile tested only.

Signed-off-by: default avatarKalle Valo <quic_kvalo@quicinc.com>
Link: https://lore.kernel.org/r/20231012114229.2931808-2-kvalo@kernel.org


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

Documentation/driver-api/80211/mac80211.rst

+1 −1
Original line number Diff line number Diff line
@@ -120,7 +120,7 @@ functions/definitions 
	ieee80211_rx

	ieee80211_rx_ni

	ieee80211_rx_irqsafe

	ieee80211_tx_status

	ieee80211_tx_status_skb

	ieee80211_tx_status_ni

	ieee80211_tx_status_irqsafe

	ieee80211_rts_get

drivers/net/wireless/ath/ath12k/dp_tx.c

+2 −2
Original line number Diff line number Diff line
@@ -401,7 +401,7 @@ ath12k_dp_tx_htt_tx_complete_buf(struct ath12k_base *ab, 
		}

	}



	ieee80211_tx_status(ar->hw, msdu);

	ieee80211_tx_status_skb(ar->hw, msdu);

}



static void
@@ -498,7 +498,7 @@ static void ath12k_dp_tx_complete_msdu(struct ath12k *ar, 
	 * Might end up reporting it out-of-band from HTT stats.

	 */



	ieee80211_tx_status(ar->hw, msdu);

	ieee80211_tx_status_skb(ar->hw, msdu);



exit:

	rcu_read_unlock();

drivers/net/wireless/ath/ath5k/base.c

+1 −1
Original line number Diff line number Diff line
@@ -1770,7 +1770,7 @@ ath5k_tx_frame_completed(struct ath5k_hw *ah, struct sk_buff *skb, 
		ah->stats.antenna_tx[0]++; /* invalid */



	trace_ath5k_tx_complete(ah, skb, txq, ts);

	ieee80211_tx_status(ah->hw, skb);

	ieee80211_tx_status_skb(ah->hw, skb);

}



static void

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

+1 −1
Original line number Diff line number Diff line
@@ -523,7 +523,7 @@ static void ath9k_htc_tx_process(struct ath9k_htc_priv *priv, 
	}



	/* Send status to mac80211 */

	ieee80211_tx_status(priv->hw, skb);

	ieee80211_tx_status_skb(priv->hw, skb);

}



static inline void ath9k_htc_tx_drainq(struct ath9k_htc_priv *priv,

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

+1 −1
Original line number Diff line number Diff line
@@ -94,7 +94,7 @@ static void ath_tx_status(struct ieee80211_hw *hw, struct sk_buff *skb) 


	if (info->flags & (IEEE80211_TX_CTL_REQ_TX_STATUS |

			   IEEE80211_TX_STATUS_EOSP)) {

		ieee80211_tx_status(hw, skb);

		ieee80211_tx_status_skb(hw, skb);

		return;

	}