From 22cbb7d13aa3de735453deafa173fde14ad4cdc4 Mon Sep 17 00:00:00 2001
From: Chetan Loke <loke.chetan@gmail.com>
Date: Thu, 14 Jul 2011 08:36:33 -0700
Subject: [PATCH] --- yaml --- r: 256275 b: refs/heads/master c:
 cc9f01b246ca8e4fa245991840b8076394f86707 h: refs/heads/master i:   256273:
 006b0c1f975a5f4f918ce4473bb24d57630e7aa5   256271:
 244df51bac67bc75accb44c74ab9c5af87530d8f v: v3

---
 [refs]                       | 2 +-
 trunk/net/packet/af_packet.c | 3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 60eee780351a..b196fe1e3a00 100644
--- 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
index d2294ad1a895..c698cec0a445 100644
--- 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);