diff options
Diffstat (limited to 'include/net/neighbour.h')
-rw-r--r-- | include/net/neighbour.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/include/net/neighbour.h b/include/net/neighbour.h index d8d790e56d3d..3817fda82a80 100644 --- a/include/net/neighbour.h +++ b/include/net/neighbour.h | |||
@@ -24,6 +24,7 @@ | |||
24 | 24 | ||
25 | #include <linux/err.h> | 25 | #include <linux/err.h> |
26 | #include <linux/sysctl.h> | 26 | #include <linux/sysctl.h> |
27 | #include <linux/workqueue.h> | ||
27 | #include <net/rtnetlink.h> | 28 | #include <net/rtnetlink.h> |
28 | 29 | ||
29 | /* | 30 | /* |
@@ -117,7 +118,7 @@ struct neighbour | |||
117 | int (*output)(struct sk_buff *skb); | 118 | int (*output)(struct sk_buff *skb); |
118 | struct sk_buff_head arp_queue; | 119 | struct sk_buff_head arp_queue; |
119 | struct timer_list timer; | 120 | struct timer_list timer; |
120 | struct neigh_ops *ops; | 121 | const struct neigh_ops *ops; |
121 | u8 primary_key[0]; | 122 | u8 primary_key[0]; |
122 | }; | 123 | }; |
123 | 124 | ||
@@ -167,7 +168,7 @@ struct neigh_table | |||
167 | int gc_thresh2; | 168 | int gc_thresh2; |
168 | int gc_thresh3; | 169 | int gc_thresh3; |
169 | unsigned long last_flush; | 170 | unsigned long last_flush; |
170 | struct timer_list gc_timer; | 171 | struct delayed_work gc_work; |
171 | struct timer_list proxy_timer; | 172 | struct timer_list proxy_timer; |
172 | struct sk_buff_head proxy_queue; | 173 | struct sk_buff_head proxy_queue; |
173 | atomic_t entries; | 174 | atomic_t entries; |
@@ -178,7 +179,6 @@ struct neigh_table | |||
178 | struct neighbour **hash_buckets; | 179 | struct neighbour **hash_buckets; |
179 | unsigned int hash_mask; | 180 | unsigned int hash_mask; |
180 | __u32 hash_rnd; | 181 | __u32 hash_rnd; |
181 | unsigned int hash_chain_gc; | ||
182 | struct pneigh_entry **phash_buckets; | 182 | struct pneigh_entry **phash_buckets; |
183 | }; | 183 | }; |
184 | 184 | ||