diff --git a/net/mac80211/tx.c b/net/mac80211/tx.c
index 8f68bf9746d0e553b41eb5639a57ea6eee7bba0a..a910148b8228f5ebdd890e5f46aca0e3dbcff724 100644
--- a/net/mac80211/tx.c
+++ b/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);