Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net

[mirror_ubuntu-artful-kernel.git] / include / net / addrconf.h

diff --git a/include/net/addrconf.h b/include/net/addrconf.h
index b5474b1fcd8399e667e5f807ee99c1e6150f517a..78003dfb8539bd42f75f8c2d04cbb7dce872e1bf 100644 (file)
--- a/include/net/addrconf.h
+++ b/include/net/addrconf.h
@@ -192,8 +192,7 @@ struct ipv6_stub {
        int (*ipv6_dst_lookup)(struct net *net, struct sock *sk,
                               struct dst_entry **dst, struct flowi6 *fl6);
        void (*udpv6_encap_enable)(void);
-       void (*ndisc_send_na)(struct net_device *dev, struct neighbour *neigh,
-                             const struct in6_addr *daddr,
+       void (*ndisc_send_na)(struct net_device *dev, const struct in6_addr *daddr,
                              const struct in6_addr *solicited_addr,
                              bool router, bool solicited, bool override, bool inc_opt);
        struct neigh_table *nd_tbl;