 @@ -1,14 +1,14 @@
-/* $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 $ */
 /******************************************************************************
   Copyright (c) 2001-2017, Intel Corporation
   All rights reserved.
   Redistribution and use in source and binary forms, with or without
   modification, are permitted provided that the following conditions are met:
 . Redistributions of source code must retain the above copyright notice,
       this list of conditions and the following disclaimer.
 . Redistributions in binary form must reproduce the above copyright
 @@ -909,27 +909,27 @@ ixgbe_tx_ctx_setup(struct tx_ring *txr,
 		break;
 #endif
 	default:
 		offload = false;
 		break;
+	}
 	if ((mp->m_pkthdr.csum_flags & M_CSUM_IPv4) != 0)
 		*olinfo_status |= IXGBE_TXD_POPTS_IXSM << 8;
 	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))
 			type_tucmd_mlhl |= IXGBE_ADVTXD_TUCMD_L4T_TCP;
 		else
 			offload = false;
 		break;
 	case IPPROTO_UDP:
 		if (mp->m_pkthdr.csum_flags &
 		    (M_CSUM_UDPv4 | M_CSUM_UDPv6))
 			type_tucmd_mlhl |= IXGBE_ADVTXD_TUCMD_L4T_UDP;
 		else
 			offload = false;
 @@ -2210,27 +2210,27 @@ ixgbe_dma_free(struct adapter *adapter,
  ************************************************************************/
 int
 ixgbe_allocate_queues(struct adapter *adapter)
+{
 	device_t	dev = adapter->dev;
 	struct ix_queue	*que;
 	struct tx_ring	*txr;
 	struct rx_ring	*rxr;
 	int             rsize, tsize, error = IXGBE_SUCCESS;
 	int             txconf = 0, rxconf = 0;
 	/* 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) *
 	    adapter->num_queues, M_DEVBUF, M_WAITOK | M_ZERO);
 	/* Third, allocate the RX ring */
 	adapter->rx_rings = (struct rx_ring *)malloc(sizeof(struct rx_ring) *
 	    adapter->num_queues, M_DEVBUF, M_WAITOK | M_ZERO);
 	/* For the ring itself */
 	tsize = roundup2(adapter->num_tx_desc * sizeof(union ixgbe_adv_tx_desc),
 	    DBA_ALIGN);
 @@ -2262,27 +2262,27 @@ ixgbe_allocate_queues(struct adapter *ad
 			    "Unable to allocate TX Descriptor memory\n");
 			error = ENOMEM;
 			goto err_tx_desc;
+		}
 		txr->tx_base = (union ixgbe_adv_tx_desc *)txr->txdma.dma_vaddr;
 		bzero((void *)txr->tx_base, tsize);
 		/* Now allocate transmit buffers for the ring */
 		if (ixgbe_allocate_transmit_buffers(txr)) {
 			aprint_error_dev(dev,
 			    "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);
 			if (txr->txr_interq == NULL) {
 				aprint_error_dev(dev,
 				    "Critical Failure setting up buf ring\n");
 				error = ENOMEM;
 				goto err_tx_desc;
+			}
+		}
+	}
 	/*

 @@ -1,14 +1,14 @@
-/* $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 $ */
 /******************************************************************************
   Copyright (c) 2001-2017, Intel Corporation
   All rights reserved.
   Redistribution and use in source and binary forms, with or without
   modification, are permitted provided that the following conditions are met:
 . Redistributions of source code must retain the above copyright notice,
       this list of conditions and the following disclaimer.
 . Redistributions in binary form must reproduce the above copyright
 @@ -3217,27 +3217,27 @@ ixgbe_sysctl_interrupt_rate_handler(SYSC
 	usec = ((reg & 0x0FF8) >> 3);
 	if (usec > 0)
 		rate = 500000 / usec;
 	else
 		rate = 0;
 	node.sysctl_data = &rate;
 	error = sysctl_lookup(SYSCTLFN_CALL(&node));
 	if (error || newp == NULL)
 		return error;
 	reg &= ~0xfff; /* default, no limitation */
 	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.
 		 * The minimum value is always greater than 2us on 100M
 		 * (and 10M?(not documented)), but it's not on 1G and higher.
 		 */
 		if ((adapter->link_speed != IXGBE_LINK_SPEED_100_FULL)
 		    && (adapter->link_speed != IXGBE_LINK_SPEED_10_FULL)) {
 			if ((adapter->num_queues > 1)
 			    && (reg < IXGBE_MIN_RSC_EITR_10G1G))
 				return EINVAL;
+		}
 		ixgbe_max_interrupt_rate = rate;

 @@ -1,14 +1,14 @@
-/* $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
   Copyright (c) 2001-2017, Intel Corporation
   All rights reserved.
   Redistribution and use in source and binary forms, with or without
   modification, are permitted provided that the following conditions are met:
 . Redistributions of source code must retain the above copyright notice,
       this list of conditions and the following disclaimer.
 @@ -1776,27 +1776,27 @@ s32 ixgbe_identify_qsfp_module_generic(s
 	if (hw->phy.sfp_type != stored_sfp_type)
 		hw->phy.sfp_setup_needed = TRUE;
 	/* Determine if the QSFP+ PHY is dual speed or not. */
 	hw->phy.multispeed_fiber = FALSE;
 	if (((comp_codes_1g & IXGBE_SFF_1GBASESX_CAPABLE) &&
 	   (comp_codes_10g & IXGBE_SFF_10GBASESR_CAPABLE)) ||
 	   ((comp_codes_1g & IXGBE_SFF_1GBASELX_CAPABLE) &&
 	   (comp_codes_10g & IXGBE_SFF_10GBASELR_CAPABLE)))
 		hw->phy.multispeed_fiber = TRUE;
 	/* 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]);
 		if (status != IXGBE_SUCCESS)
 			goto err_read_i2c_eeprom;
 		status = hw->phy.ops.read_i2c_eeprom(hw,
 					    IXGBE_SFF_QSFP_VENDOR_OUI_BYTE1,
 					    &oui_bytes[1]);
 		if (status != IXGBE_SUCCESS)
 			goto err_read_i2c_eeprom;

 @@ -1,14 +1,14 @@
-/*$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 $*/
 /******************************************************************************
   Copyright (c) 2001-2017, Intel Corporation
   All rights reserved.
   Redistribution and use in source and binary forms, with or without
   modification, are permitted provided that the following conditions are met:
 . Redistributions of source code must retain the above copyright notice,
       this list of conditions and the following disclaimer.
 . Redistributions in binary form must reproduce the above copyright
 @@ -1158,27 +1158,27 @@ ixv_set_rxfilter(struct adapter *adapter
 			device_printf(adapter->dev,
 			    "the PF doesn't support allmulti mode\n");
 			error = EOPNOTSUPP;
 		} else if (error) {
 			device_printf(adapter->dev,
 			    "number of Ethernet multicast addresses "
 			    "exceeds the limit (%d). error = %d\n",
 			    IXGBE_MAX_VF_MC, error);
 			error = ENOSPC;
 		} else {
 			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)
 			rc = error;
 		/* Continue to update the multicast table as many as we can */
+	}
 	/* 4: For normal operation */
 	error = hw->mac.ops.update_xcast_mode(hw, IXGBEVF_XCAST_MODE_MULTI);
 	if ((error == IXGBE_ERR_FEATURE_NOT_SUPPORTED) || (error == 0)) {
 		/* Normal operation */
 		ETHER_LOCK(ec);
 @@ -2419,27 +2419,27 @@ ixv_sysctl_interrupt_rate_handler(SYSCTL
 	usec = ((reg & 0x0FF8) >> 3);
 	if (usec > 0)
 		rate = 500000 / usec;
 	else
 		rate = 0;
 	node.sysctl_data = &rate;
 	error = sysctl_lookup(SYSCTLFN_CALL(&node));
 	if (error || newp == NULL)
 		return error;
 	reg &= ~0xfff; /* default, no limitation */
 	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.
 		 * The minimum value is always greater than 2us on 100M
 		 * (and 10M?(not documented)), but it's not on 1G and higher.
 		 */
 		if ((adapter->link_speed != IXGBE_LINK_SPEED_100_FULL)
 		    && (adapter->link_speed != IXGBE_LINK_SPEED_10_FULL)) {
 			if ((adapter->num_queues > 1)
 			    && (reg < IXGBE_MIN_RSC_EITR_10G1G))
 				return EINVAL;
+		}
 		ixv_max_interrupt_rate = rate;

	@@ -1,14 +1,14 @@		@@ -1,14 +1,14 @@
1	/* $NetBSD: ixgbe_netbsd.c,v 1.13 2020/02/01 02:33:08 riastradh Exp $ */	1	/* $NetBSD: ixgbe_netbsd.c,v 1.14 2020/04/17 02:21:25 msaitoh Exp $ */
2	/*	2	/*
3	* Copyright (c) 2011 The NetBSD Foundation, Inc.	3	* Copyright (c) 2011 The NetBSD Foundation, Inc.
4	* All rights reserved.	4	* All rights reserved.
5	*	5	*
6	* This code is derived from software contributed to The NetBSD Foundation	6	* This code is derived from software contributed to The NetBSD Foundation
7	* by Coyote Point Systems, Inc.	7	* by Coyote Point Systems, Inc.
8	*	8	*
9	* Redistribution and use in source and binary forms, with or without	9	* Redistribution and use in source and binary forms, with or without
10	* modification, are permitted provided that the following conditions	10	* modification, are permitted provided that the following conditions
11	* are met:	11	* are met:
12	* 1. Redistributions of source code must retain the above copyright	12	* 1. Redistributions of source code must retain the above copyright
13	* notice, this list of conditions and the following disclaimer.	13	* notice, this list of conditions and the following disclaimer.
14	* 2. Redistributions in binary form must reproduce the above copyright	14	* 2. Redistributions in binary form must reproduce the above copyright
	@@ -69,27 +69,27 @@ ixgbe_dma_tag_create(bus_dma_tag_t dmat,		@@ -69,27 +69,27 @@ ixgbe_dma_tag_create(bus_dma_tag_t dmat,
69		69
70	return 0;	70	return 0;
71	}	71	}
72		72
73	void	73	void
74	ixgbe_dmamap_destroy(ixgbe_dma_tag_t *dt, bus_dmamap_t dmam)	74	ixgbe_dmamap_destroy(ixgbe_dma_tag_t *dt, bus_dmamap_t dmam)
75	{	75	{
76	bus_dmamap_destroy(dt->dt_dmat, dmam);	76	bus_dmamap_destroy(dt->dt_dmat, dmam);
77	}	77	}
78		78
79	void	79	void
80	ixgbe_dmamap_sync(ixgbe_dma_tag_t *dt, bus_dmamap_t dmam, int ops)	80	ixgbe_dmamap_sync(ixgbe_dma_tag_t *dt, bus_dmamap_t dmam, int ops)
81	{	81	{
82	bus_dmamap_sync(dt->dt_dmat, dmam, 0, dt->dt_maxsize, ops);	82	bus_dmamap_sync(dt->dt_dmat, dmam, 0, dt->dt_maxsize, ops);
83	}	83	}
84		84
85	void	85	void
86	ixgbe_dmamap_unload(ixgbe_dma_tag_t *dt, bus_dmamap_t dmam)	86	ixgbe_dmamap_unload(ixgbe_dma_tag_t *dt, bus_dmamap_t dmam)
87	{	87	{
88	bus_dmamap_unload(dt->dt_dmat, dmam);	88	bus_dmamap_unload(dt->dt_dmat, dmam);
89	}	89	}
90		90
91	int	91	int
92	ixgbe_dmamap_create(ixgbe_dma_tag_t dt, int flags, bus_dmamap_t dmamp)	92	ixgbe_dmamap_create(ixgbe_dma_tag_t dt, int flags, bus_dmamap_t dmamp)
93	{	93	{
94	return bus_dmamap_create(dt->dt_dmat, dt->dt_maxsize, dt->dt_nsegments,	94	return bus_dmamap_create(dt->dt_dmat, dt->dt_maxsize, dt->dt_nsegments,
95	dt->dt_maxsegsize, dt->dt_boundary, flags, dmamp);	95	dt->dt_maxsegsize, dt->dt_boundary, flags, dmamp);