X-Git-Url: https://bbs.cooldavid.org/git/?a=blobdiff_plain;f=include%2Fnet%2Fneighbour.h;h=4014b623880cf529e3bb5b184a5b31dee650a8b5;hb=24912420e923d56461b400d83f250a31bed8a964;hp=55590ab16b3ed5192413b4b6415a8785c1d1a5bb;hpb=82279e6bd7643da1b3fbda42555c3238c7b00d38;p=net-next-2.6.git

diff --git a/include/net/neighbour.h b/include/net/neighbour.h
index 55590ab16b3..4014b623880 100644
--- a/include/net/neighbour.h
+++ b/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;
@@ -303,7 +303,7 @@ static inline void neigh_confirm(struct neighbour *neigh)
 
 static inline int neigh_event_send(struct neighbour *neigh, struct sk_buff *skb)
 {
-	unsigned long now = ACCESS_ONCE(jiffies);
+	unsigned long now = jiffies;
 	
 	if (neigh->used != now)
 		neigh->used = now;