---

yaml --- r: 170745 b: refs/heads/master c: 94b0595 h: refs/heads/master i: 170743: d889a76 v: v3
git-mirror · Oct 20, 2009 · 6e51a62 · 6e51a62
1 parent 5c86a17
commit 6e51a62
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git 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
@@ -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 {