diff options
| author | David S. Miller <davem@davemloft.net> | 2015-03-08 19:30:31 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2015-03-08 19:30:31 -0400 |
| commit | 9b974499e44536fd524dfad23f4f8477e6e243ab (patch) | |
| tree | fb927e9867e7a013c4ce142a993458d15ee20cef /include/net/neighbour.h | |
| parent | 008a5b07f1b4beab1004ac799f449b59a45af8e9 (diff) | |
| parent | b79bda3d38ae67940f1740f7e015f284eb551680 (diff) | |
Merge branch 'mpls-next'
Eric W. Biederman says:
====================
mpls: Minor fixes and cleanups
This is a bunch of small changes that have come out of the discussions
of the mpls code and the automated tests that people run against things.
====================
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'include/net/neighbour.h')
| -rw-r--r-- | include/net/neighbour.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/include/net/neighbour.h b/include/net/neighbour.h index afb8237b0a8c..d48b8ec8b5f4 100644 --- a/include/net/neighbour.h +++ b/include/net/neighbour.h @@ -226,6 +226,7 @@ enum { NEIGH_ND_TABLE = 1, NEIGH_DN_TABLE = 2, NEIGH_NR_TABLES, + NEIGH_LINK_TABLE = NEIGH_NR_TABLES /* Pseudo table for neigh_xmit */ }; static inline int neigh_parms_family(struct neigh_parms *p) |