mac80211: add option for setting control flags (06016772) · Commits · 戴 / test

net/mac80211/ieee80211_i.h

+2 −1

Original line number	Diff line number	Diff line
		@@ -1761,7 +1761,8 @@ netdev_tx_t ieee80211_subif_start_xmit(struct sk_buff *skb,
		struct net_device *dev);
		void __ieee80211_subif_start_xmit(struct sk_buff *skb,
		struct net_device *dev,
		u32 info_flags);
		u32 info_flags,
		u32 ctrl_flags);
		void ieee80211_purge_tx_queue(struct ieee80211_hw *hw,
		struct sk_buff_head *skbs);
		struct sk_buff *

net/mac80211/tdls.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -1056,7 +1056,7 @@ ieee80211_tdls_prep_mgmt_packet(struct wiphy wiphy, struct net_device dev,

		/* disable bottom halves when entering the Tx path */
		local_bh_disable();
		__ieee80211_subif_start_xmit(skb, dev, flags);
		__ieee80211_subif_start_xmit(skb, dev, flags, 0);
		local_bh_enable();

		return ret;

net/mac80211/tx.c

+11 −7

Original line number	Diff line number	Diff line
		@@ -2432,6 +2432,7 @@ static int ieee80211_lookup_ra_sta(struct ieee80211_sub_if_data *sdata,
		* @sdata: virtual interface to build the header for
		* @skb: the skb to build the header in
		* @info_flags: skb flags to set
		* @ctrl_flags: info control flags to set
		*
		* This function takes the skb with 802.3 header and reformats the header to
		* the appropriate IEEE 802.11 header based on which interface the packet is
		@@ -2447,7 +2448,7 @@ static int ieee80211_lookup_ra_sta(struct ieee80211_sub_if_data *sdata,
		*/
		static struct sk_buff ieee80211_build_hdr(struct ieee80211_sub_if_data sdata,
		struct sk_buff *skb, u32 info_flags,
		struct sta_info *sta)
		struct sta_info *sta, u32 ctrl_flags)
		{
		struct ieee80211_local *local = sdata->local;
		struct ieee80211_tx_info *info;
		@@ -2824,6 +2825,7 @@ static struct sk_buff ieee80211_build_hdr(struct ieee80211_sub_if_data sdata,
		info->flags = info_flags;
		info->ack_frame_id = info_id;
		info->band = band;
		info->control.flags = ctrl_flags;

		return skb;
		free:
		@@ -3804,7 +3806,8 @@ EXPORT_SYMBOL(ieee80211_txq_schedule_end);

		void __ieee80211_subif_start_xmit(struct sk_buff *skb,
		struct net_device *dev,
		u32 info_flags)
		u32 info_flags,
		u32 ctrl_flags)
		{
		struct ieee80211_sub_if_data *sdata = IEEE80211_DEV_TO_SUB_IF(dev);
		struct ieee80211_local *local = sdata->local;
		@@ -3878,7 +3881,8 @@ void __ieee80211_subif_start_xmit(struct sk_buff *skb,
		skb->prev = NULL;
		skb->next = NULL;

		skb = ieee80211_build_hdr(sdata, skb, info_flags, sta);
		skb = ieee80211_build_hdr(sdata, skb, info_flags,
		sta, ctrl_flags);
		if (IS_ERR(skb))
		goto out;

		@@ -4018,9 +4022,9 @@ netdev_tx_t ieee80211_subif_start_xmit(struct sk_buff *skb,
		__skb_queue_head_init(&queue);
		ieee80211_convert_to_unicast(skb, dev, &queue);
		while ((skb = __skb_dequeue(&queue)))
		__ieee80211_subif_start_xmit(skb, dev, 0);
		__ieee80211_subif_start_xmit(skb, dev, 0, 0);
		} else {
		__ieee80211_subif_start_xmit(skb, dev, 0);
		__ieee80211_subif_start_xmit(skb, dev, 0, 0);
		}

		return NETDEV_TX_OK;
		@@ -4045,7 +4049,7 @@ ieee80211_build_data_template(struct ieee80211_sub_if_data *sdata,
		goto out;
		}

		skb = ieee80211_build_hdr(sdata, skb, info_flags, sta);
		skb = ieee80211_build_hdr(sdata, skb, info_flags, sta, 0);
		if (IS_ERR(skb))
		goto out;

		@@ -5082,7 +5086,7 @@ int ieee80211_tx_control_port(struct wiphy wiphy, struct net_device dev,
		skb_reset_mac_header(skb);

		local_bh_disable();
		__ieee80211_subif_start_xmit(skb, skb->dev, flags);
		__ieee80211_subif_start_xmit(skb, skb->dev, flags, 0);
		local_bh_enable();

		return 0;

Admin message