diff options
Diffstat (limited to 'include/net/neighbour.h')
-rw-r--r-- | include/net/neighbour.h | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/include/net/neighbour.h b/include/net/neighbour.h index 34c996f46181..6cdfeedb650b 100644 --- a/include/net/neighbour.h +++ b/include/net/neighbour.h | |||
@@ -195,7 +195,6 @@ static inline void *neighbour_priv(const struct neighbour *n) | |||
195 | #define NEIGH_UPDATE_F_ADMIN 0x80000000 | 195 | #define NEIGH_UPDATE_F_ADMIN 0x80000000 |
196 | 196 | ||
197 | extern void neigh_table_init(struct neigh_table *tbl); | 197 | extern void neigh_table_init(struct neigh_table *tbl); |
198 | extern void neigh_table_init_no_netlink(struct neigh_table *tbl); | ||
199 | extern int neigh_table_clear(struct neigh_table *tbl); | 198 | extern int neigh_table_clear(struct neigh_table *tbl); |
200 | extern struct neighbour * neigh_lookup(struct neigh_table *tbl, | 199 | extern struct neighbour * neigh_lookup(struct neigh_table *tbl, |
201 | const void *pkey, | 200 | const void *pkey, |
@@ -323,7 +322,7 @@ static inline int neigh_event_send(struct neighbour *neigh, struct sk_buff *skb) | |||
323 | #ifdef CONFIG_BRIDGE_NETFILTER | 322 | #ifdef CONFIG_BRIDGE_NETFILTER |
324 | static inline int neigh_hh_bridge(struct hh_cache *hh, struct sk_buff *skb) | 323 | static inline int neigh_hh_bridge(struct hh_cache *hh, struct sk_buff *skb) |
325 | { | 324 | { |
326 | unsigned seq, hh_alen; | 325 | unsigned int seq, hh_alen; |
327 | 326 | ||
328 | do { | 327 | do { |
329 | seq = read_seqbegin(&hh->hh_lock); | 328 | seq = read_seqbegin(&hh->hh_lock); |
@@ -336,7 +335,7 @@ static inline int neigh_hh_bridge(struct hh_cache *hh, struct sk_buff *skb) | |||
336 | 335 | ||
337 | static inline int neigh_hh_output(struct hh_cache *hh, struct sk_buff *skb) | 336 | static inline int neigh_hh_output(struct hh_cache *hh, struct sk_buff *skb) |
338 | { | 337 | { |
339 | unsigned seq; | 338 | unsigned int seq; |
340 | int hh_len; | 339 | int hh_len; |
341 | 340 | ||
342 | do { | 341 | do { |