diff --git a/[refs] b/[refs]
index e9b4a90729d5..61f051e4209f 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 30196673fe17934617b5d5bfd456a0edf057a0b9
+refs/heads/master: 7e0aae4732067e1bdb546071423a0b3483a79d9a
diff --git a/trunk/net/mac80211/tx.c b/trunk/net/mac80211/tx.c
index 8f68bf9746d0..a910148b8228 100644
--- a/trunk/net/mac80211/tx.c
+++ b/trunk/net/mac80211/tx.c
@@ -872,6 +872,8 @@ ieee80211_tx_h_calculate_duration(struct ieee80211_tx_data *tx)
 
 	do {
 		hdr = (void *) skb->data;
+		if (unlikely(ieee80211_is_pspoll(hdr->frame_control)))
+			break; /* must not overwrite AID */
 		next_len = skb->next ? skb->next->len : 0;
 		group_addr = is_multicast_ether_addr(hdr->addr1);