From 6e51a62161a8f67085ae92367c1688a864e864d8 Mon Sep 17 00:00:00 2001
From: Eric Dumazet <eric.dumazet@gmail.com>
Date: Fri, 16 Oct 2009 04:02:20 +0000
Subject: [PATCH] --- yaml --- r: 170745 b: refs/heads/master c:
 94b059520d6c0cea852dc9a3e9033c6f123df7c1 h: refs/heads/master i:   170743:
 d889a76a6659491e68b7f3b67f5b1f528b45a596 v: v3

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

diff --git a/[refs] b/[refs]
index 6029f51ce589..4239ef9c067b 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 7b6856a0296a8f187bb88ba31fa83a08abba7966
+refs/heads/master: 94b059520d6c0cea852dc9a3e9033c6f123df7c1
diff --git a/trunk/net/packet/af_packet.c b/trunk/net/packet/af_packet.c
index bf3a2954cd4d..dac775e0bc72 100644
--- a/trunk/net/packet/af_packet.c
+++ b/trunk/net/packet/af_packet.c
@@ -188,7 +188,6 @@ struct packet_sock {
 	struct packet_ring_buffer	tx_ring;
 	int			copy_thresh;
 #endif
-	struct packet_type	prot_hook;
 	spinlock_t		bind_lock;
 	struct mutex		pg_vec_lock;
 	unsigned int		running:1,	/* prot_hook is attached*/
@@ -204,6 +203,7 @@ struct packet_sock {
 	unsigned int		tp_reserve;
 	unsigned int		tp_loss:1;
 #endif
+	struct packet_type	prot_hook ____cacheline_aligned_in_smp;
 };
 
 struct packet_skb_cb {