---

yaml --- r: 310762 b: refs/heads/master c: 06cf5c4 h: refs/heads/master v: v3
git-mirror · Jun 8, 2012 · 254c7f1 · 254c7f1
1 parent 3bf2c0a
commit 254c7f1
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 1 deletion.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 0fde0a8cfd0ede7f310d6a681c8e5a7cb3e32406
+refs/heads/master: 06cf5c4c5bea549235da1aace86b90d4ad0084f8
diff --git a/trunk/drivers/net/wireless/mac80211_hwsim.c b/trunk/drivers/net/wireless/mac80211_hwsim.c
@@ -1555,6 +1555,7 @@ static int hwsim_tx_info_frame_received_nl(struct sk_buff *skb_2,
 			hdr = (struct ieee80211_hdr *) skb->data;
 			mac80211_hwsim_monitor_ack(data2->hw, hdr->addr2);
 		}
+		txi->flags |= IEEE80211_TX_STAT_ACK;
 	}
 	ieee80211_tx_status_irqsafe(data2->hw, skb);
 	return 0;