diff options
author | Jiri Pirko <jiri@resnulli.us> | 2013-12-07 13:26:55 -0500 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2013-12-09 20:56:12 -0500 |
commit | 73af614aedd221df8495fc8c9993c50e87f899f2 (patch) | |
tree | 66eaab080b5add40cf2fc06f194d1c808bb2ec60 /include/net/neighbour.h | |
parent | cb5b09c17fe60056bc8f127ffc987d361c40ed4b (diff) |
neigh: use tbl->family to distinguish ipv4 from ipv6
Signed-off-by: Jiri Pirko <jiri@resnulli.us>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'include/net/neighbour.h')
-rw-r--r-- | include/net/neighbour.h | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/include/net/neighbour.h b/include/net/neighbour.h index ed7eba045297..95615c9ad13a 100644 --- a/include/net/neighbour.h +++ b/include/net/neighbour.h | |||
@@ -202,6 +202,11 @@ struct neigh_table { | |||
202 | struct pneigh_entry **phash_buckets; | 202 | struct pneigh_entry **phash_buckets; |
203 | }; | 203 | }; |
204 | 204 | ||
205 | static inline int neigh_parms_family(struct neigh_parms *p) | ||
206 | { | ||
207 | return p->tbl->family; | ||
208 | } | ||
209 | |||
205 | #define NEIGH_PRIV_ALIGN sizeof(long long) | 210 | #define NEIGH_PRIV_ALIGN sizeof(long long) |
206 | #define NEIGH_ENTRY_SIZE(size) ALIGN((size), NEIGH_PRIV_ALIGN) | 211 | #define NEIGH_ENTRY_SIZE(size) ALIGN((size), NEIGH_PRIV_ALIGN) |
207 | 212 | ||
@@ -306,7 +311,7 @@ int neigh_proc_dointvec_ms_jiffies(struct ctl_table *ctl, int write, | |||
306 | size_t *lenp, loff_t *ppos); | 311 | size_t *lenp, loff_t *ppos); |
307 | 312 | ||
308 | int neigh_sysctl_register(struct net_device *dev, struct neigh_parms *p, | 313 | int neigh_sysctl_register(struct net_device *dev, struct neigh_parms *p, |
309 | char *p_name, proc_handler *proc_handler); | 314 | proc_handler *proc_handler); |
310 | void neigh_sysctl_unregister(struct neigh_parms *p); | 315 | void neigh_sysctl_unregister(struct neigh_parms *p); |
311 | 316 | ||
312 | static inline void __neigh_parms_put(struct neigh_parms *parms) | 317 | static inline void __neigh_parms_put(struct neigh_parms *parms) |