[src/trunk]: src/sys/arch/xen/xen don't check for IFF_OACTIVE, nothing sets it

[jdolecek <jdolecek%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/4939dad437b3
branches:  trunk
changeset: 1008674:4939dad437b3
user:      jdolecek <jdolecek%NetBSD.org@localhost>
date:      Mon Mar 30 19:07:32 2020 +0000

description:
don't check for IFF_OACTIVE, nothing sets it

diffstat:

 sys/arch/xen/xen/xennetback_xenbus.c |  14 ++++++--------
 1 files changed, 6 insertions(+), 8 deletions(-)

diffs (56 lines):

diff -r 27d3a03b9676 -r 4939dad437b3 sys/arch/xen/xen/xennetback_xenbus.c
--- a/sys/arch/xen/xen/xennetback_xenbus.c      Mon Mar 30 17:32:22 2020 +0000
+++ b/sys/arch/xen/xen/xennetback_xenbus.c      Mon Mar 30 19:07:32 2020 +0000
@@ -1,4 +1,4 @@
-/*      $NetBSD: xennetback_xenbus.c,v 1.89 2020/03/30 15:31:52 jdolecek Exp $      */
+/*      $NetBSD: xennetback_xenbus.c,v 1.90 2020/03/30 19:07:32 jdolecek Exp $      */
 
 /*
  * Copyright (c) 2006 Manuel Bouyer.
@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: xennetback_xenbus.c,v 1.89 2020/03/30 15:31:52 jdolecek Exp $");
+__KERNEL_RCSID(0, "$NetBSD: xennetback_xenbus.c,v 1.90 2020/03/30 19:07:32 jdolecek Exp $");
 
 #include "opt_xen.h"
 
@@ -600,7 +600,7 @@
 
        case XenbusStateClosing:
                xneti->xni_status = DISCONNECTING;
-               xneti->xni_if.if_flags &= ~(IFF_RUNNING | IFF_OACTIVE);
+               xneti->xni_if.if_flags &= ~IFF_RUNNING;
                xneti->xni_if.if_timer = 0;
                xenbus_switch_state(xbusd, NULL, XenbusStateClosing);
                break;
@@ -960,8 +960,7 @@
 
        XENPRINTF(("xennetback_ifsoftstart_transfer "));
        int s = splnet();
-       if (__predict_false(
-           (ifp->if_flags & (IFF_RUNNING|IFF_OACTIVE)) != IFF_RUNNING)) {
+       if (__predict_false((ifp->if_flags & IFF_RUNNING) == 0)) {
                splx(s);
                return;
        }
@@ -1270,8 +1269,7 @@
 
        XENPRINTF(("xennetback_ifsoftstart_copy "));
        int s = splnet();
-       if (__predict_false(
-           (ifp->if_flags & (IFF_RUNNING|IFF_OACTIVE)) != IFF_RUNNING)) {
+       if (__predict_false((ifp->if_flags & IFF_RUNNING) == 0)) {
                splx(s);
                return;
        }
@@ -1467,7 +1465,7 @@
        struct xnetback_instance *xneti = ifp->if_softc;
        int s = splnet();
 
-       ifp->if_flags &= ~(IFF_RUNNING | IFF_OACTIVE);
+       ifp->if_flags &= ~IFF_RUNNING;
        ifp->if_timer = 0;
        if (xneti->xni_status == CONNECTED) {
                XENPRINTF(("%s: req_prod 0x%x resp_prod 0x%x req_cons 0x%x "