---

yaml --- r: 256275 b: refs/heads/master c: cc9f01b h: refs/heads/master i: 256273: 006b0c1 256271: 244df51 v: v3
git-mirror · Jul 14, 2011 · 22cbb7d · 22cbb7d
1 parent 36c9b18
commit 22cbb7d
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 6a7ebdf2fd15417e87b4fd02ff411aeaca34da5f
+refs/heads/master: cc9f01b246ca8e4fa245991840b8076394f86707
diff --git a/trunk/net/packet/af_packet.c b/trunk/net/packet/af_packet.c
@@ -1129,7 +1129,6 @@ static int tpacket_rcv(struct sk_buff *skb, struct net_device *dev,
 	else
 		sll->sll_ifindex = dev->ifindex;
 
-	__packet_set_status(po, h.raw, status);
 	smp_mb();
 #if ARCH_IMPLEMENTS_FLUSH_DCACHE_PAGE == 1
 	{
@@ -1138,8 +1137,10 @@ static int tpacket_rcv(struct sk_buff *skb, struct net_device *dev,
 		end = (u8 *)PAGE_ALIGN((unsigned long)h.raw + macoff + snaplen);
 		for (start = h.raw; start < end; start += PAGE_SIZE)
 			flush_dcache_page(pgv_to_page(start));
+		smp_wmb();
 	}
 #endif
+	__packet_set_status(po, h.raw, status);
 
 	sk->sk_data_ready(sk, 0);