[src/trunk]: src/sys/dev/pci/ixgbe No functional change:

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

details:   https://anonhg.NetBSD.org/src/rev/9117fe2fc27d
branches:  trunk
changeset: 930913:9117fe2fc27d
user:      msaitoh <msaitoh%NetBSD.org@localhost>
date:      Fri Apr 17 02:21:25 2020 +0000

description:
No functional change:
 - modify comment
 - whitespace fix

diffstat:

 sys/dev/pci/ixgbe/ix_txrx.c      |  8 ++++----
 sys/dev/pci/ixgbe/ixgbe.c        |  4 ++--
 sys/dev/pci/ixgbe/ixgbe_netbsd.c |  4 ++--
 sys/dev/pci/ixgbe/ixgbe_phy.c    |  4 ++--
 sys/dev/pci/ixgbe/ixv.c          |  6 +++---
 5 files changed, 13 insertions(+), 13 deletions(-)

diffs (117 lines):

diff -r 1dcf2811a606 -r 9117fe2fc27d sys/dev/pci/ixgbe/ix_txrx.c
--- a/sys/dev/pci/ixgbe/ix_txrx.c       Thu Apr 16 23:29:52 2020 +0000
+++ b/sys/dev/pci/ixgbe/ix_txrx.c       Fri Apr 17 02:21:25 2020 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: ix_txrx.c,v 1.62 2020/02/05 07:45:46 msaitoh Exp $ */
+/* $NetBSD: ix_txrx.c,v 1.63 2020/04/17 02:21:25 msaitoh Exp $ */
 
 /******************************************************************************
 
@@ -919,7 +919,7 @@
        vlan_macip_lens |= ip_hlen;
 
        /* No support for offloads for non-L4 next headers */
-       switch (ipproto) {
+       switch (ipproto) {
        case IPPROTO_TCP:
                if (mp->m_pkthdr.csum_flags &
                    (M_CSUM_TCPv4 | M_CSUM_TCPv6))
@@ -2220,7 +2220,7 @@
 
        /* First, allocate the top level queue structs */
        adapter->queues = (struct ix_queue *)malloc(sizeof(struct ix_queue) *
-            adapter->num_queues, M_DEVBUF, M_WAITOK | M_ZERO);
+           adapter->num_queues, M_DEVBUF, M_WAITOK | M_ZERO);
 
        /* Second, allocate the TX ring struct memory */
        adapter->tx_rings = malloc(sizeof(struct tx_ring) *
@@ -2272,7 +2272,7 @@
                            "Critical Failure setting up transmit buffers\n");
                        error = ENOMEM;
                        goto err_tx_desc;
-               }
+               }
                if (!(adapter->feat_en & IXGBE_FEATURE_LEGACY_TX)) {
                        /* Allocate a buf ring */
                        txr->txr_interq = pcq_create(IXGBE_BR_SIZE, KM_SLEEP);
diff -r 1dcf2811a606 -r 9117fe2fc27d sys/dev/pci/ixgbe/ixgbe.c
--- a/sys/dev/pci/ixgbe/ixgbe.c Thu Apr 16 23:29:52 2020 +0000
+++ b/sys/dev/pci/ixgbe/ixgbe.c Fri Apr 17 02:21:25 2020 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: ixgbe.c,v 1.227 2020/03/15 23:04:50 thorpej Exp $ */
+/* $NetBSD: ixgbe.c,v 1.228 2020/04/17 02:21:25 msaitoh Exp $ */
 
 /******************************************************************************
 
@@ -3227,7 +3227,7 @@
        if (rate > 0 && rate < 500000) {
                if (rate < 1000)
                        rate = 1000;
-               reg |= ((4000000/rate) & 0xff8);
+               reg |= ((4000000 / rate) & 0xff8);
                /*
                 * When RSC is used, ITR interval must be larger than
                 * RSC_DELAY. Currently, we use 2us for RSC_DELAY.
diff -r 1dcf2811a606 -r 9117fe2fc27d sys/dev/pci/ixgbe/ixgbe_netbsd.c
--- a/sys/dev/pci/ixgbe/ixgbe_netbsd.c  Thu Apr 16 23:29:52 2020 +0000
+++ b/sys/dev/pci/ixgbe/ixgbe_netbsd.c  Fri Apr 17 02:21:25 2020 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: ixgbe_netbsd.c,v 1.13 2020/02/01 02:33:08 riastradh Exp $ */
+/* $NetBSD: ixgbe_netbsd.c,v 1.14 2020/04/17 02:21:25 msaitoh Exp $ */
 /*
  * Copyright (c) 2011 The NetBSD Foundation, Inc.
  * All rights reserved.
@@ -79,7 +79,7 @@
 void
 ixgbe_dmamap_sync(ixgbe_dma_tag_t *dt, bus_dmamap_t dmam, int ops)
 {
-        bus_dmamap_sync(dt->dt_dmat, dmam, 0, dt->dt_maxsize, ops);
+       bus_dmamap_sync(dt->dt_dmat, dmam, 0, dt->dt_maxsize, ops);
 }
 
 void
diff -r 1dcf2811a606 -r 9117fe2fc27d sys/dev/pci/ixgbe/ixgbe_phy.c
--- a/sys/dev/pci/ixgbe/ixgbe_phy.c     Thu Apr 16 23:29:52 2020 +0000
+++ b/sys/dev/pci/ixgbe/ixgbe_phy.c     Fri Apr 17 02:21:25 2020 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: ixgbe_phy.c,v 1.20 2019/12/23 09:36:18 msaitoh Exp $ */
+/* $NetBSD: ixgbe_phy.c,v 1.21 2020/04/17 02:21:25 msaitoh Exp $ */
 
 /******************************************************************************
   SPDX-License-Identifier: BSD-3-Clause
@@ -1786,7 +1786,7 @@
 
        /* Determine PHY vendor for optical modules */
        if (comp_codes_10g & (IXGBE_SFF_10GBASESR_CAPABLE |
-                             IXGBE_SFF_10GBASELR_CAPABLE))  {
+                             IXGBE_SFF_10GBASELR_CAPABLE)) {
                status = hw->phy.ops.read_i2c_eeprom(hw,
                                            IXGBE_SFF_QSFP_VENDOR_OUI_BYTE0,
                                            &oui_bytes[0]);
diff -r 1dcf2811a606 -r 9117fe2fc27d sys/dev/pci/ixgbe/ixv.c
--- a/sys/dev/pci/ixgbe/ixv.c   Thu Apr 16 23:29:52 2020 +0000
+++ b/sys/dev/pci/ixgbe/ixv.c   Fri Apr 17 02:21:25 2020 +0000
@@ -1,4 +1,4 @@
-/*$NetBSD: ixv.c,v 1.147 2020/03/15 23:04:50 thorpej Exp $*/
+/*$NetBSD: ixv.c,v 1.148 2020/04/17 02:21:25 msaitoh Exp $*/
 
 /******************************************************************************
 
@@ -1168,7 +1168,7 @@
                        ETHER_LOCK(ec);
                        ec->ec_flags |= ETHER_F_ALLMULTI;
                        ETHER_UNLOCK(ec);
-                       return rc; /* Promisc might failed */
+                       return rc; /* Promisc might have failed */
                }
 
                if (rc == 0)
@@ -2429,7 +2429,7 @@
        if (rate > 0 && rate < 500000) {
                if (rate < 1000)
                        rate = 1000;
-               reg |= ((4000000/rate) & 0xff8);
+               reg |= ((4000000 / rate) & 0xff8);
                /*
                 * When RSC is used, ITR interval must be larger than
                 * RSC_DELAY. Currently, we use 2us for RSC_DELAY.