From 4364ec08529a9427446b8df1be33f176d34f38e2 Mon Sep 17 00:00:00 2001 From: Navdeep Parhar Date: Fri, 25 Jan 2013 23:58:21 +0000 Subject: [PATCH] Move lle_event to if_llatbl.h lle_event replaced arp_update_event after the ARP rewrite and ended up in if_ether.h simply because arp_update_event used to be there too. IPv6 neighbor discovery is going to grow lle_event support and this is a good time to move it to if_llatbl.h. The two in-tree consumers of this event - OFED and toecore - are not affected. Reviewed by: bz@ --- sys/net/if_llatbl.h | 10 ++++++++++ sys/netinet/if_ether.h | 11 ----------- 2 files changed, 10 insertions(+), 11 deletions(-) diff --git a/sys/net/if_llatbl.h b/sys/net/if_llatbl.h index 8da08ba6c4f6..39ecf7b1fa3f 100644 --- a/sys/net/if_llatbl.h +++ b/sys/net/if_llatbl.h @@ -205,4 +205,14 @@ lla_lookup(struct lltable *llt, u_int flags, const struct sockaddr *l3addr) } int lla_rt_output(struct rt_msghdr *, struct rt_addrinfo *); + +#include +enum { + LLENTRY_RESOLVED, + LLENTRY_TIMEDOUT, + LLENTRY_DELETED, + LLENTRY_EXPIRED, +}; +typedef void (*lle_event_fn)(void *, struct llentry *, int); +EVENTHANDLER_DECLARE(lle_event, lle_event_fn); #endif /* _NET_IF_LLATBL_H_ */ diff --git a/sys/netinet/if_ether.h b/sys/netinet/if_ether.h index e37a9642e0f2..23828f2a6927 100644 --- a/sys/netinet/if_ether.h +++ b/sys/netinet/if_ether.h @@ -120,17 +120,6 @@ void arprequest(struct ifnet *, struct in_addr *, struct in_addr *, void arp_ifinit(struct ifnet *, struct ifaddr *); void arp_ifinit2(struct ifnet *, struct ifaddr *, u_char *); void arp_ifscrub(struct ifnet *, uint32_t); - -#include -enum { - LLENTRY_RESOLVED, - LLENTRY_TIMEDOUT, - LLENTRY_DELETED, - LLENTRY_EXPIRED, -}; -typedef void (*lle_event_fn)(void *, struct llentry *, int); -EVENTHANDLER_DECLARE(lle_event, lle_event_fn); - #endif #endif