Commit 08aca29a authored by Mathy Vanhoef's avatar Mathy Vanhoef Committed by Johannes Berg

mac80211: remove unused flags argument in transmit functions

The flags argument in transmit functions is no longer being used
and can be removed.
Signed-off-by: default avatarMathy Vanhoef <Mathy.Vanhoef@kuleuven.be>
Link: https://lore.kernel.org/r/20200723100153.31631-5-Mathy.Vanhoef@kuleuven.beSigned-off-by: default avatarJohannes Berg <johannes.berg@intel.com>
parent 2b3dab13
...@@ -3590,7 +3590,7 @@ static int ieee80211_probe_client(struct wiphy *wiphy, struct net_device *dev, ...@@ -3590,7 +3590,7 @@ static int ieee80211_probe_client(struct wiphy *wiphy, struct net_device *dev,
} }
local_bh_disable(); local_bh_disable();
ieee80211_xmit(sdata, sta, skb, 0); ieee80211_xmit(sdata, sta, skb);
local_bh_enable(); local_bh_enable();
ret = 0; ret = 0;
......
...@@ -1966,12 +1966,11 @@ void ieee80211_regulatory_limit_wmm_params(struct ieee80211_sub_if_data *sdata, ...@@ -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, void ieee80211_set_wmm_default(struct ieee80211_sub_if_data *sdata,
bool bss_notify, bool enable_qos); bool bss_notify, bool enable_qos);
void ieee80211_xmit(struct ieee80211_sub_if_data *sdata, void ieee80211_xmit(struct ieee80211_sub_if_data *sdata,
struct sta_info *sta, struct sk_buff *skb, struct sta_info *sta, struct sk_buff *skb);
u32 txdata_flags);
void __ieee80211_tx_skb_tid_band(struct ieee80211_sub_if_data *sdata, void __ieee80211_tx_skb_tid_band(struct ieee80211_sub_if_data *sdata,
struct sk_buff *skb, int tid, 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 */ /* sta_out needs to be checked for ERR_PTR() before using */
int ieee80211_lookup_ra_sta(struct ieee80211_sub_if_data *sdata, int ieee80211_lookup_ra_sta(struct ieee80211_sub_if_data *sdata,
...@@ -1981,10 +1980,10 @@ int ieee80211_lookup_ra_sta(struct ieee80211_sub_if_data *sdata, ...@@ -1981,10 +1980,10 @@ int ieee80211_lookup_ra_sta(struct ieee80211_sub_if_data *sdata,
static inline void static inline void
ieee80211_tx_skb_tid_band(struct ieee80211_sub_if_data *sdata, ieee80211_tx_skb_tid_band(struct ieee80211_sub_if_data *sdata,
struct sk_buff *skb, int tid, struct sk_buff *skb, int tid,
enum nl80211_band band, u32 txdata_flags) enum nl80211_band band)
{ {
rcu_read_lock(); 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(); rcu_read_unlock();
} }
...@@ -2002,7 +2001,7 @@ static inline void ieee80211_tx_skb_tid(struct ieee80211_sub_if_data *sdata, ...@@ -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, __ieee80211_tx_skb_tid_band(sdata, skb, tid,
chanctx_conf->def.chan->band, 0); chanctx_conf->def.chan->band);
rcu_read_unlock(); rcu_read_unlock();
} }
......
...@@ -264,7 +264,7 @@ static void ieee80211_handle_roc_started(struct ieee80211_roc_work *roc, ...@@ -264,7 +264,7 @@ static void ieee80211_handle_roc_started(struct ieee80211_roc_work *roc,
if (roc->mgmt_tx_cookie) { if (roc->mgmt_tx_cookie) {
if (!WARN_ON(!roc->frame)) { if (!WARN_ON(!roc->frame)) {
ieee80211_tx_skb_tid_band(roc->sdata, roc->frame, 7, ieee80211_tx_skb_tid_band(roc->sdata, roc->frame, 7,
roc->chan->band, 0); roc->chan->band);
roc->frame = NULL; roc->frame = NULL;
} }
} else { } else {
......
...@@ -3591,7 +3591,7 @@ ieee80211_rx_h_action_return(struct ieee80211_rx_data *rx) ...@@ -3591,7 +3591,7 @@ ieee80211_rx_h_action_return(struct ieee80211_rx_data *rx)
} }
__ieee80211_tx_skb_tid_band(rx->sdata, nskb, 7, __ieee80211_tx_skb_tid_band(rx->sdata, nskb, 7,
status->band, 0); status->band);
} }
dev_kfree_skb(rx->skb); dev_kfree_skb(rx->skb);
return RX_QUEUED; return RX_QUEUED;
......
...@@ -607,7 +607,7 @@ static void ieee80211_send_scan_probe_req(struct ieee80211_sub_if_data *sdata, ...@@ -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)); cpu_to_le16(IEEE80211_SN_TO_SEQ(sn));
} }
IEEE80211_SKB_CB(skb)->flags |= tx_flags; 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);
} }
} }
......
...@@ -1455,7 +1455,7 @@ static void ieee80211_send_null_response(struct sta_info *sta, int tid, ...@@ -1455,7 +1455,7 @@ static void ieee80211_send_null_response(struct sta_info *sta, int tid,
} }
info->band = chanctx_conf->def.chan->band; info->band = chanctx_conf->def.chan->band;
ieee80211_xmit(sdata, sta, skb, 0); ieee80211_xmit(sdata, sta, skb);
rcu_read_unlock(); rcu_read_unlock();
} }
......
...@@ -1892,7 +1892,7 @@ EXPORT_SYMBOL(ieee80211_tx_prepare_skb); ...@@ -1892,7 +1892,7 @@ EXPORT_SYMBOL(ieee80211_tx_prepare_skb);
*/ */
static bool ieee80211_tx(struct ieee80211_sub_if_data *sdata, static bool ieee80211_tx(struct ieee80211_sub_if_data *sdata,
struct sta_info *sta, struct sk_buff *skb, struct sta_info *sta, struct sk_buff *skb,
bool txpending, u32 txdata_flags) bool txpending)
{ {
struct ieee80211_local *local = sdata->local; struct ieee80211_local *local = sdata->local;
struct ieee80211_tx_data tx; struct ieee80211_tx_data tx;
...@@ -1910,8 +1910,6 @@ static bool ieee80211_tx(struct ieee80211_sub_if_data *sdata, ...@@ -1910,8 +1910,6 @@ static bool ieee80211_tx(struct ieee80211_sub_if_data *sdata,
led_len = skb->len; led_len = skb->len;
res_prepare = ieee80211_tx_prepare(sdata, &tx, sta, skb); res_prepare = ieee80211_tx_prepare(sdata, &tx, sta, skb);
tx.flags |= txdata_flags;
if (unlikely(res_prepare == TX_DROP)) { if (unlikely(res_prepare == TX_DROP)) {
ieee80211_free_txskb(&local->hw, skb); ieee80211_free_txskb(&local->hw, skb);
return true; return true;
...@@ -1979,8 +1977,7 @@ static int ieee80211_skb_resize(struct ieee80211_sub_if_data *sdata, ...@@ -1979,8 +1977,7 @@ static int ieee80211_skb_resize(struct ieee80211_sub_if_data *sdata,
} }
void ieee80211_xmit(struct ieee80211_sub_if_data *sdata, void ieee80211_xmit(struct ieee80211_sub_if_data *sdata,
struct sta_info *sta, struct sk_buff *skb, struct sta_info *sta, struct sk_buff *skb)
u32 txdata_flags)
{ {
struct ieee80211_local *local = sdata->local; struct ieee80211_local *local = sdata->local;
struct ieee80211_tx_info *info = IEEE80211_SKB_CB(skb); struct ieee80211_tx_info *info = IEEE80211_SKB_CB(skb);
...@@ -2015,7 +2012,7 @@ void ieee80211_xmit(struct ieee80211_sub_if_data *sdata, ...@@ -2015,7 +2012,7 @@ void ieee80211_xmit(struct ieee80211_sub_if_data *sdata,
} }
ieee80211_set_qos_hdr(sdata, skb); 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, static bool ieee80211_parse_tx_radiotap(struct ieee80211_local *local,
...@@ -2350,7 +2347,7 @@ netdev_tx_t ieee80211_monitor_start_xmit(struct sk_buff *skb, ...@@ -2350,7 +2347,7 @@ netdev_tx_t ieee80211_monitor_start_xmit(struct sk_buff *skb,
if (!ieee80211_parse_tx_radiotap(local, skb)) if (!ieee80211_parse_tx_radiotap(local, skb))
goto fail_rcu; goto fail_rcu;
ieee80211_xmit(sdata, NULL, skb, 0); ieee80211_xmit(sdata, NULL, skb);
rcu_read_unlock(); rcu_read_unlock();
return NETDEV_TX_OK; return NETDEV_TX_OK;
...@@ -4014,7 +4011,7 @@ void __ieee80211_subif_start_xmit(struct sk_buff *skb, ...@@ -4014,7 +4011,7 @@ void __ieee80211_subif_start_xmit(struct sk_buff *skb,
ieee80211_tx_stats(dev, skb->len); ieee80211_tx_stats(dev, skb->len);
ieee80211_xmit(sdata, sta, skb, 0); ieee80211_xmit(sdata, sta, skb);
} }
goto out; goto out;
out_free: out_free:
...@@ -4380,7 +4377,7 @@ static bool ieee80211_tx_pending_skb(struct ieee80211_local *local, ...@@ -4380,7 +4377,7 @@ static bool ieee80211_tx_pending_skb(struct ieee80211_local *local,
return true; return true;
} }
info->band = chanctx_conf->def.chan->band; 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) { } else if (info->control.flags & IEEE80211_TX_CTRL_HW_80211_ENCAP) {
if (ieee80211_lookup_ra_sta(sdata, skb, &sta)) { if (ieee80211_lookup_ra_sta(sdata, skb, &sta)) {
dev_kfree_skb(skb); dev_kfree_skb(skb);
...@@ -5339,7 +5336,7 @@ EXPORT_SYMBOL(ieee80211_unreserve_tid); ...@@ -5339,7 +5336,7 @@ EXPORT_SYMBOL(ieee80211_unreserve_tid);
void __ieee80211_tx_skb_tid_band(struct ieee80211_sub_if_data *sdata, void __ieee80211_tx_skb_tid_band(struct ieee80211_sub_if_data *sdata,
struct sk_buff *skb, int tid, struct sk_buff *skb, int tid,
enum nl80211_band band, u32 txdata_flags) enum nl80211_band band)
{ {
int ac = ieee80211_ac_from_tid(tid); int ac = ieee80211_ac_from_tid(tid);
...@@ -5356,7 +5353,7 @@ void __ieee80211_tx_skb_tid_band(struct ieee80211_sub_if_data *sdata, ...@@ -5356,7 +5353,7 @@ void __ieee80211_tx_skb_tid_band(struct ieee80211_sub_if_data *sdata,
*/ */
local_bh_disable(); local_bh_disable();
IEEE80211_SKB_CB(skb)->band = band; IEEE80211_SKB_CB(skb)->band = band;
ieee80211_xmit(sdata, NULL, skb, txdata_flags); ieee80211_xmit(sdata, NULL, skb);
local_bh_enable(); local_bh_enable();
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment