Commit 73c4e195 authored by Johannes Berg's avatar Johannes Berg
Browse files

mac80211: move skb info band assignment out 



Instead of passing the band as a parameter to ieee80211_xmit()
and ieee80211_tx(), move it outside of the two functions while
making sure info->band is set up before calling them.

This removes the parameter and simplifies the follow commit.

Signed-off-by: default avatarJohannes Berg <johannes.berg@intel.com>
Signed-off-by: default avatarArik Nemtsov <arik@wizery.com>
Signed-off-by: default avatarJohannes Berg <johannes.berg@intel.com>
parent 1277b4a9

net/mac80211/cfg.c

+2 −1
Original line number Original line Diff line number Diff line
@@ -3514,6 +3514,7 @@ static int ieee80211_probe_client(struct wiphy *wiphy, struct net_device *dev, 




	info->flags |= IEEE80211_TX_CTL_REQ_TX_STATUS |

	info->flags |= IEEE80211_TX_CTL_REQ_TX_STATUS |

		       IEEE80211_TX_INTFL_NL80211_FRAME_TX;

		       IEEE80211_TX_INTFL_NL80211_FRAME_TX;

	info->band = band;





	skb_set_queue_mapping(skb, IEEE80211_AC_VO);

	skb_set_queue_mapping(skb, IEEE80211_AC_VO);

	skb->priority = 7;

	skb->priority = 7;
@@ -3521,7 +3522,7 @@ static int ieee80211_probe_client(struct wiphy *wiphy, struct net_device *dev, 
		nullfunc->qos_ctrl = cpu_to_le16(7);

		nullfunc->qos_ctrl = cpu_to_le16(7);





	local_bh_disable();

	local_bh_disable();

	ieee80211_xmit(sdata, skb, band);

	ieee80211_xmit(sdata, skb);

	local_bh_enable();

	local_bh_enable();

	rcu_read_unlock();

	rcu_read_unlock();

net/mac80211/ieee80211_i.h

+1 −2
Original line number Original line Diff line number Diff line
@@ -1761,8 +1761,7 @@ void mac80211_ev_michael_mic_failure(struct ieee80211_sub_if_data *sdata, int ke 
				     gfp_t gfp);

				     gfp_t gfp);

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 bss_notify);

void ieee80211_xmit(struct ieee80211_sub_if_data *sdata, struct sk_buff *skb,

void ieee80211_xmit(struct ieee80211_sub_if_data *sdata, struct sk_buff *skb);

		    enum ieee80211_band band);





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,

net/mac80211/sta_info.c

+2 −1
Original line number Original line Diff line number Diff line
@@ -1249,7 +1249,8 @@ static void ieee80211_send_null_response(struct ieee80211_sub_if_data *sdata, 
		return;

		return;

	}

	}





	ieee80211_xmit(sdata, skb, chanctx_conf->def.chan->band);

	info->band = chanctx_conf->def.chan->band;

	ieee80211_xmit(sdata, skb);

	rcu_read_unlock();

	rcu_read_unlock();

}

}

net/mac80211/tx.c

+11 −12
Original line number Original line Diff line number Diff line
@@ -1426,8 +1426,7 @@ EXPORT_SYMBOL(ieee80211_tx_prepare_skb); 
 * Returns false if the frame couldn't be transmitted but was queued instead.

 * Returns false if the frame couldn't be transmitted but was queued instead.

 */

 */

static bool ieee80211_tx(struct ieee80211_sub_if_data *sdata,

static bool ieee80211_tx(struct ieee80211_sub_if_data *sdata,

			 struct sk_buff *skb, bool txpending,

			 struct sk_buff *skb, bool txpending)

			 enum ieee80211_band band)

{

{

	struct ieee80211_local *local = sdata->local;

	struct ieee80211_local *local = sdata->local;

	struct ieee80211_tx_data tx;

	struct ieee80211_tx_data tx;
@@ -1452,8 +1451,6 @@ static bool ieee80211_tx(struct ieee80211_sub_if_data *sdata, 
		return true;

		return true;

	}

	}





	info->band = band;



	/* set up hw_queue value early */

	/* set up hw_queue value early */

	if (!(info->flags & IEEE80211_TX_CTL_TX_OFFCHAN) ||

	if (!(info->flags & IEEE80211_TX_CTL_TX_OFFCHAN) ||

	    !(local->hw.flags & IEEE80211_HW_QUEUE_CONTROL))

	    !(local->hw.flags & IEEE80211_HW_QUEUE_CONTROL))
@@ -1501,8 +1498,7 @@ static int ieee80211_skb_resize(struct ieee80211_sub_if_data *sdata, 
	return 0;

	return 0;

}

}





void ieee80211_xmit(struct ieee80211_sub_if_data *sdata, struct sk_buff *skb,

void ieee80211_xmit(struct ieee80211_sub_if_data *sdata, struct sk_buff *skb)

		    enum ieee80211_band band)

{

{

	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);
@@ -1537,7 +1533,7 @@ void ieee80211_xmit(struct ieee80211_sub_if_data *sdata, struct sk_buff *skb, 
	}

	}





	ieee80211_set_qos_hdr(sdata, skb);

	ieee80211_set_qos_hdr(sdata, skb);

	ieee80211_tx(sdata, skb, false, band);

	ieee80211_tx(sdata, skb, false);

}

}





static bool ieee80211_parse_tx_radiotap(struct sk_buff *skb)

static bool ieee80211_parse_tx_radiotap(struct sk_buff *skb)
@@ -1757,7 +1753,8 @@ netdev_tx_t ieee80211_monitor_start_xmit(struct sk_buff *skb, 
				     sdata->vif.type))

				     sdata->vif.type))

		goto fail_rcu;

		goto fail_rcu;





	ieee80211_xmit(sdata, skb, chandef->chan->band);

	info->band = chandef->chan->band;

	ieee80211_xmit(sdata, skb);

	rcu_read_unlock();

	rcu_read_unlock();





	return NETDEV_TX_OK;

	return NETDEV_TX_OK;
@@ -2220,8 +2217,9 @@ void __ieee80211_subif_start_xmit(struct sk_buff *skb, 




	info->flags = info_flags;

	info->flags = info_flags;

	info->ack_frame_id = info_id;

	info->ack_frame_id = info_id;

	info->band = band;





	ieee80211_xmit(sdata, skb, band);

	ieee80211_xmit(sdata, skb);

	rcu_read_unlock();

	rcu_read_unlock();





	return;

	return;
@@ -2277,8 +2275,8 @@ static bool ieee80211_tx_pending_skb(struct ieee80211_local *local, 
			dev_kfree_skb(skb);

			dev_kfree_skb(skb);

			return true;

			return true;

		}

		}

		result = ieee80211_tx(sdata, skb, true,

		info->band = chanctx_conf->def.chan->band;

				      chanctx_conf->def.chan->band);

		result = ieee80211_tx(sdata, skb, true);

	} else {

	} else {

		struct sk_buff_head skbs;

		struct sk_buff_head skbs;
@@ -3059,6 +3057,7 @@ void __ieee80211_tx_skb_tid_band(struct ieee80211_sub_if_data *sdata, 
	 * requirements are that we do not come into tx with bhs on.

	 * requirements are that we do not come into tx with bhs on.

	 */

	 */

	local_bh_disable();

	local_bh_disable();

	ieee80211_xmit(sdata, skb, band);

	IEEE80211_SKB_CB(skb)->band = band;

	ieee80211_xmit(sdata, skb);

	local_bh_enable();

	local_bh_enable();

}
 
}

CRA Git | Maintained and supported by SUSTech CRA and CCSE