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

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.be


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

net/mac80211/cfg.c

+1 −1
Original line number Diff line number Diff line
@@ -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;

net/mac80211/ieee80211_i.h

+5 −6
Original line number Diff line number Diff line
@@ -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,
@@ -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();

}
@@ -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();

}

net/mac80211/offchannel.c

+1 −1
Original line number Diff line number Diff line
@@ -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 {

net/mac80211/rx.c

+1 −1
Original line number Diff line number Diff line
@@ -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;

net/mac80211/scan.c

+1 −1
Original line number Diff line number Diff line
@@ -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);

	}

}