From acfbfe5d08cd0049c7056edd0f606472e4bd9ea2 Mon Sep 17 00:00:00 2001
From: sephe <sephe@FreeBSD.org>
Date: Tue, 21 Feb 2017 03:00:33 +0000
Subject: MFC 311475

    if: Defer the if_up until the ifnet.if_ioctl is called.

    This ensures the interface is initialized by the interface driver
    before it can be used by the rest of the system.

    Reviewed by:    jhb, karels, gnn
    Sponsored by:   Microsoft
    Differential Revision:  https://reviews.freebsd.org/D8905
---
 sys/net/if.c | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

(limited to 'sys/net/if.c')

diff --git a/sys/net/if.c b/sys/net/if.c
index 881cd60..67f086b 100644
--- a/sys/net/if.c
+++ b/sys/net/if.c
@@ -2266,7 +2266,7 @@ ifhwioctl(u_long cmd, struct ifnet *ifp, caddr_t data, struct thread *td)
 {
 	struct ifreq *ifr;
 	struct ifstat *ifs;
-	int error = 0;
+	int error = 0, do_ifup = 0;
 	int new_flags, temp_flags;
 	size_t namelen, onamelen;
 	size_t descrlen;
@@ -2394,7 +2394,7 @@ ifhwioctl(u_long cmd, struct ifnet *ifp, caddr_t data, struct thread *td)
 			if_down(ifp);
 		} else if (new_flags & IFF_UP &&
 		    (ifp->if_flags & IFF_UP) == 0) {
-			if_up(ifp);
+			do_ifup = 1;
 		}
 		/* See if permanently promiscuous mode bit is about to flip */
 		if ((ifp->if_flags ^ new_flags) & IFF_PPROMISC) {
@@ -2413,6 +2413,8 @@ ifhwioctl(u_long cmd, struct ifnet *ifp, caddr_t data, struct thread *td)
 		if (ifp->if_ioctl) {
 			(void) (*ifp->if_ioctl)(ifp, cmd, data);
 		}
+		if (do_ifup)
+			if_up(ifp);
 		getmicrotime(&ifp->if_lastchange);
 		break;
 
-- 
cgit v1.1


From 801edb7982092c7fdc32ca79e679bc44e314d71f Mon Sep 17 00:00:00 2001
From: dexuan <dexuan@FreeBSD.org>
Date: Thu, 23 Feb 2017 06:57:18 +0000
Subject: MFC: r312687, r312916

Approved by:	sephe (mentor)

r312687
    ifnet: introduce event handlers for ifup/ifdown events

    Hyper-V's NIC SR-IOV implementation needs a Hyper-V synthetic NIC and
    a VF NIC to work together, mainly to support seamless live migration.

    When the VF device becomes UP (or DOWN), the synthetic NIC driver needs
    to switch the data path from the synthetic NIC to the VF (or the opposite).

    So the synthetic NIC driver needs to know when a VF device is becoming
    UP or DOWN and hence the patch is made.

    Reviewed by:	sephe
    Approved by:	sephe (mentor)
    Sponsored by:	Microsoft
    Differential Revision:	https://reviews.freebsd.org/D8963

r312916
    ifnet: move the new ifnet_event EVENTHANDLER_DECLARE to net/if_var.h

    Thank glebius for pointing this out:
    "The network stuff shall not be added to sys/eventhandler.h"

    Reviewed by:	David_A_Bright_DELL.com, sephe, glebius
    Approved by:	sephe (mentor)
    Sponsored by:	Microsoft
    Differential Revision:	https://reviews.freebsd.org/D9345
---
 sys/net/if.c | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'sys/net/if.c')

diff --git a/sys/net/if.c b/sys/net/if.c
index 67f086b..625b6d0 100644
--- a/sys/net/if.c
+++ b/sys/net/if.c
@@ -2183,6 +2183,7 @@ void
 if_down(struct ifnet *ifp)
 {
 
+	EVENTHANDLER_INVOKE(ifnet_event, ifp, IFNET_EVENT_DOWN);
 	if_unroute(ifp, IFF_UP, AF_UNSPEC);
 }
 
@@ -2195,6 +2196,7 @@ if_up(struct ifnet *ifp)
 {
 
 	if_route(ifp, IFF_UP, AF_UNSPEC);
+	EVENTHANDLER_INVOKE(ifnet_event, ifp, IFNET_EVENT_UP);
 }
 
 /*
-- 
cgit v1.1