Module Name: src Committed By: msaitoh Date: Thu Mar 11 01:23:34 UTC 2021
Modified Files: src/sys/dev/pci: if_wm.c Log Message: Whitespace fixes. No functional change. To generate a diff of this commit: cvs rdiff -u -r1.701 -r1.702 src/sys/dev/pci/if_wm.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
Modified files: Index: src/sys/dev/pci/if_wm.c diff -u src/sys/dev/pci/if_wm.c:1.701 src/sys/dev/pci/if_wm.c:1.702 --- src/sys/dev/pci/if_wm.c:1.701 Mon Mar 1 04:50:17 2021 +++ src/sys/dev/pci/if_wm.c Thu Mar 11 01:23:33 2021 @@ -1,4 +1,4 @@ -/* $NetBSD: if_wm.c,v 1.701 2021/03/01 04:50:17 knakahara Exp $ */ +/* $NetBSD: if_wm.c,v 1.702 2021/03/11 01:23:33 msaitoh Exp $ */ /* * Copyright (c) 2001, 2002, 2003, 2004 Wasabi Systems, Inc. @@ -82,7 +82,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: if_wm.c,v 1.701 2021/03/01 04:50:17 knakahara Exp $"); +__KERNEL_RCSID(0, "$NetBSD: if_wm.c,v 1.702 2021/03/11 01:23:33 msaitoh Exp $"); #ifdef _KERNEL_OPT #include "opt_net_mpsafe.h" @@ -270,7 +270,7 @@ typedef union txdescs { typedef union rxdescs { wiseman_rxdesc_t sctxu_rxdescs[WM_NRXDESC]; - ext_rxdesc_t sctxu_ext_rxdescs[WM_NRXDESC]; /* 82574 only */ + ext_rxdesc_t sctxu_ext_rxdescs[WM_NRXDESC]; /* 82574 only */ nq_rxdesc_t sctxu_nq_rxdescs[WM_NRXDESC]; /* 82575 and newer */ } rxdescs_t; @@ -399,8 +399,8 @@ struct wm_txqueue { time_t txq_lastsent; /* Checksum flags used for previous packet */ - uint32_t txq_last_hw_cmd; - uint8_t txq_last_hw_fields; + uint32_t txq_last_hw_cmd; + uint8_t txq_last_hw_fields; uint16_t txq_last_hw_ipcs; uint16_t txq_last_hw_tucs; @@ -3505,7 +3505,7 @@ static bool wm_phy_need_linkdown_discard(struct wm_softc *sc) { - switch(sc->sc_phytype) { + switch (sc->sc_phytype) { case WMPHY_82577: /* ihphy */ case WMPHY_82578: /* atphy */ case WMPHY_82579: /* ihphy */ @@ -7570,9 +7570,9 @@ wm_tx_offload(struct wm_softc *sc, struc default: /* Don't support this protocol or encapsulation. */ - txq->txq_last_hw_cmd = txq->txq_last_hw_fields = 0; - txq->txq_last_hw_ipcs = 0; - txq->txq_last_hw_tucs = 0; + txq->txq_last_hw_cmd = txq->txq_last_hw_fields = 0; + txq->txq_last_hw_ipcs = 0; + txq->txq_last_hw_tucs = 0; *fieldsp = 0; *cmdp = 0; return; @@ -7728,8 +7728,7 @@ wm_tx_offload(struct wm_softc *sc, struc */ if (sc->sc_nqueues < 2) { /* - * - * Setting up new checksum offload context for every + * Setting up new checksum offload context for every * frames takes a lot of processing time for hardware. * This also reduces performance a lot for small sized * frames so avoid it if driver can use previously @@ -7739,7 +7738,7 @@ wm_tx_offload(struct wm_softc *sc, struc * checking whether a frame has the same IP/TCP structure is * hard thing so just ignore that and always restablish a * new TSO context. - */ + */ if ((m0->m_pkthdr.csum_flags & (M_CSUM_TSOv4 | M_CSUM_TSOv6)) == 0) { if (txq->txq_last_hw_cmd == cmd && @@ -7751,9 +7750,9 @@ wm_tx_offload(struct wm_softc *sc, struc } } - txq->txq_last_hw_cmd = cmd; - txq->txq_last_hw_fields = fields; - txq->txq_last_hw_ipcs = (ipcs & 0xffff); + txq->txq_last_hw_cmd = cmd; + txq->txq_last_hw_fields = fields; + txq->txq_last_hw_ipcs = (ipcs & 0xffff); txq->txq_last_hw_tucs = (tucs & 0xffff); } @@ -8073,8 +8072,8 @@ retry: M_CSUM_TCPv6 | M_CSUM_UDPv6)) { wm_tx_offload(sc, txq, txs, &cksumcmd, &cksumfields); } else { - txq->txq_last_hw_cmd = txq->txq_last_hw_fields = 0; - txq->txq_last_hw_ipcs = txq->txq_last_hw_tucs = 0; + txq->txq_last_hw_cmd = txq->txq_last_hw_fields = 0; + txq->txq_last_hw_ipcs = txq->txq_last_hw_tucs = 0; cksumcmd = 0; cksumfields = 0; }