Skip to content

Commit 4060f78

Browse files
kvalozhoufuro
kvalo
authored and
zhoufuro
committed
wifi: mac80211: rename ieee80211_tx_status() to ieee80211_tx_status_skb()
commit 2703bc8 ("wifi: mac80211: rename ieee80211_tx_status() to ieee80211_tx_status_skb()") upstream. 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/[email protected]/ There's also a bug open for three years with no solution in sight: sphinx-doc/sphinx#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. deepin-Intel-SIG: commit 2703bc8 ("wifi: mac80211: rename ieee80211_tx_status() to ieee80211_tx_status_skb()"). Signed-off-by: Kalle Valo <[email protected]> Link: https://lore.kernel.org/r/[email protected] Signed-off-by: Johannes Berg <[email protected]> [ Furong Zhou: amend commit log ] Signed-off-by: Furong Zhou <[email protected]>
1 parent ad75fba commit 4060f78

File tree

16 files changed

+37
-37
lines changed

16 files changed

+37
-37
lines changed

‎Documentation/driver-api/80211/mac80211.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -120,7 +120,7 @@ functions/definitions
120120
ieee80211_rx
121121
ieee80211_rx_ni
122122
ieee80211_rx_irqsafe
123-
ieee80211_tx_status
123+
ieee80211_tx_status_skb
124124
ieee80211_tx_status_ni
125125
ieee80211_tx_status_irqsafe
126126
ieee80211_rts_get

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -402,7 +402,7 @@ ath12k_dp_tx_htt_tx_complete_buf(struct ath12k_base *ab,
402402
}
403403
}
404404

405-
ieee80211_tx_status(ar->hw, msdu);
405+
ieee80211_tx_status_skb(ar->hw, msdu);
406406
}
407407

408408
static void
@@ -499,7 +499,7 @@ static void ath12k_dp_tx_complete_msdu(struct ath12k *ar,
499499
* Might end up reporting it out-of-band from HTT stats.
500500
*/
501501

502-
ieee80211_tx_status(ar->hw, msdu);
502+
ieee80211_tx_status_skb(ar->hw, msdu);
503503

504504
exit:
505505
rcu_read_unlock();

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1770,7 +1770,7 @@ ath5k_tx_frame_completed(struct ath5k_hw *ah, struct sk_buff *skb,
17701770
ah->stats.antenna_tx[0]++; /* invalid */
17711771

17721772
trace_ath5k_tx_complete(ah, skb, txq, ts);
1773-
ieee80211_tx_status(ah->hw, skb);
1773+
ieee80211_tx_status_skb(ah->hw, skb);
17741774
}
17751775

17761776
static void

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -523,7 +523,7 @@ static void ath9k_htc_tx_process(struct ath9k_htc_priv *priv,
523523
}
524524

525525
/* Send status to mac80211 */
526-
ieee80211_tx_status(priv->hw, skb);
526+
ieee80211_tx_status_skb(priv->hw, skb);
527527
}
528528

529529
static inline void ath9k_htc_tx_drainq(struct ath9k_htc_priv *priv,

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -94,7 +94,7 @@ static void ath_tx_status(struct ieee80211_hw *hw, struct sk_buff *skb)
9494

9595
if (info->flags & (IEEE80211_TX_CTL_REQ_TX_STATUS |
9696
IEEE80211_TX_STATUS_EOSP)) {
97-
ieee80211_tx_status(hw, skb);
97+
ieee80211_tx_status_skb(hw, skb);
9898
return;
9999
}
100100

‎drivers/net/wireless/broadcom/b43/dma.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1531,9 +1531,9 @@ void b43_dma_handle_txstatus(struct b43_wldev *dev,
15311531
ring->nr_failed_tx_packets++;
15321532
ring->nr_total_packet_tries += status->frame_count;
15331533
#endif /* DEBUG */
1534-
ieee80211_tx_status(dev->wl->hw, meta->skb);
1534+
ieee80211_tx_status_skb(dev->wl->hw, meta->skb);
15351535

1536-
/* skb will be freed by ieee80211_tx_status().
1536+
/* skb will be freed by ieee80211_tx_status_skb().
15371537
* Poison our pointer. */
15381538
meta->skb = B43_DMA_PTR_POISON;
15391539
} else {

‎drivers/net/wireless/broadcom/b43/pio.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -582,7 +582,7 @@ void b43_pio_handle_txstatus(struct b43_wldev *dev,
582582
q->buffer_used -= total_len;
583583
q->free_packet_slots += 1;
584584

585-
ieee80211_tx_status(dev->wl->hw, pack->skb);
585+
ieee80211_tx_status_skb(dev->wl->hw, pack->skb);
586586
pack->skb = NULL;
587587
list_add(&pack->list, &q->packets_list);
588588

‎drivers/net/wireless/intel/iwlwifi/dvm/tx.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1248,7 +1248,7 @@ void iwlagn_rx_reply_tx(struct iwl_priv *priv, struct iwl_rx_cmd_buffer *rxb)
12481248

12491249
while (!skb_queue_empty(&skbs)) {
12501250
skb = __skb_dequeue(&skbs);
1251-
ieee80211_tx_status(priv->hw, skb);
1251+
ieee80211_tx_status_skb(priv->hw, skb);
12521252
}
12531253
}
12541254

@@ -1385,6 +1385,6 @@ void iwlagn_rx_reply_compressed_ba(struct iwl_priv *priv,
13851385

13861386
while (!skb_queue_empty(&reclaimed_skbs)) {
13871387
skb = __skb_dequeue(&reclaimed_skbs);
1388-
ieee80211_tx_status(priv->hw, skb);
1388+
ieee80211_tx_status_skb(priv->hw, skb);
13891389
}
13901390
}

‎drivers/net/wireless/intel/iwlwifi/mvm/tx.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1704,7 +1704,7 @@ static void iwl_mvm_rx_tx_cmd_single(struct iwl_mvm *mvm,
17041704
RS_DRV_DATA_PACK(lq_color, tx_resp->reduced_tpc);
17051705

17061706
if (likely(!iwl_mvm_time_sync_frame(mvm, skb, hdr->addr1)))
1707-
ieee80211_tx_status(mvm->hw, skb);
1707+
ieee80211_tx_status_skb(mvm->hw, skb);
17081708
}
17091709

17101710
/* This is an aggregation queue or might become one, so we use
@@ -2060,7 +2060,7 @@ static void iwl_mvm_tx_reclaim(struct iwl_mvm *mvm, int sta_id, int tid,
20602060

20612061
while (!skb_queue_empty(&reclaimed_skbs)) {
20622062
skb = __skb_dequeue(&reclaimed_skbs);
2063-
ieee80211_tx_status(mvm->hw, skb);
2063+
ieee80211_tx_status_skb(mvm->hw, skb);
20642064
}
20652065
}
20662066

‎drivers/net/wireless/mediatek/mt7601u/tx.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -110,7 +110,7 @@ void mt7601u_tx_status(struct mt7601u_dev *dev, struct sk_buff *skb)
110110
info->flags |= IEEE80211_TX_STAT_ACK;
111111

112112
spin_lock_bh(&dev->mac_lock);
113-
ieee80211_tx_status(dev->hw, skb);
113+
ieee80211_tx_status_skb(dev->hw, skb);
114114
spin_unlock_bh(&dev->mac_lock);
115115
}
116116

‎drivers/net/wireless/ralink/rt2x00/rt2x00dev.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -533,7 +533,7 @@ void rt2x00lib_txdone(struct queue_entry *entry,
533533
*/
534534
if (!(skbdesc_flags & SKBDESC_NOT_MAC80211)) {
535535
if (rt2x00_has_cap_flag(rt2x00dev, REQUIRE_TASKLET_CONTEXT))
536-
ieee80211_tx_status(rt2x00dev->hw, entry->skb);
536+
ieee80211_tx_status_skb(rt2x00dev->hw, entry->skb);
537537
else
538538
ieee80211_tx_status_ni(rt2x00dev->hw, entry->skb);
539539
} else {

‎drivers/net/wireless/st/cw1200/txrx.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -994,7 +994,7 @@ void cw1200_skb_dtor(struct cw1200_common *priv,
994994
txpriv->raw_link_id, txpriv->tid);
995995
tx_policy_put(priv, txpriv->rate_id);
996996
}
997-
ieee80211_tx_status(priv->hw, skb);
997+
ieee80211_tx_status_skb(priv->hw, skb);
998998
}
999999

10001000
void cw1200_rx_cb(struct cw1200_common *priv,

‎drivers/net/wireless/ti/wl1251/tx.c

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -434,7 +434,7 @@ static void wl1251_tx_packet_cb(struct wl1251 *wl,
434434
result->status, wl1251_tx_parse_status(result->status));
435435

436436

437-
ieee80211_tx_status(wl->hw, skb);
437+
ieee80211_tx_status_skb(wl->hw, skb);
438438

439439
wl->tx_frames[result->id] = NULL;
440440
}
@@ -566,7 +566,7 @@ void wl1251_tx_flush(struct wl1251 *wl)
566566
if (!(info->flags & IEEE80211_TX_CTL_REQ_TX_STATUS))
567567
continue;
568568

569-
ieee80211_tx_status(wl->hw, skb);
569+
ieee80211_tx_status_skb(wl->hw, skb);
570570
}
571571

572572
for (i = 0; i < FW_TX_CMPLT_BLOCK_SIZE; i++)
@@ -577,7 +577,7 @@ void wl1251_tx_flush(struct wl1251 *wl)
577577
if (!(info->flags & IEEE80211_TX_CTL_REQ_TX_STATUS))
578578
continue;
579579

580-
ieee80211_tx_status(wl->hw, skb);
580+
ieee80211_tx_status_skb(wl->hw, skb);
581581
wl->tx_frames[i] = NULL;
582582
}
583583
}

‎include/net/mac80211.h

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -4907,7 +4907,7 @@ void ieee80211_restart_hw(struct ieee80211_hw *hw);
49074907
* for a single hardware must be synchronized against each other. Calls to
49084908
* this function, ieee80211_rx_ni() and ieee80211_rx_irqsafe() may not be
49094909
* mixed for a single hardware. Must not run concurrently with
4910-
* ieee80211_tx_status() or ieee80211_tx_status_ni().
4910+
* ieee80211_tx_status_skb() or ieee80211_tx_status_ni().
49114911
*
49124912
* This function must be called with BHs disabled and RCU read lock
49134913
*
@@ -4932,7 +4932,7 @@ void ieee80211_rx_list(struct ieee80211_hw *hw, struct ieee80211_sta *sta,
49324932
* for a single hardware must be synchronized against each other. Calls to
49334933
* this function, ieee80211_rx_ni() and ieee80211_rx_irqsafe() may not be
49344934
* mixed for a single hardware. Must not run concurrently with
4935-
* ieee80211_tx_status() or ieee80211_tx_status_ni().
4935+
* ieee80211_tx_status_skb() or ieee80211_tx_status_ni().
49364936
*
49374937
* This function must be called with BHs disabled.
49384938
*
@@ -4957,7 +4957,7 @@ void ieee80211_rx_napi(struct ieee80211_hw *hw, struct ieee80211_sta *sta,
49574957
* for a single hardware must be synchronized against each other. Calls to
49584958
* this function, ieee80211_rx_ni() and ieee80211_rx_irqsafe() may not be
49594959
* mixed for a single hardware. Must not run concurrently with
4960-
* ieee80211_tx_status() or ieee80211_tx_status_ni().
4960+
* ieee80211_tx_status_skb() or ieee80211_tx_status_ni().
49614961
*
49624962
* In process context use instead ieee80211_rx_ni().
49634963
*
@@ -4977,7 +4977,7 @@ static inline void ieee80211_rx(struct ieee80211_hw *hw, struct sk_buff *skb)
49774977
*
49784978
* Calls to this function, ieee80211_rx() or ieee80211_rx_ni() may not
49794979
* be mixed for a single hardware.Must not run concurrently with
4980-
* ieee80211_tx_status() or ieee80211_tx_status_ni().
4980+
* ieee80211_tx_status_skb() or ieee80211_tx_status_ni().
49814981
*
49824982
* @hw: the hardware this frame came in on
49834983
* @skb: the buffer to receive, owned by mac80211 after this call
@@ -4992,7 +4992,7 @@ void ieee80211_rx_irqsafe(struct ieee80211_hw *hw, struct sk_buff *skb);
49924992
*
49934993
* Calls to this function, ieee80211_rx() and ieee80211_rx_irqsafe() may
49944994
* not be mixed for a single hardware. Must not run concurrently with
4995-
* ieee80211_tx_status() or ieee80211_tx_status_ni().
4995+
* ieee80211_tx_status_skb() or ieee80211_tx_status_ni().
49964996
*
49974997
* @hw: the hardware this frame came in on
49984998
* @skb: the buffer to receive, owned by mac80211 after this call
@@ -5168,7 +5168,7 @@ void ieee80211_tx_rate_update(struct ieee80211_hw *hw,
51685168
struct ieee80211_tx_info *info);
51695169

51705170
/**
5171-
* ieee80211_tx_status - transmit status callback
5171+
* ieee80211_tx_status_skb - transmit status callback
51725172
*
51735173
* Call this function for all transmitted frames after they have been
51745174
* transmitted. It is permissible to not call this function for
@@ -5183,13 +5183,13 @@ void ieee80211_tx_rate_update(struct ieee80211_hw *hw,
51835183
* @hw: the hardware the frame was transmitted by
51845184
* @skb: the frame that was transmitted, owned by mac80211 after this call
51855185
*/
5186-
void ieee80211_tx_status(struct ieee80211_hw *hw,
5187-
struct sk_buff *skb);
5186+
void ieee80211_tx_status_skb(struct ieee80211_hw *hw,
5187+
struct sk_buff *skb);
51885188

51895189
/**
51905190
* ieee80211_tx_status_ext - extended transmit status callback
51915191
*
5192-
* This function can be used as a replacement for ieee80211_tx_status
5192+
* This function can be used as a replacement for ieee80211_tx_status_skb()
51935193
* in drivers that may want to provide extra information that does not
51945194
* fit into &struct ieee80211_tx_info.
51955195
*
@@ -5206,7 +5206,7 @@ void ieee80211_tx_status_ext(struct ieee80211_hw *hw,
52065206
/**
52075207
* ieee80211_tx_status_noskb - transmit status callback without skb
52085208
*
5209-
* This function can be used as a replacement for ieee80211_tx_status
5209+
* This function can be used as a replacement for ieee80211_tx_status_skb()
52105210
* in drivers that cannot reliably map tx status information back to
52115211
* specific skbs.
52125212
*
@@ -5234,9 +5234,9 @@ static inline void ieee80211_tx_status_noskb(struct ieee80211_hw *hw,
52345234
/**
52355235
* ieee80211_tx_status_ni - transmit status callback (in process context)
52365236
*
5237-
* Like ieee80211_tx_status() but can be called in process context.
5237+
* Like ieee80211_tx_status_skb() but can be called in process context.
52385238
*
5239-
* Calls to this function, ieee80211_tx_status() and
5239+
* Calls to this function, ieee80211_tx_status_skb() and
52405240
* ieee80211_tx_status_irqsafe() may not be mixed
52415241
* for a single hardware.
52425242
*
@@ -5247,17 +5247,17 @@ static inline void ieee80211_tx_status_ni(struct ieee80211_hw *hw,
52475247
struct sk_buff *skb)
52485248
{
52495249
local_bh_disable();
5250-
ieee80211_tx_status(hw, skb);
5250+
ieee80211_tx_status_skb(hw, skb);
52515251
local_bh_enable();
52525252
}
52535253

52545254
/**
52555255
* ieee80211_tx_status_irqsafe - IRQ-safe transmit status callback
52565256
*
5257-
* Like ieee80211_tx_status() but can be called in IRQ context
5257+
* Like ieee80211_tx_status_skb() but can be called in IRQ context
52585258
* (internally defers to a tasklet.)
52595259
*
5260-
* Calls to this function, ieee80211_tx_status() and
5260+
* Calls to this function, ieee80211_tx_status_skb() and
52615261
* ieee80211_tx_status_ni() may not be mixed for a single hardware.
52625262
*
52635263
* @hw: the hardware the frame was transmitted by

‎net/mac80211/main.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -318,7 +318,7 @@ static void ieee80211_tasklet_handler(struct tasklet_struct *t)
318318
break;
319319
case IEEE80211_TX_STATUS_MSG:
320320
skb->pkt_type = 0;
321-
ieee80211_tx_status(&local->hw, skb);
321+
ieee80211_tx_status_skb(&local->hw, skb);
322322
break;
323323
default:
324324
WARN(1, "mac80211: Packet is of unknown type %d\n",

‎net/mac80211/status.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1081,7 +1081,7 @@ static void __ieee80211_tx_status(struct ieee80211_hw *hw,
10811081
send_to_cooked, status);
10821082
}
10831083

1084-
void ieee80211_tx_status(struct ieee80211_hw *hw, struct sk_buff *skb)
1084+
void ieee80211_tx_status_skb(struct ieee80211_hw *hw, struct sk_buff *skb)
10851085
{
10861086
struct ieee80211_hdr *hdr = (struct ieee80211_hdr *) skb->data;
10871087
struct ieee80211_local *local = hw_to_local(hw);
@@ -1100,7 +1100,7 @@ void ieee80211_tx_status(struct ieee80211_hw *hw, struct sk_buff *skb)
11001100
ieee80211_tx_status_ext(hw, &status);
11011101
rcu_read_unlock();
11021102
}
1103-
EXPORT_SYMBOL(ieee80211_tx_status);
1103+
EXPORT_SYMBOL(ieee80211_tx_status_skb);
11041104

11051105
void ieee80211_tx_status_ext(struct ieee80211_hw *hw,
11061106
struct ieee80211_tx_status *status)

0 commit comments

Comments
 (0)