diff options
-rw-r--r-- | include/net/neighbour.h | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/include/net/neighbour.h b/include/net/neighbour.h index f04e7a2522c5..55590ab16b3e 100644 --- a/include/net/neighbour.h +++ b/include/net/neighbour.h | |||
@@ -94,8 +94,6 @@ struct neighbour { | |||
94 | struct neighbour __rcu *next; | 94 | struct neighbour __rcu *next; |
95 | struct neigh_table *tbl; | 95 | struct neigh_table *tbl; |
96 | struct neigh_parms *parms; | 96 | struct neigh_parms *parms; |
97 | struct net_device *dev; | ||
98 | unsigned long used; | ||
99 | unsigned long confirmed; | 97 | unsigned long confirmed; |
100 | unsigned long updated; | 98 | unsigned long updated; |
101 | __u8 flags; | 99 | __u8 flags; |
@@ -103,16 +101,18 @@ struct neighbour { | |||
103 | __u8 type; | 101 | __u8 type; |
104 | __u8 dead; | 102 | __u8 dead; |
105 | atomic_t refcnt; | 103 | atomic_t refcnt; |
104 | struct sk_buff_head arp_queue; | ||
105 | struct timer_list timer; | ||
106 | unsigned long used; | ||
106 | atomic_t probes; | 107 | atomic_t probes; |
107 | rwlock_t lock; | 108 | rwlock_t lock; |
108 | seqlock_t ha_lock; | 109 | seqlock_t ha_lock; |
109 | unsigned char ha[ALIGN(MAX_ADDR_LEN, sizeof(unsigned long))]; | 110 | unsigned char ha[ALIGN(MAX_ADDR_LEN, sizeof(unsigned long))]; |
110 | struct hh_cache *hh; | 111 | struct hh_cache *hh; |
111 | int (*output)(struct sk_buff *skb); | 112 | int (*output)(struct sk_buff *skb); |
112 | struct sk_buff_head arp_queue; | ||
113 | struct timer_list timer; | ||
114 | const struct neigh_ops *ops; | 113 | const struct neigh_ops *ops; |
115 | struct rcu_head rcu; | 114 | struct rcu_head rcu; |
115 | struct net_device *dev; | ||
116 | u8 primary_key[0]; | 116 | u8 primary_key[0]; |
117 | }; | 117 | }; |
118 | 118 | ||