From af8b04c0ebde87a21cc47bc518c966217bfb8d6d Mon Sep 17 00:00:00 2001
From: Eric Dumazet <eric.dumazet@gmail.com>
Date: Thu, 11 Nov 2010 06:57:19 +0000
Subject: [PATCH] --- yaml --- r: 224137 b: refs/heads/master c:
 46b13fc5c0f239f36e84665c73087d5fa86bfd86 h: refs/heads/master i:   224135:
 2e79067cfe23201bf68bb7f2393e341f1fc2efb4 v: v3

---
 [refs]                        |  2 +-
 trunk/include/net/neighbour.h | 10 +++++-----
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/[refs] b/[refs]
index 4e500ff7cd2a..77e909e54ff7 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: c0c04c2a89cf6363da2940da59afd2e30001b991
+refs/heads/master: 46b13fc5c0f239f36e84665c73087d5fa86bfd86
diff --git a/trunk/include/net/neighbour.h b/trunk/include/net/neighbour.h
index 55590ab16b3e..815b2ce9f4a4 100644
--- a/trunk/include/net/neighbour.h
+++ b/trunk/include/net/neighbour.h
@@ -96,16 +96,16 @@ struct neighbour {
 	struct neigh_parms	*parms;
 	unsigned long		confirmed;
 	unsigned long		updated;
-	__u8			flags;
-	__u8			nud_state;
-	__u8			type;
-	__u8			dead;
+	rwlock_t		lock;
 	atomic_t		refcnt;
 	struct sk_buff_head	arp_queue;
 	struct timer_list	timer;
 	unsigned long		used;
 	atomic_t		probes;
-	rwlock_t		lock;
+	__u8			flags;
+	__u8			nud_state;
+	__u8			type;
+	__u8			dead;
 	seqlock_t		ha_lock;
 	unsigned char		ha[ALIGN(MAX_ADDR_LEN, sizeof(unsigned long))];
 	struct hh_cache		*hh;