[PATCH 7/7] mac80211: Do not override AID in the duration field

[Jouni Malinen <jouni.malinen@atheros.com>]

When updating the duration field for TX frames, skip the update for
PS-Poll frames that use this field for other purposes (AID).

Signed-off-by: Jouni Malinen <jouni.malinen@atheros.com>

---
 net/mac80211/tx.c |    2 ++
 1 file changed, 2 insertions(+)

--- wireless-testing.orig/net/mac80211/tx.c	2009-05-19 16:32:25.000000000 +0300
+++ wireless-testing/net/mac80211/tx.c	2009-05-19 16:32:42.000000000 +0300
@@ -872,6 +872,8 @@ ieee80211_tx_h_calculate_duration(struct
 
 	do {
 		hdr = (void *) skb->data;
+		if (ieee80211_is_pspoll(hdr->frame_control))
+			continue; /* must not overwrite AID */
 		next_len = skb->next ? skb->next->len : 0;
 		group_addr = is_multicast_ether_addr(hdr->addr1);
 

-- 

-- 
Jouni Malinen                                            PGP id EFC895FA