Aren
/
NetBSD
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Add missing {ixgbe,ixv}_stop() in the detach function. Without this change, 

shutdown won't finish or panic on heay traffic.
This commit is contained in:
msaitoh 2017-05-26 09:17:32 +00:00
parent 2e49ec1546
commit 7bf1852420
2 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
sys/dev/pci/ixgbe/ixgbe.c
View File

@ -59,7 +59,7 @@
* POSSIBILITY OF SUCH DAMAGE.
*/
/*$FreeBSD: head/sys/dev/ixgbe/if_ix.c 302384 2016-07-07 03:39:18Z sbruno $*/
/*$NetBSD: ixgbe.c,v 1.86 2017/05/26 08:36:41 msaitoh Exp $*/
/*$NetBSD: ixgbe.c,v 1.87 2017/05/26 09:17:32 msaitoh Exp $*/
#ifdef _KERNEL_OPT
#include "opt_inet.h"
@ -774,6 +774,8 @@ ixgbe_detach(device_t dev, int flags)
if (adapter->osdep.attached == false)
return 0;
/* Stop the interface. Callouts are stopped in it. */
ixgbe_ifstop(adapter->ifp, 1);
#if NVLAN > 0
/* Make sure VLANs are not using driver */
if (!VLAN_ATTACHED(&adapter->osdep.ec))

6
sys/dev/pci/ixgbe/ixv.c
View File

@ -31,7 +31,7 @@
******************************************************************************/
/*$FreeBSD: head/sys/dev/ixgbe/if_ixv.c 302384 2016-07-07 03:39:18Z sbruno $*/
/*$NetBSD: ixv.c,v 1.55 2017/03/03 04:37:05 msaitoh Exp $*/
/*$NetBSD: ixv.c,v 1.56 2017/05/26 09:17:32 msaitoh Exp $*/
#ifdef _KERNEL_OPT
#include "opt_inet.h"
@ -87,6 +87,7 @@ static int ixv_shutdown(device_t);
static int ixv_ioctl(struct ifnet *, u_long, void *);
static int ixv_init(struct ifnet *);
static void ixv_init_locked(struct adapter *);
static void ixv_ifstop(struct ifnet *, int);
static void ixv_stop(void *);
static void ixv_media_status(struct ifnet *, struct ifmediareq *);
static int ixv_media_change(struct ifnet *);
@ -498,6 +499,9 @@ ixv_detach(device_t dev, int flags)
if (adapter->osdep.attached == false)
return 0;
/* Stop the interface. Callouts are stopped in it. */
ixv_ifstop(adapter->ifp, 1);
#if NVLAN > 0
/* Make sure VLANS are not using driver */
if (!VLAN_ATTACHED(&adapter->osdep.ec))