Skip to content

Commit

Permalink
mac80211: remove tx_frags driver callback
Browse files Browse the repository at this point in the history
The implementation of tx_frags is buggy due to
not handling queue stop, and there's no driver
implementing it so remove it.

Signed-off-by: Johannes Berg <johannes.berg@intel.com>
  • Loading branch information
Johannes Berg committed Jul 2, 2012
1 parent ba0afa2 commit cb831b5
Show file tree
Hide file tree
Showing 4 changed files with 3 additions and 29 deletions.
15 changes: 0 additions & 15 deletions include/net/mac80211.h
Original file line number Diff line number Diff line change
Expand Up @@ -1896,19 +1896,6 @@ enum ieee80211_rate_control_changed {
* The low-level driver should send the frame out based on
* configuration in the TX control data. This handler should,
* preferably, never fail and stop queues appropriately.
* This must be implemented if @tx_frags is not.
* Must be atomic.
*
* @tx_frags: Called to transmit multiple fragments of a single MSDU.
* This handler must consume all fragments, sending out some of
* them only is useless and it can't ask for some of them to be
* queued again. If the frame is not fragmented the queue has a
* single SKB only. To avoid issues with the networking stack
* when TX status is reported the frames should be removed from
* the skb queue.
* If this is used, the tx_info @vif and @sta pointers will be
* invalid -- you must not use them in that case.
* This must be implemented if @tx isn't.
* Must be atomic.
*
* @start: Called before the first netdevice attached to the hardware
Expand Down Expand Up @@ -2260,8 +2247,6 @@ enum ieee80211_rate_control_changed {
*/
struct ieee80211_ops {
void (*tx)(struct ieee80211_hw *hw, struct sk_buff *skb);
void (*tx_frags)(struct ieee80211_hw *hw, struct ieee80211_vif *vif,
struct ieee80211_sta *sta, struct sk_buff_head *skbs);
int (*start)(struct ieee80211_hw *hw);
void (*stop)(struct ieee80211_hw *hw);
#ifdef CONFIG_PM
Expand Down
8 changes: 0 additions & 8 deletions net/mac80211/driver-ops.h
Original file line number Diff line number Diff line change
Expand Up @@ -27,14 +27,6 @@ static inline void drv_tx(struct ieee80211_local *local, struct sk_buff *skb)
local->ops->tx(&local->hw, skb);
}

static inline void drv_tx_frags(struct ieee80211_local *local,
struct ieee80211_vif *vif,
struct ieee80211_sta *sta,
struct sk_buff_head *skbs)
{
local->ops->tx_frags(&local->hw, vif, sta, skbs);
}

static inline void drv_get_et_strings(struct ieee80211_sub_if_data *sdata,
u32 sset, u8 *data)
{
Expand Down
2 changes: 1 addition & 1 deletion net/mac80211/main.c
Original file line number Diff line number Diff line change
Expand Up @@ -587,7 +587,7 @@ struct ieee80211_hw *ieee80211_alloc_hw(size_t priv_data_len,

local->hw.priv = (char *)local + ALIGN(sizeof(*local), NETDEV_ALIGN);

BUG_ON(!ops->tx && !ops->tx_frags);
BUG_ON(!ops->tx);
BUG_ON(!ops->start);
BUG_ON(!ops->stop);
BUG_ON(!ops->config);
Expand Down
7 changes: 2 additions & 5 deletions net/mac80211/tx.c
Original file line number Diff line number Diff line change
Expand Up @@ -1295,11 +1295,8 @@ static bool __ieee80211_tx(struct ieee80211_local *local,
break;
}

if (local->ops->tx_frags)
drv_tx_frags(local, vif, pubsta, skbs);
else
result = ieee80211_tx_frags(local, vif, pubsta, skbs,
txpending);
result = ieee80211_tx_frags(local, vif, pubsta, skbs,
txpending);

ieee80211_tpt_led_trig_tx(local, fc, led_len);
ieee80211_led_tx(local, 1);
Expand Down

0 comments on commit cb831b5

Please sign in to comment.