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

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

mac80211: rx.c/tx.c remove more users of tx/rx_data->fc 



Those functions that still use ieee80211_get_hdrlen are moved over
to use the little endian frame control.

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

net/mac80211/rx.c

+24 −38
Original line number Diff line number Diff line
@@ -821,7 +821,7 @@ ieee80211_reassemble_add(struct ieee80211_sub_if_data *sdata, 


static inline struct ieee80211_fragment_entry *

ieee80211_reassemble_find(struct ieee80211_sub_if_data *sdata,

			  u16 fc, unsigned int frag, unsigned int seq,

			  unsigned int frag, unsigned int seq,

			  int rx_queue, struct ieee80211_hdr *hdr)

{

	struct ieee80211_fragment_entry *entry;
@@ -830,7 +830,6 @@ ieee80211_reassemble_find(struct ieee80211_sub_if_data *sdata, 
	idx = sdata->fragment_next;

	for (i = 0; i < IEEE80211_FRAGMENT_MAX; i++) {

		struct ieee80211_hdr *f_hdr;

		u16 f_fc;



		idx--;

		if (idx < 0)
@@ -843,9 +842,12 @@ ieee80211_reassemble_find(struct ieee80211_sub_if_data *sdata, 
			continue;



		f_hdr = (struct ieee80211_hdr *)entry->skb_list.next->data;

		f_fc = le16_to_cpu(f_hdr->frame_control);



		if ((fc & IEEE80211_FCTL_FTYPE) != (f_fc & IEEE80211_FCTL_FTYPE) ||

		/*

		 * Check ftype and addresses are equal, else check next fragment

		 */

		if (((hdr->frame_control ^ f_hdr->frame_control) &

		     cpu_to_le16(IEEE80211_FCTL_FTYPE)) ||

		    compare_ether_addr(hdr->addr1, f_hdr->addr1) != 0 ||

		    compare_ether_addr(hdr->addr2, f_hdr->addr2) != 0)

			continue;
@@ -874,7 +876,7 @@ ieee80211_rx_h_defragment(struct ieee80211_rx_data *rx) 
	sc = le16_to_cpu(hdr->seq_ctrl);

	frag = sc & IEEE80211_SCTL_FRAG;



	if (likely((!(rx->fc & IEEE80211_FCTL_MOREFRAGS) && frag == 0) ||

	if (likely((!ieee80211_has_morefrags(hdr->frame_control) && frag == 0) ||

		   (rx->skb)->len < 24 ||

		   is_multicast_ether_addr(hdr->addr1))) {

		/* not fragmented */
@@ -889,7 +891,7 @@ ieee80211_rx_h_defragment(struct ieee80211_rx_data *rx) 
		entry = ieee80211_reassemble_add(rx->sdata, frag, seq,

						 rx->queue, &(rx->skb));

		if (rx->key && rx->key->conf.alg == ALG_CCMP &&

		    (rx->fc & IEEE80211_FCTL_PROTECTED)) {

		    ieee80211_has_protected(hdr->frame_control)) {

			/* Store CCMP PN so that we can verify that the next

			 * fragment has a sequential PN value. */

			entry->ccmp = 1;
@@ -903,8 +905,7 @@ ieee80211_rx_h_defragment(struct ieee80211_rx_data *rx) 
	/* This is a fragment for a frame that should already be pending in

	 * fragment cache. Add this fragment to the end of the pending entry.

	 */

	entry = ieee80211_reassemble_find(rx->sdata, rx->fc, frag, seq,

					  rx->queue, hdr);

	entry = ieee80211_reassemble_find(rx->sdata, frag, seq, rx->queue, hdr);

	if (!entry) {

		I802_DEBUG_INC(rx->local->rx_handlers_drop_defrag);

		return RX_DROP_MONITOR;
@@ -929,7 +930,7 @@ ieee80211_rx_h_defragment(struct ieee80211_rx_data *rx) 
		memcpy(entry->last_pn, pn, CCMP_PN_LEN);

	}



	skb_pull(rx->skb, ieee80211_get_hdrlen(rx->fc));

	skb_pull(rx->skb, ieee80211_hdrlen(hdr->frame_control));

	__skb_queue_tail(&entry->skb_list, rx->skb);

	entry->last_frag = frag;

	entry->extra_len += rx->skb->len;
@@ -1096,7 +1097,7 @@ ieee80211_data_to_8023(struct ieee80211_rx_data *rx) 
{

	struct net_device *dev = rx->dev;

	struct ieee80211_hdr *hdr = (struct ieee80211_hdr *) rx->skb->data;

	u16 fc, hdrlen, ethertype;

	u16 hdrlen, ethertype;

	u8 *payload;

	u8 dst[ETH_ALEN];

	u8 src[ETH_ALEN] __aligned(2);
@@ -1107,12 +1108,10 @@ ieee80211_data_to_8023(struct ieee80211_rx_data *rx) 
	DECLARE_MAC_BUF(mac3);

	DECLARE_MAC_BUF(mac4);



	fc = rx->fc;



	if (unlikely(!WLAN_FC_DATA_PRESENT(fc)))

	if (unlikely(!ieee80211_is_data_present(hdr->frame_control)))

		return -1;



	hdrlen = ieee80211_get_hdrlen(fc);

	hdrlen = ieee80211_hdrlen(hdr->frame_control);



	if (ieee80211_vif_is_mesh(&sdata->vif))

		hdrlen += ieee80211_get_mesh_hdrlen(
@@ -1127,41 +1126,28 @@ ieee80211_data_to_8023(struct ieee80211_rx_data *rx) 
	 *   1     0   BSSID SA    DA    n/a

	 *   1     1   RA    TA    DA    SA

	 */

	memcpy(dst, ieee80211_get_DA(hdr), ETH_ALEN);

	memcpy(src, ieee80211_get_SA(hdr), ETH_ALEN);



	switch (fc & (IEEE80211_FCTL_TODS | IEEE80211_FCTL_FROMDS)) {

	case IEEE80211_FCTL_TODS:

		/* BSSID SA DA */

		memcpy(dst, hdr->addr3, ETH_ALEN);

		memcpy(src, hdr->addr2, ETH_ALEN);



	switch (hdr->frame_control &

		cpu_to_le16(IEEE80211_FCTL_TODS | IEEE80211_FCTL_FROMDS)) {

	case __constant_cpu_to_le16(IEEE80211_FCTL_TODS):

		if (unlikely(sdata->vif.type != IEEE80211_IF_TYPE_AP &&

			     sdata->vif.type != IEEE80211_IF_TYPE_VLAN))

			return -1;

		break;

	case (IEEE80211_FCTL_TODS | IEEE80211_FCTL_FROMDS):

		/* RA TA DA SA */

		memcpy(dst, hdr->addr3, ETH_ALEN);

		memcpy(src, hdr->addr4, ETH_ALEN);



	case __constant_cpu_to_le16(IEEE80211_FCTL_TODS | IEEE80211_FCTL_FROMDS):

		if (unlikely(sdata->vif.type != IEEE80211_IF_TYPE_WDS &&

			     sdata->vif.type != IEEE80211_IF_TYPE_MESH_POINT))

			return -1;

		break;

	case IEEE80211_FCTL_FROMDS:

		/* DA BSSID SA */

		memcpy(dst, hdr->addr1, ETH_ALEN);

		memcpy(src, hdr->addr3, ETH_ALEN);



	case __constant_cpu_to_le16(IEEE80211_FCTL_FROMDS):

		if (sdata->vif.type != IEEE80211_IF_TYPE_STA ||

		    (is_multicast_ether_addr(dst) &&

		     !compare_ether_addr(src, dev->dev_addr)))

			return -1;

		break;

	case 0:

		/* DA SA BSSID */

		memcpy(dst, hdr->addr1, ETH_ALEN);

		memcpy(src, hdr->addr2, ETH_ALEN);



	case __constant_cpu_to_le16(0):

		if (sdata->vif.type != IEEE80211_IF_TYPE_IBSS)

			return -1;

		break;

net/mac80211/tx.c

+1 −1
Original line number Diff line number Diff line
@@ -1025,7 +1025,7 @@ __ieee80211_tx_prepare(struct ieee80211_tx_data *tx, 
	else if (test_and_clear_sta_flags(tx->sta, WLAN_STA_CLEAR_PS_FILT))

		info->flags |= IEEE80211_TX_CTL_CLEAR_PS_FILT;



	hdrlen = ieee80211_get_hdrlen(tx->fc);

	hdrlen = ieee80211_hdrlen(hdr->frame_control);

	if (skb->len > hdrlen + sizeof(rfc1042_header) + 2) {

		u8 *pos = &skb->data[hdrlen + sizeof(rfc1042_header)];

		tx->ethertype = (pos[0] << 8) | pos[1];