[src/trunk]: src/sys/dev/ic Fix assertion failure in bpf_mtap by applying def...

[ozaki-r <ozaki-r%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/7d231f83baba
branches:  trunk
changeset: 821875:7d231f83baba
user:      ozaki-r <ozaki-r%NetBSD.org@localhost>
date:      Mon Feb 20 06:46:41 2017 +0000

description:
Fix assertion failure in bpf_mtap by applying deferred if_start to re(4)

Reported by maya@

diffstat:

 sys/dev/ic/rtl8169.c |  9 +++++----
 1 files changed, 5 insertions(+), 4 deletions(-)

diffs (37 lines):

diff -r 8078e2b9fc4d -r 7d231f83baba sys/dev/ic/rtl8169.c
--- a/sys/dev/ic/rtl8169.c      Mon Feb 20 06:18:48 2017 +0000
+++ b/sys/dev/ic/rtl8169.c      Mon Feb 20 06:46:41 2017 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: rtl8169.c,v 1.148 2016/12/15 09:28:05 ozaki-r Exp $    */
+/*     $NetBSD: rtl8169.c,v 1.149 2017/02/20 06:46:41 ozaki-r Exp $    */
 
 /*
  * Copyright (c) 1997, 1998-2003
@@ -33,7 +33,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: rtl8169.c,v 1.148 2016/12/15 09:28:05 ozaki-r Exp $");
+__KERNEL_RCSID(0, "$NetBSD: rtl8169.c,v 1.149 2017/02/20 06:46:41 ozaki-r Exp $");
 /* $FreeBSD: /repoman/r/ncvs/src/sys/dev/re/if_re.c,v 1.20 2004/04/11 20:34:08 ru Exp $ */
 
 /*
@@ -869,6 +869,7 @@
         * Call MI attach routine.
         */
        if_attach(ifp);
+       if_deferred_start_init(ifp, NULL);
        ether_ifattach(ifp, eaddr);
 
        rnd_attach_source(&sc->rnd_source, device_xname(sc->sc_dev),
@@ -1496,8 +1497,8 @@
                }
        }
 
-       if (handled && !IFQ_IS_EMPTY(&ifp->if_snd))
-               re_start(ifp);
+       if (handled)
+               if_schedule_deferred_start(ifp);
 
        rnd_add_uint32(&sc->rnd_source, status);