From owner-svn-src-all@FreeBSD.ORG Fri Jan 25 23:58:22 2013 Return-Path: Delivered-To: svn-src-all@freebsd.org Received: from mx1.freebsd.org (mx1.FreeBSD.org [8.8.178.115]) by hub.freebsd.org (Postfix) with ESMTP id 6ABFC74C; Fri, 25 Jan 2013 23:58:22 +0000 (UTC) (envelope-from np@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) by mx1.freebsd.org (Postfix) with ESMTP id 5D638197; Fri, 25 Jan 2013 23:58:22 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.5/8.14.5) with ESMTP id r0PNwM6w070197; Fri, 25 Jan 2013 23:58:22 GMT (envelope-from np@svn.freebsd.org) Received: (from np@localhost) by svn.freebsd.org (8.14.5/8.14.5/Submit) id r0PNwMLB070195; Fri, 25 Jan 2013 23:58:22 GMT (envelope-from np@svn.freebsd.org) Message-Id: <201301252358.r0PNwMLB070195@svn.freebsd.org> From: Navdeep Parhar Date: Fri, 25 Jan 2013 23:58:22 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r245924 - in head/sys: net netinet X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 25 Jan 2013 23:58:22 -0000 Author: np Date: Fri Jan 25 23:58:21 2013 New Revision: 245924 URL: http://svnweb.freebsd.org/changeset/base/245924 Log: 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@ Modified: head/sys/net/if_llatbl.h head/sys/netinet/if_ether.h Modified: head/sys/net/if_llatbl.h ============================================================================== --- head/sys/net/if_llatbl.h Fri Jan 25 23:44:02 2013 (r245923) +++ head/sys/net/if_llatbl.h Fri Jan 25 23:58:21 2013 (r245924) @@ -205,4 +205,14 @@ lla_lookup(struct lltable *llt, u_int fl } 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_ */ Modified: head/sys/netinet/if_ether.h ============================================================================== --- head/sys/netinet/if_ether.h Fri Jan 25 23:44:02 2013 (r245923) +++ head/sys/netinet/if_ether.h Fri Jan 25 23:58:21 2013 (r245924) @@ -120,17 +120,6 @@ void arprequest(struct ifnet *, struct i 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