[src/trunk]: src/sys/dev/pci Fix ixl_{add|remove}_macvlan() to return errno

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

details:   https://anonhg.NetBSD.org/src/rev/9f7ec7263934
branches:  trunk
changeset: 847365:9f7ec7263934
user:      yamaguchi <yamaguchi%NetBSD.org@localhost>
date:      Fri Dec 20 01:45:20 2019 +0000

description:
Fix ixl_{add|remove}_macvlan() to return errno
instead of command status

diffstat:

 sys/dev/pci/if_ixl.c |  55 ++++++++++++++++++++++++++++++++++++++-------------
 1 files changed, 41 insertions(+), 14 deletions(-)

diffs (123 lines):

diff -r 431b33a0cb35 -r 9f7ec7263934 sys/dev/pci/if_ixl.c
--- a/sys/dev/pci/if_ixl.c      Fri Dec 20 01:18:53 2019 +0000
+++ b/sys/dev/pci/if_ixl.c      Fri Dec 20 01:45:20 2019 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: if_ixl.c,v 1.6 2019/12/20 01:18:53 yamaguchi Exp $     */
+/*     $NetBSD: if_ixl.c,v 1.7 2019/12/20 01:45:20 yamaguchi Exp $     */
 
 /*
  * Copyright (c) 2013-2015, Intel Corporation
@@ -1448,16 +1448,13 @@
        rv = ixl_add_macvlan(sc, addrlo, 0,
            IXL_AQ_OP_ADD_MACVLAN_IGNORE_VLAN);
 
-       if (rv == IXL_AQ_RC_ENOSPC) {
+       if (rv == ENOSPC) {
                ixl_del_all_multiaddr(sc);
                SET(ifp->if_flags, IFF_ALLMULTI);
                return 0;
        }
 
-       if (rv != IXL_AQ_RC_OK)
-               return EIO;
-
-       return 0;
+       return rv;
 }
 
 static void
@@ -1489,7 +1486,7 @@
            ETHER_NEXT_MULTI(step, enm)) {
                rv = ixl_add_macvlan(sc, enm->enm_addrlo, 0,
                    IXL_AQ_OP_ADD_MACVLAN_IGNORE_VLAN);
-               if (rv != IXL_AQ_RC_OK)
+               if (rv != 0)
                        break;
        }
 
@@ -4180,7 +4177,24 @@
                return IXL_AQ_RC_EINVAL;
        }
 
-       return le16toh(iaq.iaq_retval);
+       switch (le16toh(iaq.iaq_retval)) {
+       case IXL_AQ_RC_OK:
+               break;
+       case IXL_AQ_RC_ENOSPC:
+               return ENOSPC;
+       case IXL_AQ_RC_ENOENT:
+               return ENOENT;
+       case IXL_AQ_RC_EACCES:
+               return EACCES;
+       case IXL_AQ_RC_EEXIST:
+               return EEXIST;
+       case IXL_AQ_RC_EINVAL:
+               return EINVAL;
+       default:
+               return EIO;
+       }
+
+       return 0;
 }
 
 static int
@@ -4210,10 +4224,23 @@
        elem->vlan = htole16(vlan);
 
        if (ixl_atq_poll(sc, &iaq, 250) != 0) {
-               return IXL_AQ_RC_EINVAL;
+               return EINVAL;
        }
 
-       return le16toh(iaq.iaq_retval);
+       switch (le16toh(iaq.iaq_retval)) {
+       case IXL_AQ_RC_OK:
+               break;
+       case IXL_AQ_RC_ENOENT:
+               return ENOENT;
+       case IXL_AQ_RC_EACCES:
+               return EACCES;
+       case IXL_AQ_RC_EINVAL:
+               return EINVAL;
+       default:
+               return EIO;
+       }
+
+       return 0;
 }
 
 static int
@@ -4756,14 +4783,14 @@
        /* remove default mac filter and replace it so we can see vlans */
 
        error = ixl_remove_macvlan(sc, sc->sc_enaddr, 0, 0);
-       if (error != IXL_AQ_RC_OK) {
+       if (error != 0 && error != ENOENT) {
                aprint_debug_dev(sc->sc_dev, "unable to remove macvlan\n");
                rv = -1;
        }
 
        error = ixl_remove_macvlan(sc, sc->sc_enaddr, 0,
            IXL_AQ_OP_REMOVE_MACVLAN_IGNORE_VLAN);
-       if (error != IXL_AQ_RC_OK && error != IXL_AQ_RC_ENOENT) {
+       if (error != 0 && error != ENOENT) {
                aprint_debug_dev(sc->sc_dev,
                    "unable to remove macvlan(IGNORE_VLAN)\n");
                rv = -1;
@@ -4771,14 +4798,14 @@
 
        error = ixl_add_macvlan(sc, sc->sc_enaddr, 0,
            IXL_AQ_OP_ADD_MACVLAN_IGNORE_VLAN);
-       if (error != IXL_AQ_RC_OK) {
+       if (error != 0) {
                aprint_debug_dev(sc->sc_dev, "unable to add mac address\n");
                rv = -1;
        }
 
        error = ixl_add_macvlan(sc, etherbroadcastaddr, 0,
            IXL_AQ_OP_ADD_MACVLAN_IGNORE_VLAN);
-       if (error != IXL_AQ_RC_OK) {
+       if (error != 0) {
                aprint_debug_dev(sc->sc_dev,
                    "unable to add broadcast mac address\n");
                rv = -1;