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>

diff --cc include/net/neighbour.h
Simple merge

diff --cc net/core/neighbour.c
Simple merge

diff --cc net/ipv4/arp.c
Simple merge

diff --cc net/ipv4/devinet.c
Simple merge

diff --cc net/ipv6/addrconf.c
Simple merge

diff --cc net/ipv6/ndisc.c
Simple merge