From: David S. Miller Date: Wed, 4 Mar 2015 05:23:37 +0000 (-0500) Subject: Merge branch 'neigh-mpls-prep' X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=ee23393b40062362feb220b32629624c1d3c402c;p=linux-beck.git Merge branch 'neigh-mpls-prep' Eric W. Biederman says: ==================== Neighbour table prep for MPLS In preparation for using the IPv4 and IPv6 neighbour tables in my mpls code this patchset factors out ___neigh_lookup_noref from __ipv4_neigh_lookup_noref, __ipv6_lookup_noref and neigh_lookup. Allowing the lookup logic to be shared between the different implementations. At what appears to be no cost. (Aka the same assembly is generated for ip6_finish_output2 and ip_finish_output2). After that I add a simple function that takes an address family and an address consults the neighbour table and sends the packet to the appropriate location. The address family argument decoupls callers of neigh_xmit from the addresses families the packets are sent over. (Aka The ipv6 module can be loaded after mpls and a previously configured ipv6 next hop will start working). The refactoring in ___neigh_lookup_noref may be a bit overkill but it feels like the right thing to do. Especially since the same code is generated. ==================== Signed-off-by: David S. Miller --- ee23393b40062362feb220b32629624c1d3c402c