From owner-svn-src-stable@freebsd.org Wed Feb 22 07:42:30 2017 Return-Path: Delivered-To: svn-src-stable@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 1940BCE9151; Wed, 22 Feb 2017 07:42:30 +0000 (UTC) (envelope-from dexuan@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id D9358166A; Wed, 22 Feb 2017 07:42:29 +0000 (UTC) (envelope-from dexuan@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v1M7gSE3036695; Wed, 22 Feb 2017 07:42:28 GMT (envelope-from dexuan@FreeBSD.org) Received: (from dexuan@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v1M7gSMA036693; Wed, 22 Feb 2017 07:42:28 GMT (envelope-from dexuan@FreeBSD.org) Message-Id: <201702220742.v1M7gSMA036693@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: dexuan set sender to dexuan@FreeBSD.org using -f From: Dexuan Cui Date: Wed, 22 Feb 2017 07:42:28 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-11@freebsd.org Subject: svn commit: r314089 - stable/11/sys/net X-SVN-Group: stable-11 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-stable@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: SVN commit messages for all the -stable branches of the src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 22 Feb 2017 07:42:30 -0000 Author: dexuan Date: Wed Feb 22 07:42:28 2017 New Revision: 314089 URL: https://svnweb.freebsd.org/changeset/base/314089 Log: revert the MFC r314085 Sorry, I generated a wrong commit log for r314085 due to a copy&pasate mistake. Let me revert it and I'll redo the MFC. Modified: stable/11/sys/net/if.c stable/11/sys/net/if_var.h Modified: stable/11/sys/net/if.c ============================================================================== --- stable/11/sys/net/if.c Wed Feb 22 07:12:20 2017 (r314088) +++ stable/11/sys/net/if.c Wed Feb 22 07:42:28 2017 (r314089) @@ -2218,7 +2218,6 @@ void if_down(struct ifnet *ifp) { - EVENTHANDLER_INVOKE(ifnet_event, ifp, IFNET_EVENT_DOWN); if_unroute(ifp, IFF_UP, AF_UNSPEC); } @@ -2231,7 +2230,6 @@ if_up(struct ifnet *ifp) { if_route(ifp, IFF_UP, AF_UNSPEC); - EVENTHANDLER_INVOKE(ifnet_event, ifp, IFNET_EVENT_UP); } /* Modified: stable/11/sys/net/if_var.h ============================================================================== --- stable/11/sys/net/if_var.h Wed Feb 22 07:12:20 2017 (r314088) +++ stable/11/sys/net/if_var.h Wed Feb 22 07:42:28 2017 (r314089) @@ -359,11 +359,6 @@ EVENTHANDLER_DECLARE(ifnet_departure_eve /* Interface link state change event */ typedef void (*ifnet_link_event_handler_t)(void *, struct ifnet *, int); EVENTHANDLER_DECLARE(ifnet_link_event, ifnet_link_event_handler_t); -/* Interface up/down event */ -#define IFNET_EVENT_UP 0 -#define IFNET_EVENT_DOWN 1 -typedef void (*ifnet_event_fn)(void *, struct ifnet *ifp, int event); -EVENTHANDLER_DECLARE(ifnet_event, ifnet_event_fn); #endif /* _SYS_EVENTHANDLER_H_ */ /*