Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit a4b7d7bd authored by Harvey Harrison's avatar Harvey Harrison Committed by John W. Linville
Browse files

mac80211: remove rx/tx_data->fc member 



Signed-off-by: default avatarHarvey Harrison <harvey.harrison@gmail.com>
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent 358c8d9d

net/mac80211/ieee80211_i.h

+2 −2
Original line number Diff line number Diff line
@@ -172,7 +172,7 @@ struct ieee80211_tx_data { 
	struct sk_buff **extra_frag;

	int num_extra_frag;



	u16 fc, ethertype;

	u16 ethertype;

	unsigned int flags;

};
@@ -200,7 +200,7 @@ struct ieee80211_rx_data { 
	struct ieee80211_rx_status *status;

	struct ieee80211_rate *rate;



	u16 fc, ethertype;

	u16 ethertype;

	unsigned int flags;

	int sent_ps_buffered;

	int queue;

net/mac80211/rx.c

+2 −6
Original line number Diff line number Diff line
@@ -1057,7 +1057,6 @@ ieee80211_rx_h_remove_qos_control(struct ieee80211_rx_data *rx) 
		ieee80211_hdrlen(hdr->frame_control) - IEEE80211_QOS_CTL_LEN);

	hdr = (struct ieee80211_hdr *)skb_pull(rx->skb, IEEE80211_QOS_CTL_LEN);

	/* change frame type to non QOS */

	rx->fc &= ~IEEE80211_STYPE_QOS_DATA;

	hdr->frame_control &= ~cpu_to_le16(IEEE80211_STYPE_QOS_DATA);



	return RX_CONTINUE;
@@ -1831,7 +1830,6 @@ static void __ieee80211_rx_handle_packet(struct ieee80211_hw *hw, 


	rx.status = status;

	rx.rate = rate;

	rx.fc = le16_to_cpu(hdr->frame_control);



	if (ieee80211_is_data(hdr->frame_control) || ieee80211_is_mgmt(hdr->frame_control))

		local->dot11ReceivedFragmentCount++;
@@ -1894,14 +1892,12 @@ static void __ieee80211_rx_handle_packet(struct ieee80211_hw *hw, 
				       prev->dev->name);

			continue;

		}

		rx.fc = le16_to_cpu(hdr->frame_control);

		ieee80211_invoke_rx_handlers(prev, &rx, skb_new);

		prev = sdata;

	}

	if (prev) {

		rx.fc = le16_to_cpu(hdr->frame_control);

	if (prev)

		ieee80211_invoke_rx_handlers(prev, &rx, skb);

	} else

	else

		dev_kfree_skb(skb);

}

net/mac80211/tx.c

+0 −1
Original line number Diff line number Diff line
@@ -993,7 +993,6 @@ __ieee80211_tx_prepare(struct ieee80211_tx_data *tx, 
	hdr = (struct ieee80211_hdr *) skb->data;



	tx->sta = sta_info_get(local, hdr->addr1);

	tx->fc = le16_to_cpu(hdr->frame_control);



	if (is_multicast_ether_addr(hdr->addr1)) {

		tx->flags &= ~IEEE80211_TX_UNICAST;