Module Name: src
Committed By: martin
Date: Thu Jun 7 17:42:25 UTC 2018
Modified Files:
src/sys/dev/pci [netbsd-8]: if_wm.c
src/sys/dev/pci/ixgbe [netbsd-8]: ixgbe.c ixv.c
src/sys/net [netbsd-8]: if_bridge.c if_gif.c if_pppoe.c
Log Message:
Pull up following revision(s) (requested by ozaki-r in ticket #843):
sys/dev/pci/ixgbe/ixv.c: revision 1.101
sys/net/if_bridge.c: revision 1.156
sys/net/if_pppoe.c: revision 1.138
sys/dev/pci/if_wm.c: revision 1.580
sys/dev/pci/ixgbe/ixgbe.c: revision 1.156
sys/net/if_gif.c: revision 1.142
Ensure to call if_register after interface initializations finish
To generate a diff of this commit:
cvs rdiff -u -r1.508.4.19 -r1.508.4.20 src/sys/dev/pci/if_wm.c
cvs rdiff -u -r1.88.2.18 -r1.88.2.19 src/sys/dev/pci/ixgbe/ixgbe.c
cvs rdiff -u -r1.56.2.15 -r1.56.2.16 src/sys/dev/pci/ixgbe/ixv.c
cvs rdiff -u -r1.134.6.10 -r1.134.6.11 src/sys/net/if_bridge.c
cvs rdiff -u -r1.126.2.10 -r1.126.2.11 src/sys/net/if_gif.c
cvs rdiff -u -r1.125.6.7 -r1.125.6.8 src/sys/net/if_pppoe.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/dev/pci/if_wm.c
diff -u src/sys/dev/pci/if_wm.c:1.508.4.19 src/sys/dev/pci/if_wm.c:1.508.4.20
--- src/sys/dev/pci/if_wm.c:1.508.4.19 Thu May 17 13:58:07 2018
+++ src/sys/dev/pci/if_wm.c Thu Jun 7 17:42:25 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: if_wm.c,v 1.508.4.19 2018/05/17 13:58:07 martin Exp $ */
+/* $NetBSD: if_wm.c,v 1.508.4.20 2018/06/07 17:42:25 martin Exp $ */
/*
* Copyright (c) 2001, 2002, 2003, 2004 Wasabi Systems, Inc.
@@ -83,7 +83,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_wm.c,v 1.508.4.19 2018/05/17 13:58:07 martin Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_wm.c,v 1.508.4.20 2018/06/07 17:42:25 martin Exp $");
#ifdef _KERNEL_OPT
#include "opt_net_mpsafe.h"
@@ -2825,8 +2825,8 @@ alloc_retry:
}
sc->sc_ipq = if_percpuq_create(&sc->sc_ethercom.ec_if);
ether_ifattach(ifp, enaddr);
- if_register(ifp);
ether_set_ifflags_cb(&sc->sc_ethercom, wm_ifflags_cb);
+ if_register(ifp);
rnd_attach_source(&sc->rnd_source, xname, RND_TYPE_NET,
RND_FLAG_DEFAULT);
Index: src/sys/dev/pci/ixgbe/ixgbe.c
diff -u src/sys/dev/pci/ixgbe/ixgbe.c:1.88.2.18 src/sys/dev/pci/ixgbe/ixgbe.c:1.88.2.19
--- src/sys/dev/pci/ixgbe/ixgbe.c:1.88.2.18 Tue Apr 17 08:20:06 2018
+++ src/sys/dev/pci/ixgbe/ixgbe.c Thu Jun 7 17:42:24 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: ixgbe.c,v 1.88.2.18 2018/04/17 08:20:06 martin Exp $ */
+/* $NetBSD: ixgbe.c,v 1.88.2.19 2018/06/07 17:42:24 martin Exp $ */
/******************************************************************************
@@ -1311,7 +1311,6 @@ ixgbe_setup_interface(device_t dev, stru
* We use per TX queue softint, so if_deferred_start_init() isn't
* used.
*/
- if_register(ifp);
ether_set_ifflags_cb(ec, ixgbe_ifflags_cb);
adapter->max_frame_size = ifp->if_mtu + ETHER_HDR_LEN + ETHER_CRC_LEN;
@@ -1360,6 +1359,8 @@ ixgbe_setup_interface(device_t dev, stru
/* Set autoselect media by default */
ifmedia_set(&adapter->media, IFM_ETHER | IFM_AUTO);
+ if_register(ifp);
+
return (0);
} /* ixgbe_setup_interface */
Index: src/sys/dev/pci/ixgbe/ixv.c
diff -u src/sys/dev/pci/ixgbe/ixv.c:1.56.2.15 src/sys/dev/pci/ixgbe/ixv.c:1.56.2.16
--- src/sys/dev/pci/ixgbe/ixv.c:1.56.2.15 Tue May 15 13:37:24 2018
+++ src/sys/dev/pci/ixgbe/ixv.c Thu Jun 7 17:42:24 2018
@@ -1,4 +1,4 @@
-/*$NetBSD: ixv.c,v 1.56.2.15 2018/05/15 13:37:24 martin Exp $*/
+/*$NetBSD: ixv.c,v 1.56.2.16 2018/06/07 17:42:24 martin Exp $*/
/******************************************************************************
@@ -1526,7 +1526,6 @@ ixv_setup_interface(device_t dev, struct
* We use per TX queue softint, so if_deferred_start_init() isn't
* used.
*/
- if_register(ifp);
ether_set_ifflags_cb(ec, ixv_ifflags_cb);
adapter->max_frame_size = ifp->if_mtu + IXGBE_MTU_HDR;
@@ -1565,6 +1564,8 @@ ixv_setup_interface(device_t dev, struct
ifmedia_add(&adapter->media, IFM_ETHER | IFM_AUTO, 0, NULL);
ifmedia_set(&adapter->media, IFM_ETHER | IFM_AUTO);
+ if_register(ifp);
+
return 0;
} /* ixv_setup_interface */
Index: src/sys/net/if_bridge.c
diff -u src/sys/net/if_bridge.c:1.134.6.10 src/sys/net/if_bridge.c:1.134.6.11
--- src/sys/net/if_bridge.c:1.134.6.10 Tue May 15 13:48:37 2018
+++ src/sys/net/if_bridge.c Thu Jun 7 17:42:25 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: if_bridge.c,v 1.134.6.10 2018/05/15 13:48:37 martin Exp $ */
+/* $NetBSD: if_bridge.c,v 1.134.6.11 2018/06/07 17:42:25 martin Exp $ */
/*
* Copyright 2001 Wasabi Systems, Inc.
@@ -80,7 +80,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_bridge.c,v 1.134.6.10 2018/05/15 13:48:37 martin Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_bridge.c,v 1.134.6.11 2018/06/07 17:42:25 martin Exp $");
#ifdef _KERNEL_OPT
#include "opt_bridge_ipf.h"
@@ -470,9 +470,8 @@ bridge_clone_create(struct if_clone *ifc
return error;
}
- if_register(ifp);
-
if_alloc_sadl(ifp);
+ if_register(ifp);
return 0;
}
Index: src/sys/net/if_gif.c
diff -u src/sys/net/if_gif.c:1.126.2.10 src/sys/net/if_gif.c:1.126.2.11
--- src/sys/net/if_gif.c:1.126.2.10 Thu May 17 14:07:03 2018
+++ src/sys/net/if_gif.c Thu Jun 7 17:42:25 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: if_gif.c,v 1.126.2.10 2018/05/17 14:07:03 martin Exp $ */
+/* $NetBSD: if_gif.c,v 1.126.2.11 2018/06/07 17:42:25 martin Exp $ */
/* $KAME: if_gif.c,v 1.76 2001/08/20 02:01:02 kjc Exp $ */
/*
@@ -31,7 +31,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_gif.c,v 1.126.2.10 2018/05/17 14:07:03 martin Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_gif.c,v 1.126.2.11 2018/06/07 17:42:25 martin Exp $");
#ifdef _KERNEL_OPT
#include "opt_inet.h"
@@ -308,9 +308,9 @@ gifattach0(struct gif_softc *sc)
if (rv != 0)
return rv;
- if_register(&sc->gif_if);
if_alloc_sadl(&sc->gif_if);
bpf_attach(&sc->gif_if, DLT_NULL, sizeof(u_int));
+ if_register(&sc->gif_if);
return 0;
}
Index: src/sys/net/if_pppoe.c
diff -u src/sys/net/if_pppoe.c:1.125.6.7 src/sys/net/if_pppoe.c:1.125.6.8
--- src/sys/net/if_pppoe.c:1.125.6.7 Wed Apr 18 14:16:57 2018
+++ src/sys/net/if_pppoe.c Thu Jun 7 17:42:25 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: if_pppoe.c,v 1.125.6.7 2018/04/18 14:16:57 martin Exp $ */
+/* $NetBSD: if_pppoe.c,v 1.125.6.8 2018/06/07 17:42:25 martin Exp $ */
/*-
* Copyright (c) 2002, 2008 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_pppoe.c,v 1.125.6.7 2018/04/18 14:16:57 martin Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_pppoe.c,v 1.125.6.8 2018/06/07 17:42:25 martin Exp $");
#ifdef _KERNEL_OPT
#include "pppoe.h"
@@ -336,12 +336,12 @@ pppoe_clone_create(struct if_clone *ifc,
}
sc->sc_sppp.pp_if.if_percpuq = if_percpuq_create(&sc->sc_sppp.pp_if);
sppp_attach(&sc->sc_sppp.pp_if);
- if_register(&sc->sc_sppp.pp_if);
bpf_attach(&sc->sc_sppp.pp_if, DLT_PPP_ETHER, 0);
if (LIST_EMPTY(&pppoe_softc_list)) {
pfil_add_ihook(pppoe_ifattach_hook, NULL, PFIL_IFNET, if_pfil);
}
+ if_register(&sc->sc_sppp.pp_if);
rw_init(&sc->sc_lock);
