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

Commit 6e0d114d authored by Johannes Berg's avatar Johannes Berg Committed by David S. Miller
Browse files

[MAC80211]: move QoS rx handlers into rx.c 



This patch moves the QoS handlers into rx.c making it possible
to compile wme.c only when NET_SCHED is defined.

Signed-off-by: default avatarJohannes Berg <johannes@sipsolutions.net>
Signed-off-by: default avatarJiri Benc <jbenc@suse.cz>
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent 571ecf67

net/mac80211/Makefile

+1 −1
Original line number Diff line number Diff line
@@ -2,6 +2,7 @@ obj-$(CONFIG_MAC80211) += mac80211.o rc80211_simple.o 


mac80211-objs-$(CONFIG_MAC80211_LEDS) += ieee80211_led.o

mac80211-objs-$(CONFIG_MAC80211_DEBUGFS) += debugfs.o debugfs_sta.o debugfs_netdev.o debugfs_key.o

mac80211-objs-$(CONFIG_NET_SCHED) += wme.o



mac80211-objs := \

	ieee80211.o \
@@ -16,7 +17,6 @@ mac80211-objs := \ 
	regdomain.o \

	tkip.o \

	aes_ccm.o \

	wme.o \

	ieee80211_cfg.o \

	rx.o \

	$(mac80211-objs-y)

net/mac80211/rx.c

+55 −0
Original line number Diff line number Diff line
@@ -30,6 +30,41 @@ 
 * these don't have dev/sdata fields in the rx data

 */



static ieee80211_txrx_result

ieee80211_rx_h_parse_qos(struct ieee80211_txrx_data *rx)

{

	u8 *data = rx->skb->data;

	int tid;



	/* does the frame have a qos control field? */

	if (WLAN_FC_IS_QOS_DATA(rx->fc)) {

		u8 *qc = data + ieee80211_get_hdrlen(rx->fc) - QOS_CONTROL_LEN;

		/* frame has qos control */

		tid = qc[0] & QOS_CONTROL_TID_MASK;

	} else {

		if (unlikely((rx->fc & IEEE80211_FCTL_FTYPE) == IEEE80211_FTYPE_MGMT)) {

			/* Separate TID for management frames */

			tid = NUM_RX_DATA_QUEUES - 1;

		} else {

			/* no qos control present */

			tid = 0; /* 802.1d - Best Effort */

		}

	}

#ifdef CONFIG_MAC80211_DEBUG_COUNTERS

	I802_DEBUG_INC(rx->local->wme_rx_queue[tid]);

	if (rx->sta) {

		I802_DEBUG_INC(rx->sta->wme_rx_queue[tid]);

	}

#endif /* CONFIG_MAC80211_DEBUG_COUNTERS */



	rx->u.rx.queue = tid;

	/* Set skb->priority to 1d tag if highest order bit of TID is not set.

	 * For now, set skb->priority to 0 for other cases. */

	rx->skb->priority = (tid > 7) ? 0 : tid;



	return TXRX_CONTINUE;

}



static ieee80211_txrx_result

ieee80211_rx_h_load_stats(struct ieee80211_txrx_data *rx)

{
@@ -764,6 +799,26 @@ ieee80211_rx_h_ps_poll(struct ieee80211_txrx_data *rx) 
	return TXRX_QUEUED;

}



static ieee80211_txrx_result

ieee80211_rx_h_remove_qos_control(struct ieee80211_txrx_data *rx)

{

	u16 fc = rx->fc;

	u8 *data = rx->skb->data;

	struct ieee80211_hdr *hdr = (struct ieee80211_hdr *) data;



	if (!WLAN_FC_IS_QOS_DATA(fc))

		return TXRX_CONTINUE;



	/* remove the qos control field, update frame type and meta-data */

	memmove(data + 2, data, ieee80211_get_hdrlen(fc) - 2);

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

	/* change frame type to non QOS */

	rx->fc = fc &= ~IEEE80211_STYPE_QOS_DATA;

	hdr->frame_control = cpu_to_le16(fc);



	return TXRX_CONTINUE;

}



static ieee80211_txrx_result

ieee80211_rx_h_802_1x_pae(struct ieee80211_txrx_data *rx)

{

net/mac80211/wme.c

+0 −65
Original line number Diff line number Diff line
@@ -18,70 +18,6 @@ 
#include "ieee80211_i.h"

#include "wme.h"



static inline int WLAN_FC_IS_QOS_DATA(u16 fc)

{

	return (fc & 0x8C) == 0x88;

}





ieee80211_txrx_result

ieee80211_rx_h_parse_qos(struct ieee80211_txrx_data *rx)

{

	u8 *data = rx->skb->data;

	int tid;



	/* does the frame have a qos control field? */

	if (WLAN_FC_IS_QOS_DATA(rx->fc)) {

		u8 *qc = data + ieee80211_get_hdrlen(rx->fc) - QOS_CONTROL_LEN;

		/* frame has qos control */

		tid = qc[0] & QOS_CONTROL_TID_MASK;

	} else {

		if (unlikely((rx->fc & IEEE80211_FCTL_FTYPE) == IEEE80211_FTYPE_MGMT)) {

			/* Separate TID for management frames */

			tid = NUM_RX_DATA_QUEUES - 1;

		} else {

			/* no qos control present */

			tid = 0; /* 802.1d - Best Effort */

		}

	}

#ifdef CONFIG_MAC80211_DEBUG_COUNTERS

	I802_DEBUG_INC(rx->local->wme_rx_queue[tid]);

	if (rx->sta) {

		I802_DEBUG_INC(rx->sta->wme_rx_queue[tid]);

	}

#endif /* CONFIG_MAC80211_DEBUG_COUNTERS */



	rx->u.rx.queue = tid;

	/* Set skb->priority to 1d tag if highest order bit of TID is not set.

	 * For now, set skb->priority to 0 for other cases. */

	rx->skb->priority = (tid > 7) ? 0 : tid;



	return TXRX_CONTINUE;

}





ieee80211_txrx_result

ieee80211_rx_h_remove_qos_control(struct ieee80211_txrx_data *rx)

{

	u16 fc = rx->fc;

	u8 *data = rx->skb->data;

	struct ieee80211_hdr *hdr = (struct ieee80211_hdr *) data;



	if (!WLAN_FC_IS_QOS_DATA(fc))

		return TXRX_CONTINUE;



	/* remove the qos control field, update frame type and meta-data */

	memmove(data + 2, data, ieee80211_get_hdrlen(fc) - 2);

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

	/* change frame type to non QOS */

	rx->fc = fc &= ~IEEE80211_STYPE_QOS_DATA;

	hdr->frame_control = cpu_to_le16(fc);



	return TXRX_CONTINUE;

}





#ifdef CONFIG_NET_SCHED

/* maximum number of hardware queues we support. */

#define TC_80211_MAX_QUEUES 8
@@ -675,4 +611,3 @@ void ieee80211_wme_unregister(void) 
{

	unregister_qdisc(&wme_qdisc_ops);

}
 
#endif /* CONFIG_NET_SCHED */

net/mac80211/wme.h

+4 −5
Original line number Diff line number Diff line
@@ -24,11 +24,10 @@ 


#define QOS_CONTROL_TAG1D_MASK 0x07



ieee80211_txrx_result

ieee80211_rx_h_parse_qos(struct ieee80211_txrx_data *rx);



ieee80211_txrx_result

ieee80211_rx_h_remove_qos_control(struct ieee80211_txrx_data *rx);

static inline int WLAN_FC_IS_QOS_DATA(u16 fc)

{

	return (fc & 0x8C) == 0x88;

}



#ifdef CONFIG_NET_SCHED

void ieee80211_install_qdisc(struct net_device *dev);