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

Commit 8f77f384 authored by Johannes Berg's avatar Johannes Berg Committed by John W. Linville
Browse files

mac80211: do not pass PS frames out of mac80211 again 



In order to handle powersave frames properly we had needed
to pass these out to the device queues again, and introduce
the skb->requeue bit. This, however, also has unnecessary
overhead by needing to 'clean up' already tried frames, and
this clean-up code is also buggy when software encryption
is used.

Instead of sending the frames via the master netdev queue
again, simply put them into the pending queue. This also
fixes a problem where frames for that particular station
could be reordered when some were still on the software
queues and older ones are re-injected into the software
queue after them.

Signed-off-by: default avatarJohannes Berg <johannes@sipsolutions.net>
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent fc240e3f

include/linux/skbuff.h

+0 −4
Original line number Diff line number Diff line
@@ -304,9 +304,6 @@ typedef unsigned char *sk_buff_data_t; 
 *	@tc_verd: traffic control verdict

 *	@ndisc_nodetype: router type (from link layer)

 *	@do_not_encrypt: set to prevent encryption of this frame

 *	@requeue: set to indicate that the wireless core should attempt

 *		a software retry on this frame if we failed to

 *		receive an ACK for it

 *	@dma_cookie: a cookie to one of several possible DMA operations

 *		done by skb DMA functions

 *	@secmark: security marking
@@ -380,7 +377,6 @@ struct sk_buff { 
#endif

#if defined(CONFIG_MAC80211) || defined(CONFIG_MAC80211_MODULE)

	__u8			do_not_encrypt:1;

	__u8			requeue:1;

#endif

	/* 0/13/14 bit hole */

include/net/mac80211.h

+3 −0
Original line number Diff line number Diff line
@@ -239,6 +239,8 @@ struct ieee80211_bss_conf { 
 * @IEEE80211_TX_INTFL_NEED_TXPROCESSING: completely internal to mac80211,

 *	used to indicate that a pending frame requires TX processing before

 *	it can be sent out.

 * @IEEE80211_TX_INTFL_RETRIED: completely internal to mac80211,

 *	used to indicate that a frame was already retried due to PS

 */

enum mac80211_tx_control_flags {

	IEEE80211_TX_CTL_REQ_TX_STATUS		= BIT(0),
@@ -256,6 +258,7 @@ enum mac80211_tx_control_flags { 
	IEEE80211_TX_CTL_RATE_CTRL_PROBE	= BIT(12),

	IEEE80211_TX_INTFL_RCALGO		= BIT(13),

	IEEE80211_TX_INTFL_NEED_TXPROCESSING	= BIT(14),

	IEEE80211_TX_INTFL_RETRIED		= BIT(15),

};



/**

net/core/skbuff.c

+0 −1
Original line number Diff line number Diff line
@@ -552,7 +552,6 @@ static void __copy_skb_header(struct sk_buff *new, const struct sk_buff *old) 
	new->vlan_tci		= old->vlan_tci;

#if defined(CONFIG_MAC80211) || defined(CONFIG_MAC80211_MODULE)

	new->do_not_encrypt	= old->do_not_encrypt;

	new->requeue		= old->requeue;

#endif



	skb_copy_secmark(new, old);

net/mac80211/ieee80211_i.h

+5 −0
Original line number Diff line number Diff line
@@ -589,6 +589,7 @@ enum queue_stop_reason { 
	IEEE80211_QUEUE_STOP_REASON_AGGREGATION,

	IEEE80211_QUEUE_STOP_REASON_SUSPEND,

	IEEE80211_QUEUE_STOP_REASON_PENDING,

	IEEE80211_QUEUE_STOP_REASON_SKB_ADD,

};



struct ieee80211_master_priv {
@@ -1121,6 +1122,10 @@ void ieee80211_wake_queue_by_reason(struct ieee80211_hw *hw, int queue, 
				    enum queue_stop_reason reason);

void ieee80211_stop_queue_by_reason(struct ieee80211_hw *hw, int queue,

				    enum queue_stop_reason reason);

void ieee80211_add_pending_skb(struct ieee80211_local *local,

			       struct sk_buff *skb);

int ieee80211_add_pending_skbs(struct ieee80211_local *local,

			       struct sk_buff_head *skbs);



void ieee80211_send_auth(struct ieee80211_sub_if_data *sdata,

			 u16 transaction, u16 auth_alg,

net/mac80211/main.c

+6 −55
Original line number Diff line number Diff line
@@ -369,60 +369,12 @@ static void ieee80211_tasklet_handler(unsigned long data) 
	}

}



/* Remove added headers (e.g., QoS control), encryption header/MIC, etc. to

 * make a prepared TX frame (one that has been given to hw) to look like brand

 * new IEEE 802.11 frame that is ready to go through TX processing again.

 */

static void ieee80211_remove_tx_extra(struct ieee80211_local *local,

				      struct ieee80211_key *key,

				      struct sk_buff *skb)

{

	unsigned int hdrlen, iv_len, mic_len;

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



	hdrlen = ieee80211_hdrlen(hdr->frame_control);



	if (!key)

		goto no_key;



	switch (key->conf.alg) {

	case ALG_WEP:

		iv_len = WEP_IV_LEN;

		mic_len = WEP_ICV_LEN;

		break;

	case ALG_TKIP:

		iv_len = TKIP_IV_LEN;

		mic_len = TKIP_ICV_LEN;

		break;

	case ALG_CCMP:

		iv_len = CCMP_HDR_LEN;

		mic_len = CCMP_MIC_LEN;

		break;

	default:

		goto no_key;

	}



	if (skb->len >= hdrlen + mic_len &&

	    !(key->flags & KEY_FLAG_UPLOADED_TO_HARDWARE))

		skb_trim(skb, skb->len - mic_len);

	if (skb->len >= hdrlen + iv_len) {

		memmove(skb->data + iv_len, skb->data, hdrlen);

		hdr = (struct ieee80211_hdr *)skb_pull(skb, iv_len);

	}



no_key:

	if (ieee80211_is_data_qos(hdr->frame_control)) {

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

		memmove(skb->data + IEEE80211_QOS_CTL_LEN, skb->data,

			hdrlen - IEEE80211_QOS_CTL_LEN);

		skb_pull(skb, IEEE80211_QOS_CTL_LEN);

	}

}



static void ieee80211_handle_filtered_frame(struct ieee80211_local *local,

					    struct sta_info *sta,

					    struct sk_buff *skb)

{

	struct ieee80211_tx_info *info = IEEE80211_SKB_CB(skb);



	sta->tx_filtered_count++;



	/*
@@ -464,16 +416,15 @@ static void ieee80211_handle_filtered_frame(struct ieee80211_local *local, 
	 */

	if (test_sta_flags(sta, WLAN_STA_PS) &&

	    skb_queue_len(&sta->tx_filtered) < STA_MAX_TX_BUFFER) {

		ieee80211_remove_tx_extra(local, sta->key, skb);

		skb_queue_tail(&sta->tx_filtered, skb);

		return;

	}



	if (!test_sta_flags(sta, WLAN_STA_PS) && !skb->requeue) {

	if (!test_sta_flags(sta, WLAN_STA_PS) &&

	    !(info->flags & IEEE80211_TX_INTFL_RETRIED)) {

		/* Software retry the packet once */

		skb->requeue = 1;

		ieee80211_remove_tx_extra(local, sta->key, skb);

		dev_queue_xmit(skb);

		info->flags |= IEEE80211_TX_INTFL_RETRIED;

		ieee80211_add_pending_skb(local, skb);

		return;

	}