Skip to content

Commit

Permalink
mac80211: remove unused flags argument in transmit functions
Browse files Browse the repository at this point in the history 
The flags argument in transmit functions is no longer being used
and can be removed.

Signed-off-by: Mathy Vanhoef <Mathy.Vanhoef@kuleuven.be>
Link: https://lore.kernel.org/r/20200723100153.31631-5-Mathy.Vanhoef@kuleuven.be
Signed-off-by: Johannes Berg <johannes.berg@intel.com>
  • Loading branch information
Mathy Vanhoef authored and Johannes Berg committed Jul 31, 2020
1 parent 2b3dab1 commit 08aca29
Show file tree
Hide file tree
Showing 7 changed files with 18 additions and 22 deletions.
2 changes: 1 addition & 1 deletion net/mac80211/cfg.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3590,7 +3590,7 @@ static int ieee80211_probe_client(struct wiphy *wiphy, struct net_device *dev,
}

local_bh_disable();
ieee80211_xmit(sdata, sta, skb, 0);
ieee80211_xmit(sdata, sta, skb);
local_bh_enable();

ret = 0;
Expand Down
11 changes: 5 additions & 6 deletions net/mac80211/ieee80211_i.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1966,12 +1966,11 @@ void ieee80211_regulatory_limit_wmm_params(struct ieee80211_sub_if_data *sdata,
void ieee80211_set_wmm_default(struct ieee80211_sub_if_data *sdata,
bool bss_notify, bool enable_qos);
void ieee80211_xmit(struct ieee80211_sub_if_data *sdata,
struct sta_info *sta, struct sk_buff *skb,
u32 txdata_flags);
struct sta_info *sta, struct sk_buff *skb);

void __ieee80211_tx_skb_tid_band(struct ieee80211_sub_if_data *sdata,
struct sk_buff *skb, int tid,
enum nl80211_band band, u32 txdata_flags);
enum nl80211_band band);

/* sta_out needs to be checked for ERR_PTR() before using */
int ieee80211_lookup_ra_sta(struct ieee80211_sub_if_data *sdata,
Expand All @@ -1981,10 +1980,10 @@ int ieee80211_lookup_ra_sta(struct ieee80211_sub_if_data *sdata,
static inline void
ieee80211_tx_skb_tid_band(struct ieee80211_sub_if_data *sdata,
struct sk_buff *skb, int tid,
enum nl80211_band band, u32 txdata_flags)
enum nl80211_band band)
{
rcu_read_lock();
__ieee80211_tx_skb_tid_band(sdata, skb, tid, band, txdata_flags);
__ieee80211_tx_skb_tid_band(sdata, skb, tid, band);
rcu_read_unlock();
}

Expand All @@ -2002,7 +2001,7 @@ static inline void ieee80211_tx_skb_tid(struct ieee80211_sub_if_data *sdata,
}

__ieee80211_tx_skb_tid_band(sdata, skb, tid,
chanctx_conf->def.chan->band, 0);
chanctx_conf->def.chan->band);
rcu_read_unlock();
}

Expand Down
2 changes: 1 addition & 1 deletion net/mac80211/offchannel.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -264,7 +264,7 @@ static void ieee80211_handle_roc_started(struct ieee80211_roc_work *roc,
if (roc->mgmt_tx_cookie) {
if (!WARN_ON(!roc->frame)) {
ieee80211_tx_skb_tid_band(roc->sdata, roc->frame, 7,
roc->chan->band, 0);
roc->chan->band);
roc->frame = NULL;
}
} else {
Expand Down
2 changes: 1 addition & 1 deletion net/mac80211/rx.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3591,7 +3591,7 @@ ieee80211_rx_h_action_return(struct ieee80211_rx_data *rx)
}

__ieee80211_tx_skb_tid_band(rx->sdata, nskb, 7,
status->band, 0);
status->band);
}
dev_kfree_skb(rx->skb);
return RX_QUEUED;
Expand Down
2 changes: 1 addition & 1 deletion net/mac80211/scan.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -607,7 +607,7 @@ static void ieee80211_send_scan_probe_req(struct ieee80211_sub_if_data *sdata,
cpu_to_le16(IEEE80211_SN_TO_SEQ(sn));
}
IEEE80211_SKB_CB(skb)->flags |= tx_flags;
ieee80211_tx_skb_tid_band(sdata, skb, 7, channel->band, 0);
ieee80211_tx_skb_tid_band(sdata, skb, 7, channel->band);
}
}

Expand Down
2 changes: 1 addition & 1 deletion net/mac80211/sta_info.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1455,7 +1455,7 @@ static void ieee80211_send_null_response(struct sta_info *sta, int tid,
}

info->band = chanctx_conf->def.chan->band;
ieee80211_xmit(sdata, sta, skb, 0);
ieee80211_xmit(sdata, sta, skb);
rcu_read_unlock();
}

Expand Down
19 changes: 8 additions & 11 deletions net/mac80211/tx.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1892,7 +1892,7 @@ EXPORT_SYMBOL(ieee80211_tx_prepare_skb);
*/
static bool ieee80211_tx(struct ieee80211_sub_if_data *sdata,
struct sta_info *sta, struct sk_buff *skb,
bool txpending, u32 txdata_flags)
bool txpending)
{
struct ieee80211_local *local = sdata->local;
struct ieee80211_tx_data tx;
Expand All @@ -1910,8 +1910,6 @@ static bool ieee80211_tx(struct ieee80211_sub_if_data *sdata,
led_len = skb->len;
res_prepare = ieee80211_tx_prepare(sdata, &tx, sta, skb);

tx.flags |= txdata_flags;

if (unlikely(res_prepare == TX_DROP)) {
ieee80211_free_txskb(&local->hw, skb);
return true;
Expand Down Expand Up @@ -1979,8 +1977,7 @@ static int ieee80211_skb_resize(struct ieee80211_sub_if_data *sdata,
}

void ieee80211_xmit(struct ieee80211_sub_if_data *sdata,
struct sta_info *sta, struct sk_buff *skb,
u32 txdata_flags)
struct sta_info *sta, struct sk_buff *skb)
{
struct ieee80211_local *local = sdata->local;
struct ieee80211_tx_info *info = IEEE80211_SKB_CB(skb);
Expand Down Expand Up @@ -2015,7 +2012,7 @@ void ieee80211_xmit(struct ieee80211_sub_if_data *sdata,
}

ieee80211_set_qos_hdr(sdata, skb);
ieee80211_tx(sdata, sta, skb, false, txdata_flags);
ieee80211_tx(sdata, sta, skb, false);
}

static bool ieee80211_parse_tx_radiotap(struct ieee80211_local *local,
Expand Down Expand Up @@ -2350,7 +2347,7 @@ netdev_tx_t ieee80211_monitor_start_xmit(struct sk_buff *skb,
if (!ieee80211_parse_tx_radiotap(local, skb))
goto fail_rcu;

ieee80211_xmit(sdata, NULL, skb, 0);
ieee80211_xmit(sdata, NULL, skb);
rcu_read_unlock();

return NETDEV_TX_OK;
Expand Down Expand Up @@ -4014,7 +4011,7 @@ void __ieee80211_subif_start_xmit(struct sk_buff *skb,

ieee80211_tx_stats(dev, skb->len);

ieee80211_xmit(sdata, sta, skb, 0);
ieee80211_xmit(sdata, sta, skb);
}
goto out;
out_free:
Expand Down Expand Up @@ -4380,7 +4377,7 @@ static bool ieee80211_tx_pending_skb(struct ieee80211_local *local,
return true;
}
info->band = chanctx_conf->def.chan->band;
result = ieee80211_tx(sdata, NULL, skb, true, 0);
result = ieee80211_tx(sdata, NULL, skb, true);
} else if (info->control.flags & IEEE80211_TX_CTRL_HW_80211_ENCAP) {
if (ieee80211_lookup_ra_sta(sdata, skb, &sta)) {
dev_kfree_skb(skb);
Expand Down Expand Up @@ -5339,7 +5336,7 @@ EXPORT_SYMBOL(ieee80211_unreserve_tid);

void __ieee80211_tx_skb_tid_band(struct ieee80211_sub_if_data *sdata,
struct sk_buff *skb, int tid,
enum nl80211_band band, u32 txdata_flags)
enum nl80211_band band)
{
int ac = ieee80211_ac_from_tid(tid);

Expand All @@ -5356,7 +5353,7 @@ void __ieee80211_tx_skb_tid_band(struct ieee80211_sub_if_data *sdata,
*/
local_bh_disable();
IEEE80211_SKB_CB(skb)->band = band;
ieee80211_xmit(sdata, NULL, skb, txdata_flags);
ieee80211_xmit(sdata, NULL, skb);
local_bh_enable();
}

Expand Down

0 comments on commit 08aca29

Please sign in to comment.