summaryrefslogtreecommitdiff
path: root/sys/dev
diff options
context:
space:
mode:
authorchristos <christos@NetBSD.org>2013-03-30 03:21:02 +0000
committerchristos <christos@NetBSD.org>2013-03-30 03:21:02 +0000
commitd074ebd85c679e8fbe5f3abab94b804f419ad5ab (patch)
treeb4d41b0b553f4f6f5957f6de1c23b7d6fe5a9a7b /sys/dev
parent9c4b12dbb2a1e726d039e4186292d34f72c56065 (diff)
remove trailing whitespace
Diffstat (limited to 'sys/dev')
-rw-r--r--sys/dev/pci/if_age.c106
-rw-r--r--sys/dev/pci/if_alc.c76
-rw-r--r--sys/dev/pci/if_ale.c38
-rw-r--r--sys/dev/pci/if_ath_pci.c6
-rw-r--r--sys/dev/pci/if_bge.c12
-rw-r--r--sys/dev/pci/if_bnx.c172
-rw-r--r--sys/dev/pci/if_bwi_pci.c6
-rw-r--r--sys/dev/pci/if_cas.c14
-rw-r--r--sys/dev/pci/if_de.c6
-rw-r--r--sys/dev/pci/if_et.c26
-rw-r--r--sys/dev/pci/if_ex_pci.c6
-rw-r--r--sys/dev/pci/if_fxp_pci.c8
-rw-r--r--sys/dev/pci/if_gem_pci.c6
-rw-r--r--sys/dev/pci/if_iwi.c14
-rw-r--r--sys/dev/pci/if_iwn.c12
-rw-r--r--sys/dev/pci/if_jme.c8
-rw-r--r--sys/dev/pci/if_kse.c10
-rw-r--r--sys/dev/pci/if_lii.c6
-rw-r--r--sys/dev/pci/if_lmc.c10
-rw-r--r--sys/dev/pci/if_malo_pci.c12
-rw-r--r--sys/dev/pci/if_msk.c36
-rw-r--r--sys/dev/pci/if_nfe.c6
-rw-r--r--sys/dev/pci/if_pcn.c12
-rw-r--r--sys/dev/pci/if_re_pci.c6
-rw-r--r--sys/dev/pci/if_rtk_pci.c6
-rw-r--r--sys/dev/pci/if_sip.c8
-rw-r--r--sys/dev/pci/if_sk.c8
-rw-r--r--sys/dev/pci/if_stge.c6
-rw-r--r--sys/dev/pci/if_tl.c6
-rw-r--r--sys/dev/pci/if_vge.c8
-rw-r--r--sys/dev/pci/if_vioif.c14
-rw-r--r--sys/dev/pci/if_vte.c22
-rw-r--r--sys/dev/pci/if_wm.c66
-rw-r--r--sys/dev/pci/if_wpi.c58
-rw-r--r--sys/dev/pci/if_xge.c32
35 files changed, 424 insertions, 424 deletions
diff --git a/sys/dev/pci/if_age.c b/sys/dev/pci/if_age.c
index 2f709ccd145..b7c3e1c2f88 100644
--- a/sys/dev/pci/if_age.c
+++ b/sys/dev/pci/if_age.c
@@ -1,4 +1,4 @@
-/* $NetBSD: if_age.c,v 1.41 2012/07/22 14:33:00 matt Exp $ */
+/* $NetBSD: if_age.c,v 1.42 2013/03/30 03:21:02 christos Exp $ */
/* $OpenBSD: if_age.c,v 1.1 2009/01/16 05:00:34 kevlo Exp $ */
/*-
@@ -31,7 +31,7 @@
/* Driver for Attansic Technology Corp. L1 Gigabit Ethernet. */
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_age.c,v 1.41 2012/07/22 14:33:00 matt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_age.c,v 1.42 2013/03/30 03:21:02 christos Exp $");
#include "vlan.h"
@@ -208,7 +208,7 @@ age_attach(device_t parent, device_t self, void *aux)
/* Get PCI and chip id/revision. */
sc->age_rev = PCI_REVISION(pa->pa_class);
- sc->age_chip_rev = CSR_READ_4(sc, AGE_MASTER_CFG) >>
+ sc->age_chip_rev = CSR_READ_4(sc, AGE_MASTER_CFG) >>
MASTER_CHIP_REV_SHIFT;
aprint_debug_dev(self, "PCI device revision : 0x%04x\n", sc->age_rev);
@@ -485,7 +485,7 @@ age_intr(void *arg)
struct ifnet *ifp = &sc->sc_ec.ec_if;
struct cmb *cmb;
uint32_t status;
-
+
status = CSR_READ_4(sc, AGE_INTR_STATUS);
if (status == 0 || (status & AGE_INTRS) == 0)
return 0;
@@ -579,11 +579,11 @@ age_get_macaddr(struct age_softc *sc, uint8_t eaddr[])
break;
}
if (i == 0)
- printf("%s: reloading EEPROM timeout!\n",
- device_xname(sc->sc_dev));
+ printf("%s: reloading EEPROM timeout!\n",
+ device_xname(sc->sc_dev));
} else {
if (agedebug)
- printf("%s: PCI VPD capability not found!\n",
+ printf("%s: PCI VPD capability not found!\n",
device_xname(sc->sc_dev));
}
@@ -686,7 +686,7 @@ age_dma_alloc(struct age_softc *sc)
/*
* Create DMA stuffs for TX ring
*/
- error = bus_dmamap_create(sc->sc_dmat, AGE_TX_RING_SZ, 1,
+ error = bus_dmamap_create(sc->sc_dmat, AGE_TX_RING_SZ, 1,
AGE_TX_RING_SZ, 0, BUS_DMA_NOWAIT, &sc->age_cdata.age_tx_ring_map);
if (error) {
sc->age_cdata.age_tx_ring_map = NULL;
@@ -694,8 +694,8 @@ age_dma_alloc(struct age_softc *sc)
}
/* Allocate DMA'able memory for TX ring */
- error = bus_dmamem_alloc(sc->sc_dmat, AGE_TX_RING_SZ,
- ETHER_ALIGN, 0, &sc->age_rdata.age_tx_ring_seg, 1,
+ error = bus_dmamem_alloc(sc->sc_dmat, AGE_TX_RING_SZ,
+ ETHER_ALIGN, 0, &sc->age_rdata.age_tx_ring_seg, 1,
&nsegs, BUS_DMA_NOWAIT);
if (error) {
printf("%s: could not allocate DMA'able memory for Tx ring, "
@@ -706,7 +706,7 @@ age_dma_alloc(struct age_softc *sc)
error = bus_dmamem_map(sc->sc_dmat, &sc->age_rdata.age_tx_ring_seg,
nsegs, AGE_TX_RING_SZ, (void **)&sc->age_rdata.age_tx_ring,
BUS_DMA_NOWAIT | BUS_DMA_COHERENT);
- if (error)
+ if (error)
return ENOBUFS;
memset(sc->age_rdata.age_tx_ring, 0, AGE_TX_RING_SZ);
@@ -717,18 +717,18 @@ age_dma_alloc(struct age_softc *sc)
if (error) {
printf("%s: could not load DMA'able memory for Tx ring, "
"error = %i\n", device_xname(sc->sc_dev), error);
- bus_dmamem_free(sc->sc_dmat,
+ bus_dmamem_free(sc->sc_dmat,
&sc->age_rdata.age_tx_ring_seg, 1);
return error;
}
- sc->age_rdata.age_tx_ring_paddr =
+ sc->age_rdata.age_tx_ring_paddr =
sc->age_cdata.age_tx_ring_map->dm_segs[0].ds_addr;
/*
* Create DMA stuffs for RX ring
*/
- error = bus_dmamap_create(sc->sc_dmat, AGE_RX_RING_SZ, 1,
+ error = bus_dmamap_create(sc->sc_dmat, AGE_RX_RING_SZ, 1,
AGE_RX_RING_SZ, 0, BUS_DMA_NOWAIT, &sc->age_cdata.age_rx_ring_map);
if (error) {
sc->age_cdata.age_rx_ring_map = NULL;
@@ -736,8 +736,8 @@ age_dma_alloc(struct age_softc *sc)
}
/* Allocate DMA'able memory for RX ring */
- error = bus_dmamem_alloc(sc->sc_dmat, AGE_RX_RING_SZ,
- ETHER_ALIGN, 0, &sc->age_rdata.age_rx_ring_seg, 1,
+ error = bus_dmamem_alloc(sc->sc_dmat, AGE_RX_RING_SZ,
+ ETHER_ALIGN, 0, &sc->age_rdata.age_rx_ring_seg, 1,
&nsegs, BUS_DMA_NOWAIT);
if (error) {
printf("%s: could not allocate DMA'able memory for Rx ring, "
@@ -764,13 +764,13 @@ age_dma_alloc(struct age_softc *sc)
return error;
}
- sc->age_rdata.age_rx_ring_paddr =
+ sc->age_rdata.age_rx_ring_paddr =
sc->age_cdata.age_rx_ring_map->dm_segs[0].ds_addr;
/*
* Create DMA stuffs for RX return ring
*/
- error = bus_dmamap_create(sc->sc_dmat, AGE_RR_RING_SZ, 1,
+ error = bus_dmamap_create(sc->sc_dmat, AGE_RR_RING_SZ, 1,
AGE_RR_RING_SZ, 0, BUS_DMA_NOWAIT, &sc->age_cdata.age_rr_ring_map);
if (error) {
sc->age_cdata.age_rr_ring_map = NULL;
@@ -778,8 +778,8 @@ age_dma_alloc(struct age_softc *sc)
}
/* Allocate DMA'able memory for RX return ring */
- error = bus_dmamem_alloc(sc->sc_dmat, AGE_RR_RING_SZ,
- ETHER_ALIGN, 0, &sc->age_rdata.age_rr_ring_seg, 1,
+ error = bus_dmamem_alloc(sc->sc_dmat, AGE_RR_RING_SZ,
+ ETHER_ALIGN, 0, &sc->age_rdata.age_rr_ring_seg, 1,
&nsegs, BUS_DMA_NOWAIT);
if (error) {
printf("%s: could not allocate DMA'able memory for Rx "
@@ -807,14 +807,14 @@ age_dma_alloc(struct age_softc *sc)
return error;
}
- sc->age_rdata.age_rr_ring_paddr =
+ sc->age_rdata.age_rr_ring_paddr =
sc->age_cdata.age_rr_ring_map->dm_segs[0].ds_addr;
/*
- * Create DMA stuffs for CMB block
+ * Create DMA stuffs for CMB block
*/
- error = bus_dmamap_create(sc->sc_dmat, AGE_CMB_BLOCK_SZ, 1,
- AGE_CMB_BLOCK_SZ, 0, BUS_DMA_NOWAIT,
+ error = bus_dmamap_create(sc->sc_dmat, AGE_CMB_BLOCK_SZ, 1,
+ AGE_CMB_BLOCK_SZ, 0, BUS_DMA_NOWAIT,
&sc->age_cdata.age_cmb_block_map);
if (error) {
sc->age_cdata.age_cmb_block_map = NULL;
@@ -822,8 +822,8 @@ age_dma_alloc(struct age_softc *sc)
}
/* Allocate DMA'able memory for CMB block */
- error = bus_dmamem_alloc(sc->sc_dmat, AGE_CMB_BLOCK_SZ,
- ETHER_ALIGN, 0, &sc->age_rdata.age_cmb_block_seg, 1,
+ error = bus_dmamem_alloc(sc->sc_dmat, AGE_CMB_BLOCK_SZ,
+ ETHER_ALIGN, 0, &sc->age_rdata.age_cmb_block_seg, 1,
&nsegs, BUS_DMA_NOWAIT);
if (error) {
printf("%s: could not allocate DMA'able memory for "
@@ -841,7 +841,7 @@ age_dma_alloc(struct age_softc *sc)
/* Load the DMA map for CMB block. */
error = bus_dmamap_load(sc->sc_dmat, sc->age_cdata.age_cmb_block_map,
- sc->age_rdata.age_cmb_block, AGE_CMB_BLOCK_SZ, NULL,
+ sc->age_rdata.age_cmb_block, AGE_CMB_BLOCK_SZ, NULL,
BUS_DMA_NOWAIT);
if (error) {
printf("%s: could not load DMA'able memory for CMB block, "
@@ -851,14 +851,14 @@ age_dma_alloc(struct age_softc *sc)
return error;
}
- sc->age_rdata.age_cmb_block_paddr =
+ sc->age_rdata.age_cmb_block_paddr =
sc->age_cdata.age_cmb_block_map->dm_segs[0].ds_addr;
/*
* Create DMA stuffs for SMB block
*/
- error = bus_dmamap_create(sc->sc_dmat, AGE_SMB_BLOCK_SZ, 1,
- AGE_SMB_BLOCK_SZ, 0, BUS_DMA_NOWAIT,
+ error = bus_dmamap_create(sc->sc_dmat, AGE_SMB_BLOCK_SZ, 1,
+ AGE_SMB_BLOCK_SZ, 0, BUS_DMA_NOWAIT,
&sc->age_cdata.age_smb_block_map);
if (error) {
sc->age_cdata.age_smb_block_map = NULL;
@@ -866,8 +866,8 @@ age_dma_alloc(struct age_softc *sc)
}
/* Allocate DMA'able memory for SMB block */
- error = bus_dmamem_alloc(sc->sc_dmat, AGE_SMB_BLOCK_SZ,
- ETHER_ALIGN, 0, &sc->age_rdata.age_smb_block_seg, 1,
+ error = bus_dmamem_alloc(sc->sc_dmat, AGE_SMB_BLOCK_SZ,
+ ETHER_ALIGN, 0, &sc->age_rdata.age_smb_block_seg, 1,
&nsegs, BUS_DMA_NOWAIT);
if (error) {
printf("%s: could not allocate DMA'able memory for "
@@ -885,7 +885,7 @@ age_dma_alloc(struct age_softc *sc)
/* Load the DMA map for SMB block */
error = bus_dmamap_load(sc->sc_dmat, sc->age_cdata.age_smb_block_map,
- sc->age_rdata.age_smb_block, AGE_SMB_BLOCK_SZ, NULL,
+ sc->age_rdata.age_smb_block, AGE_SMB_BLOCK_SZ, NULL,
BUS_DMA_NOWAIT);
if (error) {
printf("%s: could not load DMA'able memory for SMB block, "
@@ -895,7 +895,7 @@ age_dma_alloc(struct age_softc *sc)
return error;
}
- sc->age_rdata.age_smb_block_paddr =
+ sc->age_rdata.age_smb_block_paddr =
sc->age_cdata.age_smb_block_map->dm_segs[0].ds_addr;
/* Create DMA maps for Tx buffers. */
@@ -919,7 +919,7 @@ age_dma_alloc(struct age_softc *sc)
BUS_DMA_NOWAIT, &sc->age_cdata.age_rx_sparemap);
if (error) {
sc->age_cdata.age_rx_sparemap = NULL;
- printf("%s: could not create spare Rx dmamap, error = %i.\n",
+ printf("%s: could not create spare Rx dmamap, error = %i.\n",
device_xname(sc->sc_dev), error);
return error;
}
@@ -979,11 +979,11 @@ age_dma_free(struct age_softc *sc)
sc->age_cdata.age_tx_ring_map = NULL;
/* Rx ring. */
- if (sc->age_cdata.age_rx_ring_map != NULL)
+ if (sc->age_cdata.age_rx_ring_map != NULL)
bus_dmamap_unload(sc->sc_dmat, sc->age_cdata.age_rx_ring_map);
if (sc->age_cdata.age_rx_ring_map != NULL &&
sc->age_rdata.age_rx_ring != NULL)
- bus_dmamem_free(sc->sc_dmat,
+ bus_dmamem_free(sc->sc_dmat,
&sc->age_rdata.age_rx_ring_seg, 1);
sc->age_rdata.age_rx_ring = NULL;
sc->age_cdata.age_rx_ring_map = NULL;
@@ -993,7 +993,7 @@ age_dma_free(struct age_softc *sc)
bus_dmamap_unload(sc->sc_dmat, sc->age_cdata.age_rr_ring_map);
if (sc->age_cdata.age_rr_ring_map != NULL &&
sc->age_rdata.age_rr_ring != NULL)
- bus_dmamem_free(sc->sc_dmat,
+ bus_dmamem_free(sc->sc_dmat,
&sc->age_rdata.age_rr_ring_seg, 1);
sc->age_rdata.age_rr_ring = NULL;
sc->age_cdata.age_rr_ring_map = NULL;
@@ -1013,7 +1013,7 @@ age_dma_free(struct age_softc *sc)
bus_dmamap_unload(sc->sc_dmat, sc->age_cdata.age_smb_block_map);
if (sc->age_cdata.age_smb_block_map != NULL &&
sc->age_rdata.age_smb_block != NULL)
- bus_dmamem_free(sc->sc_dmat,
+ bus_dmamem_free(sc->sc_dmat,
&sc->age_rdata.age_smb_block_seg, 1);
sc->age_rdata.age_smb_block = NULL;
sc->age_cdata.age_smb_block_map = NULL;
@@ -1094,18 +1094,18 @@ age_watchdog(struct ifnet *ifp)
age_start(ifp);
}
-static bool
-age_shutdown(device_t self, int howto)
+static bool
+age_shutdown(device_t self, int howto)
{
struct age_softc *sc;
struct ifnet *ifp;
sc = device_private(self);
ifp = &sc->sc_ec.ec_if;
- age_stop(ifp, 1);
+ age_stop(ifp, 1);
return true;
-}
+}
static int
@@ -1210,7 +1210,7 @@ age_encap(struct age_softc *sc, struct mbuf **m_head)
*m_head = m_pullup(*m_head, MHLEN);
if (*m_head == NULL) {
- printf("%s: can't defrag TX mbuf\n",
+ printf("%s: can't defrag TX mbuf\n",
device_xname(sc->sc_dev));
return ENOBUFS;
}
@@ -1272,13 +1272,13 @@ age_encap(struct age_softc *sc, struct mbuf **m_head)
for (i = 0; ; i++) {
desc = &sc->age_rdata.age_tx_ring[prod];
desc->addr = htole64(map->dm_segs[i].ds_addr);
- desc->len =
+ desc->len =
htole32(AGE_TX_BYTES(map->dm_segs[i].ds_len) | vtag);
desc->flags = htole32(cflags);
sc->age_cdata.age_tx_cnt++;
if (i == (nsegs - 1))
break;
-
+
/* sync this descriptor and go to the next one */
bus_dmamap_sync(sc->sc_dmat, sc->age_cdata.age_tx_ring_map,
prod * sizeof(struct tx_desc), sizeof(struct tx_desc),
@@ -1482,7 +1482,7 @@ age_rxeof(struct age_softc *sc, struct rx_rdesc *rxrd)
*/
if (status & AGE_RRD_IPV4) {
if (status & AGE_RRD_IPCSUM_NOK)
- m->m_pkthdr.csum_flags |=
+ m->m_pkthdr.csum_flags |=
M_CSUM_IPv4_BAD;
if ((status & (AGE_RRD_TCP | AGE_RRD_UDP)) &&
(status & AGE_RRD_TCP_UDPCSUM_NOK)) {
@@ -1531,7 +1531,7 @@ age_rxintr(struct age_softc *sc, int rr_prod)
return;
bus_dmamap_sync(sc->sc_dmat, sc->age_cdata.age_rr_ring_map, 0,
- sc->age_cdata.age_rr_ring_map->dm_mapsize,
+ sc->age_cdata.age_rr_ring_map->dm_mapsize,
BUS_DMASYNC_POSTREAD);
for (prog = 0; rr_cons != rr_prod; prog++) {
@@ -1718,7 +1718,7 @@ age_init(struct ifnet *ifp)
reg |= MASTER_ITIMER_ENB;
CSR_WRITE_4(sc, AGE_MASTER_CFG, reg);
if (agedebug)
- printf("%s: interrupt moderation is %d us.\n",
+ printf("%s: interrupt moderation is %d us.\n",
device_xname(sc->sc_dev), sc->age_int_mod);
CSR_WRITE_2(sc, AGE_INTR_CLR_TIMER, AGE_USECS(1000));
@@ -2227,7 +2227,7 @@ age_newbuf(struct age_softc *sc, struct age_rxdesc *rxd, int init)
bus_dmamap_unload(sc->sc_dmat,
sc->age_cdata.age_rx_sparemap);
error = EFBIG;
- printf("%s: too many segments?!\n",
+ printf("%s: too many segments?!\n",
device_xname(sc->sc_dev));
}
m_freem(m);
@@ -2249,7 +2249,7 @@ age_newbuf(struct age_softc *sc, struct age_rxdesc *rxd, int init)
desc = rxd->rx_desc;
desc->addr = htole64(rxd->rx_dmamap->dm_segs[0].ds_addr);
- desc->len =
+ desc->len =
htole32((rxd->rx_dmamap->dm_segs[0].ds_len & AGE_RD_LEN_MASK) <<
AGE_RD_LEN_SHIFT);
@@ -2287,7 +2287,7 @@ age_rxfilter(struct age_softc *sc)
* Always accept broadcast frames.
*/
rxcfg |= MAC_CFG_BCAST;
-
+
if (ifp->if_flags & IFF_PROMISC || ec->ec_multicnt > 0) {
ifp->if_flags |= IFF_ALLMULTI;
if (ifp->if_flags & IFF_PROMISC)
@@ -2303,7 +2303,7 @@ age_rxfilter(struct age_softc *sc)
while (enm != NULL) {
crc = ether_crc32_le(enm->enm_addrlo, ETHER_ADDR_LEN);
mchash[crc >> 31] |= 1 << ((crc >> 26) & 0x1f);
- ETHER_NEXT_MULTI(step, enm);
+ ETHER_NEXT_MULTI(step, enm);
}
}
diff --git a/sys/dev/pci/if_alc.c b/sys/dev/pci/if_alc.c
index ecb53fc93a0..8b53472aa86 100644
--- a/sys/dev/pci/if_alc.c
+++ b/sys/dev/pci/if_alc.c
@@ -364,7 +364,7 @@ alc_get_macaddr(struct alc_softc *sc)
break;
}
if (i == 0)
- printf("%s: reloading EEPROM timeout!\n",
+ printf("%s: reloading EEPROM timeout!\n",
device_xname(sc->sc_dev));
} else {
if (alcdebug)
@@ -562,7 +562,7 @@ alc_aspm(struct alc_softc *sc, int media)
{
uint32_t pmcfg;
uint16_t linkcfg;
-
+
pmcfg = CSR_READ_4(sc, ALC_PM_CFG);
if ((sc->alc_flags & (ALC_FLAG_APS | ALC_FLAG_PCIE)) ==
(ALC_FLAG_APS | ALC_FLAG_PCIE))
@@ -706,7 +706,7 @@ alc_attach(device_t parent, device_t self, void *aux)
goto fail;
}
aprint_normal_dev(self, "interrupting at %s\n", intrstr);
-
+
/* Set PHY address. */
sc->alc_phyaddr = ALC_PHY_ADDR;
@@ -724,7 +724,7 @@ alc_attach(device_t parent, device_t self, void *aux)
sc->alc_dma_wr_burst = (burst & 0x00e0) >> 5;
if (alcdebug) {
printf("%s: Read request size : %u bytes.\n",
- device_xname(sc->sc_dev),
+ device_xname(sc->sc_dev),
alc_dma_burst[sc->alc_dma_rd_burst]);
printf("%s: TLP payload size : %u bytes.\n",
device_xname(sc->sc_dev),
@@ -888,7 +888,7 @@ alc_attach(device_t parent, device_t self, void *aux)
ifmedia_add(&sc->sc_miibus.mii_media, IFM_ETHER | IFM_MANUAL,
0, NULL);
ifmedia_set(&sc->sc_miibus.mii_media, IFM_ETHER | IFM_MANUAL);
- } else
+ } else
ifmedia_set(&sc->sc_miibus.mii_media, IFM_ETHER | IFM_AUTO);
if_attach(ifp);
@@ -984,12 +984,12 @@ alc_dma_alloc(struct alc_softc *sc)
if (error) {
printf("%s: could not load DMA'able memory for Tx ring.\n",
device_xname(sc->sc_dev));
- bus_dmamem_free(sc->sc_dmat,
+ bus_dmamem_free(sc->sc_dmat,
&sc->alc_rdata.alc_tx_ring_seg, 1);
return error;
}
- sc->alc_rdata.alc_tx_ring_paddr =
+ sc->alc_rdata.alc_tx_ring_paddr =
sc->alc_cdata.alc_tx_ring_map->dm_segs[0].ds_addr;
/*
@@ -999,7 +999,7 @@ alc_dma_alloc(struct alc_softc *sc)
ALC_RX_RING_SZ, 0, BUS_DMA_NOWAIT, &sc->alc_cdata.alc_rx_ring_map);
if (error)
return (ENOBUFS);
-
+
/* Allocate DMA'able memory for RX ring */
error = bus_dmamem_alloc(sc->sc_dmat, ALC_RX_RING_SZ,
ETHER_ALIGN, 0, &sc->alc_rdata.alc_rx_ring_seg, 1,
@@ -1033,14 +1033,14 @@ alc_dma_alloc(struct alc_softc *sc)
/*
* Create DMA stuffs for RX return ring
*/
- error = bus_dmamap_create(sc->sc_dmat, ALC_RR_RING_SZ, 1,
+ error = bus_dmamap_create(sc->sc_dmat, ALC_RR_RING_SZ, 1,
ALC_RR_RING_SZ, 0, BUS_DMA_NOWAIT, &sc->alc_cdata.alc_rr_ring_map);
if (error)
return (ENOBUFS);
/* Allocate DMA'able memory for RX return ring */
- error = bus_dmamem_alloc(sc->sc_dmat, ALC_RR_RING_SZ,
- ETHER_ALIGN, 0, &sc->alc_rdata.alc_rr_ring_seg, 1,
+ error = bus_dmamem_alloc(sc->sc_dmat, ALC_RR_RING_SZ,
+ ETHER_ALIGN, 0, &sc->alc_rdata.alc_rr_ring_seg, 1,
&nsegs, BUS_DMA_NOWAIT);
if (error) {
printf("%s: could not allocate DMA'able memory for Rx "
@@ -1065,21 +1065,21 @@ alc_dma_alloc(struct alc_softc *sc)
return error;
}
- sc->alc_rdata.alc_rr_ring_paddr =
+ sc->alc_rdata.alc_rr_ring_paddr =
sc->alc_cdata.alc_rr_ring_map->dm_segs[0].ds_addr;
/*
- * Create DMA stuffs for CMB block
+ * Create DMA stuffs for CMB block
*/
- error = bus_dmamap_create(sc->sc_dmat, ALC_CMB_SZ, 1,
- ALC_CMB_SZ, 0, BUS_DMA_NOWAIT,
+ error = bus_dmamap_create(sc->sc_dmat, ALC_CMB_SZ, 1,
+ ALC_CMB_SZ, 0, BUS_DMA_NOWAIT,
&sc->alc_cdata.alc_cmb_map);
- if (error)
+ if (error)
return (ENOBUFS);
/* Allocate DMA'able memory for CMB block */
- error = bus_dmamem_alloc(sc->sc_dmat, ALC_CMB_SZ,
- ETHER_ALIGN, 0, &sc->alc_rdata.alc_cmb_seg, 1,
+ error = bus_dmamem_alloc(sc->sc_dmat, ALC_CMB_SZ,
+ ETHER_ALIGN, 0, &sc->alc_rdata.alc_cmb_seg, 1,
&nsegs, BUS_DMA_NOWAIT);
if (error) {
printf("%s: could not allocate DMA'able memory for "
@@ -1095,7 +1095,7 @@ alc_dma_alloc(struct alc_softc *sc)
/* Load the DMA map for CMB block. */
error = bus_dmamap_load(sc->sc_dmat, sc->alc_cdata.alc_cmb_map,
- sc->alc_rdata.alc_cmb, ALC_CMB_SZ, NULL,
+ sc->alc_rdata.alc_cmb, ALC_CMB_SZ, NULL,
BUS_DMA_WAITOK);
if (error) {
printf("%s: could not load DMA'able memory for CMB block\n",
@@ -1105,21 +1105,21 @@ alc_dma_alloc(struct alc_softc *sc)
return error;
}
- sc->alc_rdata.alc_cmb_paddr =
+ sc->alc_rdata.alc_cmb_paddr =
sc->alc_cdata.alc_cmb_map->dm_segs[0].ds_addr;
/*
* Create DMA stuffs for SMB block
*/
- error = bus_dmamap_create(sc->sc_dmat, ALC_SMB_SZ, 1,
- ALC_SMB_SZ, 0, BUS_DMA_NOWAIT,
+ error = bus_dmamap_create(sc->sc_dmat, ALC_SMB_SZ, 1,
+ ALC_SMB_SZ, 0, BUS_DMA_NOWAIT,
&sc->alc_cdata.alc_smb_map);
if (error)
return (ENOBUFS);
/* Allocate DMA'able memory for SMB block */
- error = bus_dmamem_alloc(sc->sc_dmat, ALC_SMB_SZ,
- ETHER_ALIGN, 0, &sc->alc_rdata.alc_smb_seg, 1,
+ error = bus_dmamem_alloc(sc->sc_dmat, ALC_SMB_SZ,
+ ETHER_ALIGN, 0, &sc->alc_rdata.alc_smb_seg, 1,
&nsegs, BUS_DMA_NOWAIT);
if (error) {
printf("%s: could not allocate DMA'able memory for "
@@ -1135,7 +1135,7 @@ alc_dma_alloc(struct alc_softc *sc)
/* Load the DMA map for SMB block */
error = bus_dmamap_load(sc->sc_dmat, sc->alc_cdata.alc_smb_map,
- sc->alc_rdata.alc_smb, ALC_SMB_SZ, NULL,
+ sc->alc_rdata.alc_smb, ALC_SMB_SZ, NULL,
BUS_DMA_WAITOK);
if (error) {
printf("%s: could not load DMA'able memory for SMB block\n",
@@ -1145,7 +1145,7 @@ alc_dma_alloc(struct alc_softc *sc)
return error;
}
- sc->alc_rdata.alc_smb_paddr =
+ sc->alc_rdata.alc_smb_paddr =
sc->alc_cdata.alc_smb_map->dm_segs[0].ds_addr;
@@ -1229,11 +1229,11 @@ alc_dma_free(struct alc_softc *sc)
sc->alc_cdata.alc_tx_ring_map = NULL;
/* Rx ring. */
- if (sc->alc_cdata.alc_rx_ring_map != NULL)
+ if (sc->alc_cdata.alc_rx_ring_map != NULL)
bus_dmamap_unload(sc->sc_dmat, sc->alc_cdata.alc_rx_ring_map);
if (sc->alc_cdata.alc_rx_ring_map != NULL &&
sc->alc_rdata.alc_rx_ring != NULL)
- bus_dmamem_free(sc->sc_dmat,
+ bus_dmamem_free(sc->sc_dmat,
&sc->alc_rdata.alc_rx_ring_seg, 1);
sc->alc_rdata.alc_rx_ring = NULL;
sc->alc_cdata.alc_rx_ring_map = NULL;
@@ -1243,7 +1243,7 @@ alc_dma_free(struct alc_softc *sc)
bus_dmamap_unload(sc->sc_dmat, sc->alc_cdata.alc_rr_ring_map);
if (sc->alc_cdata.alc_rr_ring_map != NULL &&
sc->alc_rdata.alc_rr_ring != NULL)
- bus_dmamem_free(sc->sc_dmat,
+ bus_dmamem_free(sc->sc_dmat,
&sc->alc_rdata.alc_rr_ring_seg, 1);
sc->alc_rdata.alc_rr_ring = NULL;
sc->alc_cdata.alc_rr_ring_map = NULL;
@@ -1263,7 +1263,7 @@ alc_dma_free(struct alc_softc *sc)
bus_dmamap_unload(sc->sc_dmat, sc->alc_cdata.alc_smb_map);
if (sc->alc_cdata.alc_smb_map != NULL &&
sc->alc_rdata.alc_smb != NULL)
- bus_dmamem_free(sc->sc_dmat,
+ bus_dmamem_free(sc->sc_dmat,
&sc->alc_rdata.alc_smb_seg, 1);
sc->alc_rdata.alc_smb = NULL;
sc->alc_cdata.alc_smb_map = NULL;
@@ -1351,7 +1351,7 @@ alc_encap(struct alc_softc *sc, struct mbuf **m_head)
/* Set checksum start offset. */
cflags |= ((poff >> 1) << TD_PLOAD_OFFSET_SHIFT) &
TD_PLOAD_OFFSET_MASK;
- }
+ }
for (; idx < nsegs; idx++) {
desc = &sc->alc_rdata.alc_tx_ring[prod];
desc->len =
@@ -1411,7 +1411,7 @@ alc_start(struct ifnet *ifp)
break;
}
enq = 1;
-
+
/*
* If there's a BPF listener, bounce a copy of this frame
* to him.
@@ -1422,7 +1422,7 @@ alc_start(struct ifnet *ifp)
if (enq) {
/* Sync descriptors. */
bus_dmamap_sync(sc->sc_dmat, sc->alc_cdata.alc_tx_ring_map, 0,
- sc->alc_cdata.alc_tx_ring_map->dm_mapsize,
+ sc->alc_cdata.alc_tx_ring_map->dm_mapsize,
BUS_DMASYNC_PREWRITE);
/* Kick. Assume we're using normal Tx priority queue. */
CSR_WRITE_4(sc, ALC_MBOX_TD_PROD_IDX,
@@ -1517,13 +1517,13 @@ alc_stats_clear(struct alc_softc *sc)
if ((sc->alc_flags & ALC_FLAG_SMB_BUG) == 0) {
bus_dmamap_sync(sc->sc_dmat, sc->alc_cdata.alc_smb_map, 0,
- sc->alc_cdata.alc_smb_map->dm_mapsize,
+ sc->alc_cdata.alc_smb_map->dm_mapsize,
BUS_DMASYNC_POSTREAD);
smb = sc->alc_rdata.alc_smb;
/* Update done, clear. */
smb->updated = 0;
bus_dmamap_sync(sc->sc_dmat, sc->alc_cdata.alc_smb_map, 0,
- sc->alc_cdata.alc_smb_map->dm_mapsize,
+ sc->alc_cdata.alc_smb_map->dm_mapsize,
BUS_DMASYNC_PREWRITE);
} else {
for (reg = &sb.rx_frames, i = 0; reg <= &sb.rx_pkts_filtered;
@@ -1724,7 +1724,7 @@ alc_txeof(struct alc_softc *sc)
BUS_DMASYNC_POSTREAD);
if ((sc->alc_flags & ALC_FLAG_CMB_BUG) == 0) {
bus_dmamap_sync(sc->sc_dmat, sc->alc_cdata.alc_cmb_map, 0,
- sc->alc_cdata.alc_cmb_map->dm_mapsize,
+ sc->alc_cdata.alc_cmb_map->dm_mapsize,
BUS_DMASYNC_POSTREAD);
prod = sc->alc_rdata.alc_cmb->cons;
} else
@@ -2038,14 +2038,14 @@ alc_reset(struct alc_softc *sc)
}
if (i == 0)
- printf("%s: reset timeout(0x%08x)!\n", device_xname(sc->sc_dev),
+ printf("%s: reset timeout(0x%08x)!\n", device_xname(sc->sc_dev),
reg);
}
static int
alc_init(struct ifnet *ifp)
{
-
+
return alc_init_backend(ifp, true);
}
diff --git a/sys/dev/pci/if_ale.c b/sys/dev/pci/if_ale.c
index eb69cf628b9..aa24b9388f9 100644
--- a/sys/dev/pci/if_ale.c
+++ b/sys/dev/pci/if_ale.c
@@ -1,4 +1,4 @@
-/* $NetBSD: if_ale.c,v 1.14 2012/07/22 14:33:01 matt Exp $ */
+/* $NetBSD: if_ale.c,v 1.15 2013/03/30 03:21:03 christos Exp $ */
/*-
* Copyright (c) 2008, Pyun YongHyeon <yongari@FreeBSD.org>
@@ -32,7 +32,7 @@
/* Driver for Atheros AR8121/AR8113/AR8114 PCIe Ethernet. */
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_ale.c,v 1.14 2012/07/22 14:33:01 matt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_ale.c,v 1.15 2013/03/30 03:21:03 christos Exp $");
#include "vlan.h"
@@ -127,7 +127,7 @@ int aledebug = 0;
#define DPRINTF(x) do { if (aledebug) printf x; } while (0)
#define ETHER_ALIGN 2
-#define ALE_CSUM_FEATURES (M_CSUM_TCPv4 | M_CSUM_UDPv4)
+#define ALE_CSUM_FEATURES (M_CSUM_TCPv4 | M_CSUM_UDPv4)
static int
ale_miibus_readreg(device_t dev, int phy, int reg)
@@ -296,7 +296,7 @@ ale_get_macaddr(struct ale_softc *sc)
CSR_WRITE_4(sc, ALE_SPI_CTRL, reg);
}
- if (pci_get_capability(sc->sc_pct, sc->sc_pcitag, PCI_CAP_VPD,
+ if (pci_get_capability(sc->sc_pct, sc->sc_pcitag, PCI_CAP_VPD,
&vpdc, NULL)) {
/*
* PCI VPD capability found, let TWSI reload EEPROM.
@@ -650,8 +650,8 @@ ale_dma_alloc(struct ale_softc *sc)
return ENOBUFS;
}
- /* Allocate DMA'able memory for TX ring */
- error = bus_dmamem_alloc(sc->sc_dmat, ALE_TX_RING_SZ,
+ /* Allocate DMA'able memory for TX ring */
+ error = bus_dmamem_alloc(sc->sc_dmat, ALE_TX_RING_SZ,
0, 0, &sc->ale_cdata.ale_tx_ring_seg, 1,
&nsegs, BUS_DMA_WAITOK);
if (error) {
@@ -669,16 +669,16 @@ ale_dma_alloc(struct ale_softc *sc)
memset(sc->ale_cdata.ale_tx_ring, 0, ALE_TX_RING_SZ);
/* Load the DMA map for Tx ring. */
- error = bus_dmamap_load(sc->sc_dmat, sc->ale_cdata.ale_tx_ring_map,
+ error = bus_dmamap_load(sc->sc_dmat, sc->ale_cdata.ale_tx_ring_map,
sc->ale_cdata.ale_tx_ring, ALE_TX_RING_SZ, NULL, BUS_DMA_WAITOK);
if (error) {
printf("%s: could not load DMA'able memory for Tx ring.\n",
device_xname(sc->sc_dev));
- bus_dmamem_free(sc->sc_dmat,
+ bus_dmamem_free(sc->sc_dmat,
&sc->ale_cdata.ale_tx_ring_seg, 1);
return error;
}
- sc->ale_cdata.ale_tx_ring_paddr =
+ sc->ale_cdata.ale_tx_ring_paddr =
sc->ale_cdata.ale_tx_ring_map->dm_segs[0].ds_addr;
for (i = 0; i < ALE_RX_PAGES; i++) {
@@ -686,7 +686,7 @@ ale_dma_alloc(struct ale_softc *sc)
* Create DMA stuffs for RX pages
*/
error = bus_dmamap_create(sc->sc_dmat, sc->ale_pagesize, 1,
- sc->ale_pagesize, 0, BUS_DMA_NOWAIT,
+ sc->ale_pagesize, 0, BUS_DMA_NOWAIT,
&sc->ale_cdata.ale_rx_page[i].page_map);
if (error) {
sc->ale_cdata.ale_rx_page[i].page_map = NULL;
@@ -702,9 +702,9 @@ ale_dma_alloc(struct ale_softc *sc)
"Rx ring.\n", device_xname(sc->sc_dev));
return error;
}
- error = bus_dmamem_map(sc->sc_dmat,
+ error = bus_dmamem_map(sc->sc_dmat,
&sc->ale_cdata.ale_rx_page[i].page_seg, nsegs,
- sc->ale_pagesize,
+ sc->ale_pagesize,
(void **)&sc->ale_cdata.ale_rx_page[i].page_addr,
BUS_DMA_NOWAIT);
if (error)
@@ -752,13 +752,13 @@ ale_dma_alloc(struct ale_softc *sc)
error = bus_dmamem_map(sc->sc_dmat, &sc->ale_cdata.ale_tx_cmb_seg,
nsegs, ALE_TX_CMB_SZ, (void **)&sc->ale_cdata.ale_tx_cmb,
BUS_DMA_NOWAIT);
- if (error)
+ if (error)
return ENOBUFS;
memset(sc->ale_cdata.ale_tx_cmb, 0, ALE_TX_CMB_SZ);
/* Load the DMA map for Tx CMB. */
- error = bus_dmamap_load(sc->sc_dmat, sc->ale_cdata.ale_tx_cmb_map,
+ error = bus_dmamap_load(sc->sc_dmat, sc->ale_cdata.ale_tx_cmb_map,
sc->ale_cdata.ale_tx_cmb, ALE_TX_CMB_SZ, NULL, BUS_DMA_WAITOK);
if (error) {
printf("%s: could not load DMA'able memory for Tx CMB.\n",
@@ -768,7 +768,7 @@ ale_dma_alloc(struct ale_softc *sc)
return error;
}
- sc->ale_cdata.ale_tx_cmb_paddr =
+ sc->ale_cdata.ale_tx_cmb_paddr =
sc->ale_cdata.ale_tx_cmb_map->dm_segs[0].ds_addr;
for (i = 0; i < ALE_RX_PAGES; i++) {
@@ -792,9 +792,9 @@ ale_dma_alloc(struct ale_softc *sc)
"Rx CMB\n", device_xname(sc->sc_dev));
return error;
}
- error = bus_dmamem_map(sc->sc_dmat,
+ error = bus_dmamem_map(sc->sc_dmat,
&sc->ale_cdata.ale_rx_page[i].cmb_seg, nsegs,
- ALE_RX_CMB_SZ,
+ ALE_RX_CMB_SZ,
(void **)&sc->ale_cdata.ale_rx_page[i].cmb_addr,
BUS_DMA_NOWAIT);
if (error)
@@ -1008,7 +1008,7 @@ ale_encap(struct ale_softc *sc, struct mbuf **m_head)
for (i = 0; i < nsegs; i++) {
desc = &sc->ale_cdata.ale_tx_ring[prod];
desc->addr = htole64(map->dm_segs[i].ds_addr);
- desc->len =
+ desc->len =
htole32(ALE_TX_BYTES(map->dm_segs[i].ds_len) | vtag);
desc->flags = htole32(cflags);
sc->ale_cdata.ale_tx_cnt++;
@@ -1338,7 +1338,7 @@ ale_txeof(struct ale_softc *sc)
sc->ale_cdata.ale_tx_ring_map->dm_mapsize, BUS_DMASYNC_POSTREAD);
if ((sc->ale_flags & ALE_FLAG_TXCMB_BUG) == 0) {
bus_dmamap_sync(sc->sc_dmat, sc->ale_cdata.ale_tx_cmb_map, 0,
- sc->ale_cdata.ale_tx_cmb_map->dm_mapsize,
+ sc->ale_cdata.ale_tx_cmb_map->dm_mapsize,
BUS_DMASYNC_POSTREAD);
prod = *sc->ale_cdata.ale_tx_cmb & TPD_CNT_MASK;
} else
diff --git a/sys/dev/pci/if_ath_pci.c b/sys/dev/pci/if_ath_pci.c
index 76fc450ade2..0bf87038472 100644
--- a/sys/dev/pci/if_ath_pci.c
+++ b/sys/dev/pci/if_ath_pci.c
@@ -1,4 +1,4 @@
-/* $NetBSD: if_ath_pci.c,v 1.46 2012/08/04 04:05:36 riastradh Exp $ */
+/* $NetBSD: if_ath_pci.c,v 1.47 2013/03/30 03:21:03 christos Exp $ */
/*-
* Copyright (c) 2002-2005 Sam Leffler, Errno Consulting
@@ -63,7 +63,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_ath_pci.c,v 1.46 2012/08/04 04:05:36 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_ath_pci.c,v 1.47 2013/03/30 03:21:03 christos Exp $");
/*
* PCI/Cardbus front-end for the Atheros Wireless LAN controller driver.
@@ -195,7 +195,7 @@ ath_pci_attach(device_t parent, device_t self, void *aux)
goto bad1;
}
- intrstr = pci_intr_string(pc, psc->sc_pih);
+ intrstr = pci_intr_string(pc, psc->sc_pih);
psc->sc_ih = pci_intr_establish(pc, psc->sc_pih, IPL_NET, ath_intr, sc);
if (psc->sc_ih == NULL) {
aprint_error("couldn't map interrupt\n");
diff --git a/sys/dev/pci/if_bge.c b/sys/dev/pci/if_bge.c
index 657c56f0f9a..34f93a5de75 100644
--- a/sys/dev/pci/if_bge.c
+++ b/sys/dev/pci/if_bge.c
@@ -1,4 +1,4 @@
-/* $NetBSD: if_bge.c,v 1.229 2013/03/27 12:03:51 msaitoh Exp $ */
+/* $NetBSD: if_bge.c,v 1.230 2013/03/30 03:21:03 christos Exp $ */
/*
* Copyright (c) 2001 Wind River Systems
@@ -79,7 +79,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_bge.c,v 1.229 2013/03/27 12:03:51 msaitoh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_bge.c,v 1.230 2013/03/30 03:21:03 christos Exp $");
#include "vlan.h"
@@ -2276,7 +2276,7 @@ bge_chipinit(struct bge_softc *sc)
/* Restore */
CSR_WRITE_4(sc, BGE_MODE_CTL, mode_ctl);
}
-
+
/* XXX Should we use 57765_FAMILY? */
if (BGE_IS_57765_PLUS(sc)) {
if (sc->bge_chipid == BGE_CHIPID_BCM57765_A0) {
@@ -2287,7 +2287,7 @@ bge_chipinit(struct bge_softc *sc)
reg = mode_ctl & ~BGE_MODECTL_PCIE_TLPADDRMASK;
CSR_WRITE_4(sc, BGE_MODE_CTL,
reg | BGE_MODECTL_PCIE_TLPADDR1);
-
+
/* Control TLP */
reg = CSR_READ_4(sc, BGE_TLP_CONTROL_REG +
BGE_TLP_PHYCTL5);
@@ -3825,7 +3825,7 @@ bge_detach(device_t self, int flags __unused)
splx(s);
mii_detach(&sc->bge_mii, MII_PHY_ANY, MII_OFFSET_ANY);
-
+
/* Delete all remaining media. */
ifmedia_delete_instance(&sc->bge_mii.mii_media, IFM_INST_ANY);
@@ -4067,7 +4067,7 @@ bge_reset(struct bge_softc *sc)
/* Step 21: 5822 B0 errata */
if (BGE_CHIPREV(sc->bge_chipid) == BGE_CHIPREV_5704_BX) {
pcireg_t msidata;
-
+
msidata = pci_conf_read(sc->sc_pc, sc->sc_pcitag,
BGE_PCI_MSI_DATA);
msidata |= ((1 << 13 | 1 << 12 | 1 << 10) << 16);
diff --git a/sys/dev/pci/if_bnx.c b/sys/dev/pci/if_bnx.c
index f2379051d35..472f871d6fd 100644
--- a/sys/dev/pci/if_bnx.c
+++ b/sys/dev/pci/if_bnx.c
@@ -1,4 +1,4 @@
-/* $NetBSD: if_bnx.c,v 1.47 2012/07/22 14:33:01 matt Exp $ */
+/* $NetBSD: if_bnx.c,v 1.48 2013/03/30 03:21:03 christos Exp $ */
/* $OpenBSD: if_bnx.c,v 1.85 2009/11/09 14:32:41 dlg Exp $ */
/*-
@@ -35,7 +35,7 @@
#if 0
__FBSDID("$FreeBSD: src/sys/dev/bce/if_bce.c,v 1.3 2006/04/13 14:12:26 ru Exp $");
#endif
-__KERNEL_RCSID(0, "$NetBSD: if_bnx.c,v 1.47 2012/07/22 14:33:01 matt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_bnx.c,v 1.48 2013/03/30 03:21:03 christos Exp $");
/*
* The following controllers are supported by this driver:
@@ -48,7 +48,7 @@ __KERNEL_RCSID(0, "$NetBSD: if_bnx.c,v 1.47 2012/07/22 14:33:01 matt Exp $");
* BCM5716 C0
*
* The following controllers are not supported by this driver:
- *
+ *
* BCM5706C A0, A1
* BCM5706S A0, A1
* BCM5708C A0, B0
@@ -507,7 +507,7 @@ bnx_attach(device_t parent, device_t self, void *aux)
return;
}
- memtype = pci_mapreg_type(pa->pa_pc, pa->pa_tag, BNX_PCI_BAR0);
+ memtype = pci_mapreg_type(pa->pa_pc, pa->pa_tag, BNX_PCI_BAR0);
if (pci_mapreg_map(pa, BNX_PCI_BAR0, memtype, 0, &sc->bnx_btag,
&sc->bnx_bhandle, NULL, &sc->bnx_size)) {
aprint_error_dev(sc->bnx_dev, "can't find mem space\n");
@@ -622,7 +622,7 @@ bnx_attach(device_t parent, device_t self, void *aux)
* should be ready before generating an
* interrupt while ticks control how long
* a BD can sit in the chain before
- * generating an interrupt. Set the default
+ * generating an interrupt. Set the default
* values for the RX and TX rings.
*/
@@ -1531,7 +1531,7 @@ bnx_init_nvram(struct bnx_softc *sc)
if (val & 0x40000000) {
/* Flash interface reconfigured by bootcode. */
- DBPRINT(sc,BNX_INFO_LOAD,
+ DBPRINT(sc,BNX_INFO_LOAD,
"bnx_init_nvram(): Flash WAS reconfigured.\n");
for (j = 0, flash = &flash_table[0]; j < entry_count;
@@ -1546,7 +1546,7 @@ bnx_init_nvram(struct bnx_softc *sc)
/* Flash interface not yet reconfigured. */
u_int32_t mask;
- DBPRINT(sc,BNX_INFO_LOAD,
+ DBPRINT(sc,BNX_INFO_LOAD,
"bnx_init_nvram(): Flash was NOT reconfigured.\n");
if (val & (1 << 23))
@@ -1981,7 +1981,7 @@ void
bnx_get_media(struct bnx_softc *sc)
{
sc->bnx_phy_addr = 1;
-
+
if (BNX_CHIP_NUM(sc) == BNX_CHIP_NUM_5709) {
u_int32_t val = REG_RD(sc, BNX_MISC_DUAL_MEDIA_CTRL);
u_int32_t bond_id = val & BNX_MISC_DUAL_MEDIA_CTRL_BOND_ID;
@@ -2014,12 +2014,12 @@ bnx_get_media(struct bnx_softc *sc)
case 0x4:
case 0x5:
case 0x6:
- DBPRINT(sc, BNX_INFO_LOAD,
+ DBPRINT(sc, BNX_INFO_LOAD,
"BCM5709 s/w configured for SerDes.\n");
sc->bnx_phy_flags |= BNX_PHY_SERDES_FLAG;
break;
default:
- DBPRINT(sc, BNX_INFO_LOAD,
+ DBPRINT(sc, BNX_INFO_LOAD,
"BCM5709 s/w configured for Copper.\n");
}
} else {
@@ -2027,12 +2027,12 @@ bnx_get_media(struct bnx_softc *sc)
case 0x1:
case 0x2:
case 0x4:
- DBPRINT(sc, BNX_INFO_LOAD,
+ DBPRINT(sc, BNX_INFO_LOAD,
"BCM5709 s/w configured for SerDes.\n");
sc->bnx_phy_flags |= BNX_PHY_SERDES_FLAG;
break;
default:
- DBPRINT(sc, BNX_INFO_LOAD,
+ DBPRINT(sc, BNX_INFO_LOAD,
"BCM5709 s/w configured for Copper.\n");
}
}
@@ -2042,7 +2042,7 @@ bnx_get_media(struct bnx_softc *sc)
if (sc->bnx_phy_flags & BNX_PHY_SERDES_FLAG) {
u_int32_t val;
-
+
sc->bnx_flags |= BNX_NO_WOL_FLAG;
if (BNX_CHIP_NUM(sc) == BNX_CHIP_NUM_5709)
@@ -2067,7 +2067,7 @@ bnx_get_media(struct bnx_softc *sc)
sc->bnx_phy_flags |= BNX_PHY_CRC_FIX_FLAG;
bnx_get_media_exit:
- DBPRINT(sc, (BNX_INFO_LOAD),
+ DBPRINT(sc, (BNX_INFO_LOAD),
"Using PHY address %d.\n", sc->bnx_phy_addr);
}
@@ -2121,7 +2121,7 @@ bnx_dma_free(struct bnx_softc *sc)
if (sc->status_block != NULL && sc->status_map != NULL) {
bus_dmamap_unload(sc->bnx_dmatag, sc->status_map);
bus_dmamem_unmap(sc->bnx_dmatag, (void *)sc->status_block,
- BNX_STATUS_BLK_SZ);
+ BNX_STATUS_BLK_SZ);
bus_dmamem_free(sc->bnx_dmatag, &sc->status_seg,
sc->status_rseg);
bus_dmamap_destroy(sc->bnx_dmatag, sc->status_map);
@@ -2133,7 +2133,7 @@ bnx_dma_free(struct bnx_softc *sc)
if (sc->stats_block != NULL && sc->stats_map != NULL) {
bus_dmamap_unload(sc->bnx_dmatag, sc->stats_map);
bus_dmamem_unmap(sc->bnx_dmatag, (void *)sc->stats_block,
- BNX_STATS_BLK_SZ);
+ BNX_STATS_BLK_SZ);
bus_dmamem_free(sc->bnx_dmatag, &sc->stats_seg,
sc->stats_rseg);
bus_dmamap_destroy(sc->bnx_dmatag, sc->stats_map);
@@ -2356,7 +2356,7 @@ bnx_dma_alloc(struct bnx_softc *sc)
memset(sc->stats_block, 0, BNX_STATS_BLK_SZ);
/* DRC - Fix for 64 bit address. */
- DBPRINT(sc,BNX_INFO, "stats_block_paddr = 0x%08X\n",
+ DBPRINT(sc,BNX_INFO, "stats_block_paddr = 0x%08X\n",
(u_int32_t) sc->stats_block_paddr);
/*
@@ -2376,7 +2376,7 @@ bnx_dma_alloc(struct bnx_softc *sc)
if (bus_dmamem_alloc(sc->bnx_dmatag, BNX_TX_CHAIN_PAGE_SZ,
BCM_PAGE_SIZE, BNX_DMA_BOUNDARY, &sc->tx_bd_chain_seg[i], 1,
&sc->tx_bd_chain_rseg[i], BUS_DMA_NOWAIT)) {
- aprint_error_dev(sc->bnx_dev,
+ aprint_error_dev(sc->bnx_dev,
"Could not allocate TX desc %d DMA memory!\n",
i);
rc = ENOMEM;
@@ -2405,7 +2405,7 @@ bnx_dma_alloc(struct bnx_softc *sc)
sc->tx_bd_chain_map[i]->dm_segs[0].ds_addr;
/* DRC - Fix for 64 bit systems. */
- DBPRINT(sc, BNX_INFO, "tx_bd_chain_paddr[%d] = 0x%08X\n",
+ DBPRINT(sc, BNX_INFO, "tx_bd_chain_paddr[%d] = 0x%08X\n",
i, (u_int32_t) sc->tx_bd_chain_paddr[i]);
}
@@ -2463,7 +2463,7 @@ bnx_dma_alloc(struct bnx_softc *sc)
sc->rx_bd_chain_map[i]->dm_segs[0].ds_addr;
/* DRC - Fix for 64 bit systems. */
- DBPRINT(sc, BNX_INFO, "rx_bd_chain_paddr[%d] = 0x%08X\n",
+ DBPRINT(sc, BNX_INFO, "rx_bd_chain_paddr[%d] = 0x%08X\n",
i, (u_int32_t) sc->rx_bd_chain_paddr[i]);
bus_dmamap_sync(sc->bnx_dmatag, sc->rx_bd_chain_map[i],
0, BNX_RX_CHAIN_PAGE_SZ,
@@ -2583,7 +2583,7 @@ bnx_fw_sync_exit:
/* Nothing. */
/****************************************************************************/
void
-bnx_load_rv2p_fw(struct bnx_softc *sc, u_int32_t *rv2p_code,
+bnx_load_rv2p_fw(struct bnx_softc *sc, u_int32_t *rv2p_code,
u_int32_t rv2p_code_len, u_int32_t rv2p_proc)
{
int i;
@@ -3678,7 +3678,7 @@ bnx_add_buf(struct bnx_softc *sc, struct mbuf *m_new, u_int16_t *prod,
BUS_DMASYNC_PREREAD);
/* Update some debug statistics counters */
- DBRUNIF((sc->free_rx_bd < sc->rx_low_watermark),
+ DBRUNIF((sc->free_rx_bd < sc->rx_low_watermark),
sc->rx_low_watermark = sc->free_rx_bd);
DBRUNIF((sc->free_rx_bd == sc->max_rx_bd), sc->rx_empty_count++);
@@ -3701,7 +3701,7 @@ bnx_add_buf(struct bnx_softc *sc, struct mbuf *m_new, u_int16_t *prod,
for (i = 1; i < map->dm_nsegs; i++) {
*prod = NEXT_RX_BD(*prod);
- *chain_prod = RX_CHAIN_IDX(*prod);
+ *chain_prod = RX_CHAIN_IDX(*prod);
rxbd =
&sc->rx_bd_chain[RX_PAGE(*chain_prod)][RX_IDX(*chain_prod)];
@@ -3735,10 +3735,10 @@ bnx_add_buf(struct bnx_softc *sc, struct mbuf *m_new, u_int16_t *prod,
sc->rx_mbuf_map[*chain_prod] = map;
sc->free_rx_bd -= map->dm_nsegs;
- DBRUN(BNX_VERBOSE_RECV, bnx_dump_rx_mbuf_chain(sc, debug_chain_prod,
+ DBRUN(BNX_VERBOSE_RECV, bnx_dump_rx_mbuf_chain(sc, debug_chain_prod,
map->dm_nsegs));
*prod = NEXT_RX_BD(*prod);
- *chain_prod = RX_CHAIN_IDX(*prod);
+ *chain_prod = RX_CHAIN_IDX(*prod);
return 0;
}
@@ -3761,7 +3761,7 @@ bnx_get_buf(struct bnx_softc *sc, u_int16_t *prod,
int rc = 0;
u_int16_t min_free_bd;
- DBPRINT(sc, (BNX_VERBOSE_RESET | BNX_VERBOSE_RECV), "Entering %s()\n",
+ DBPRINT(sc, (BNX_VERBOSE_RESET | BNX_VERBOSE_RECV), "Entering %s()\n",
__func__);
/* Make sure the inputs are valid. */
@@ -3792,7 +3792,7 @@ bnx_get_buf(struct bnx_softc *sc, u_int16_t *prod,
MGETHDR(m_new, M_DONTWAIT, MT_DATA);
if (m_new == NULL) {
DBPRINT(sc, BNX_WARN,
- "%s(%d): RX mbuf header allocation failed!\n",
+ "%s(%d): RX mbuf header allocation failed!\n",
__FILE__, __LINE__);
sc->mbuf_alloc_failed++;
@@ -3807,7 +3807,7 @@ bnx_get_buf(struct bnx_softc *sc, u_int16_t *prod,
DBRUNIF(DB_RANDOMTRUE(bnx_debug_mbuf_allocation_failure),
m_freem(m_new);
sc->rx_mbuf_alloc--;
- sc->mbuf_alloc_failed++;
+ sc->mbuf_alloc_failed++;
sc->mbuf_sim_alloc_failed++;
rc = ENOBUFS;
goto bnx_get_buf_exit);
@@ -3819,9 +3819,9 @@ bnx_get_buf(struct bnx_softc *sc, u_int16_t *prod,
M_DONTWAIT);
if (!(m_new->m_flags & M_EXT)) {
DBPRINT(sc, BNX_WARN,
- "%s(%d): RX mbuf chain allocation failed!\n",
+ "%s(%d): RX mbuf chain allocation failed!\n",
__FILE__, __LINE__);
-
+
m_freem(m_new);
DBRUNIF(1, sc->rx_mbuf_alloc--);
@@ -3830,7 +3830,7 @@ bnx_get_buf(struct bnx_softc *sc, u_int16_t *prod,
rc = ENOBUFS;
goto bnx_get_buf_exit;
}
-
+
rc = bnx_add_buf(sc, m_new, prod, chain_prod, prod_bseq);
if (rc != 0)
goto bnx_get_buf_exit;
@@ -3841,7 +3841,7 @@ bnx_get_buf_exit:
"= 0x%04X, prod_bseq = 0x%08X\n", __func__, *prod,
*chain_prod, *prod_bseq);
- DBPRINT(sc, (BNX_VERBOSE_RESET | BNX_VERBOSE_RECV), "Exiting %s()\n",
+ DBPRINT(sc, (BNX_VERBOSE_RESET | BNX_VERBOSE_RECV), "Exiting %s()\n",
__func__);
return(rc);
@@ -4328,8 +4328,8 @@ bnx_rx_intr(struct bnx_softc *sc)
sc->rx_low_watermark = sc->free_rx_bd);
DBRUNIF((sc->free_rx_bd == USABLE_RX_BD), sc->rx_empty_count++);
- /*
- * Scan through the receive chain as long
+ /*
+ * Scan through the receive chain as long
* as there is work to do.
*/
while (sw_cons != hw_cons) {
@@ -4347,8 +4347,8 @@ bnx_rx_intr(struct bnx_softc *sc)
/* Get the used rx_bd. */
rxbd = &sc->rx_bd_chain[RX_PAGE(sw_chain_cons)][RX_IDX(sw_chain_cons)];
sc->free_rx_bd++;
-
- DBRUN(BNX_VERBOSE_RECV, aprint_error("%s(): ", __func__);
+
+ DBRUN(BNX_VERBOSE_RECV, aprint_error("%s(): ", __func__);
bnx_dump_rxbd(sc, sw_chain_cons, rxbd));
/* The mbuf is stored with the last rx_bd entry of a packet. */
@@ -4395,12 +4395,12 @@ bnx_rx_intr(struct bnx_softc *sc)
sc->rx_mbuf_ptr[sw_chain_cons] = NULL;
/*
- * Frames received on the NetXteme II are prepended
+ * Frames received on the NetXteme II are prepended
* with the l2_fhdr structure which provides status
* information about the received frame (including
* VLAN tags and checksum info) and are also
* automatically adjusted to align the IP header
- * (i.e. two null bytes are inserted before the
+ * (i.e. two null bytes are inserted before the
* Ethernet header).
*/
l2fhdr = mtod(m, struct l2_fhdr *);
@@ -4427,9 +4427,9 @@ bnx_rx_intr(struct bnx_softc *sc)
len -= ETHER_CRC_LEN;
/* Check the received frame for errors. */
- if ((status & (L2_FHDR_ERRORS_BAD_CRC |
+ if ((status & (L2_FHDR_ERRORS_BAD_CRC |
L2_FHDR_ERRORS_PHY_DECODE |
- L2_FHDR_ERRORS_ALIGNMENT |
+ L2_FHDR_ERRORS_ALIGNMENT |
L2_FHDR_ERRORS_TOO_SHORT |
L2_FHDR_ERRORS_GIANT_FRAME)) ||
len < (BNX_MIN_MTU - ETHER_CRC_LEN) ||
@@ -4448,7 +4448,7 @@ bnx_rx_intr(struct bnx_softc *sc)
continue;
}
- /*
+ /*
* Get a new mbuf for the rx_bd. If no new
* mbufs are available then reuse the current mbuf,
* log an ierror on the interface, and generate
@@ -4503,7 +4503,7 @@ bnx_rx_intr(struct bnx_softc *sc)
M_CSUM_IPv4;
#ifdef BNX_DEBUG
else
- DBPRINT(sc, BNX_WARN_SEND,
+ DBPRINT(sc, BNX_WARN_SEND,
"%s(): Invalid IP checksum "
"= 0x%04X!\n",
__func__,
@@ -4523,7 +4523,7 @@ bnx_rx_intr(struct bnx_softc *sc)
M_CSUM_TCPv4 |
M_CSUM_UDPv4;
} else {
- DBPRINT(sc, BNX_WARN_SEND,
+ DBPRINT(sc, BNX_WARN_SEND,
"%s(): Invalid TCP/UDP "
"checksum = 0x%04X!\n",
__func__,
@@ -4571,7 +4571,7 @@ bnx_rx_intr(struct bnx_softc *sc)
/* Prevent speculative reads from getting ahead of
* the status block.
*/
- bus_space_barrier(sc->bnx_btag, sc->bnx_bhandle, 0, 0,
+ bus_space_barrier(sc->bnx_btag, sc->bnx_bhandle, 0, 0,
BUS_SPACE_BARRIER_READ);
}
@@ -4622,7 +4622,7 @@ bnx_tx_intr(struct bnx_softc *sc)
sw_tx_cons = sc->tx_cons;
/* Prevent speculative reads from getting ahead of the status block. */
- bus_space_barrier(sc->bnx_btag, sc->bnx_bhandle, 0, 0,
+ bus_space_barrier(sc->bnx_btag, sc->bnx_bhandle, 0, 0,
BUS_SPACE_BARRIER_READ);
/* Cycle through any completed TX chain page entries. */
@@ -4643,7 +4643,7 @@ bnx_tx_intr(struct bnx_softc *sc)
DBRUNIF(1, txbd = &sc->tx_bd_chain
[TX_PAGE(sw_tx_chain_cons)][TX_IDX(sw_tx_chain_cons)]);
-
+
DBRUNIF((txbd == NULL),
aprint_error_dev(sc->bnx_dev,
"Unexpected NULL tx_bd[0x%04X]!\n", sw_tx_chain_cons);
@@ -4694,7 +4694,7 @@ bnx_tx_intr(struct bnx_softc *sc)
/* Prevent speculative reads from getting ahead of
* the status block.
*/
- bus_space_barrier(sc->bnx_btag, sc->bnx_bhandle, 0, 0,
+ bus_space_barrier(sc->bnx_btag, sc->bnx_bhandle, 0, 0,
BUS_SPACE_BARRIER_READ);
}
@@ -4740,7 +4740,7 @@ bnx_enable_intr(struct bnx_softc *sc)
REG_WR(sc, BNX_PCICFG_INT_ACK_CMD, BNX_PCICFG_INT_ACK_CMD_INDEX_VALID |
BNX_PCICFG_INT_ACK_CMD_MASK_INT | sc->last_status_idx);
- REG_WR(sc, BNX_PCICFG_INT_ACK_CMD, BNX_PCICFG_INT_ACK_CMD_INDEX_VALID |
+ REG_WR(sc, BNX_PCICFG_INT_ACK_CMD, BNX_PCICFG_INT_ACK_CMD_INDEX_VALID |
sc->last_status_idx);
val = REG_RD(sc, BNX_HC_COMMAND);
@@ -4900,7 +4900,7 @@ bnx_tx_encap(struct bnx_softc *sc, struct mbuf *m)
prod = sc->tx_prod;
chain_prod = TX_CHAIN_IDX(prod);
map = pkt->pkt_dmamap;
-
+
/* Map the mbuf into our DMA address space. */
error = bus_dmamap_load_mbuf(sc->bnx_dmatag, map, m, BUS_DMA_NOWAIT);
if (error != 0) {
@@ -4934,7 +4934,7 @@ bnx_tx_encap(struct bnx_softc *sc, struct mbuf *m)
for (i = 0; i < map->dm_nsegs ; i++) {
chain_prod = TX_CHAIN_IDX(prod);
txbd = &sc->tx_bd_chain[TX_PAGE(chain_prod)][TX_IDX(chain_prod)];
-
+
addr = (u_int32_t)map->dm_segs[i].ds_addr;
txbd->tx_bd_haddr_lo = addr;
addr = (u_int32_t)((u_int64_t)map->dm_segs[i].ds_addr >> 32);
@@ -4949,9 +4949,9 @@ bnx_tx_encap(struct bnx_softc *sc, struct mbuf *m)
}
/* Set the END flag on the last TX buffer descriptor. */
txbd->tx_bd_flags |= TX_BD_FLAGS_END;
-
+
DBRUN(BNX_INFO_SEND, bnx_dump_tx_chain(sc, debug_prod, map->dm_nsegs));
-
+
DBPRINT(sc, BNX_INFO_SEND,
"%s(): End: prod = 0x%04X, chain_prod = %04X, "
"prod_bseq = 0x%08X\n",
@@ -4974,7 +4974,7 @@ bnx_tx_encap(struct bnx_softc *sc, struct mbuf *m)
DBRUNIF(sc->used_tx_bd == sc->max_tx_bd, sc->tx_full_count++);
DBRUNIF(1, sc->tx_mbuf_alloc++);
- DBRUN(BNX_VERBOSE_SEND, bnx_dump_tx_mbuf_chain(sc, chain_prod,
+ DBRUN(BNX_VERBOSE_SEND, bnx_dump_tx_mbuf_chain(sc, chain_prod,
map->dm_nsegs));
/* prod points to the next free tx_bd at this point. */
@@ -5126,7 +5126,7 @@ bnx_ioctl(struct ifnet *ifp, u_long command, void *data)
if (error == ENETRESET) {
if (ifp->if_flags & IFF_RUNNING)
bnx_iff(sc);
- error = 0;
+ error = 0;
}
splx(s);
@@ -5150,7 +5150,7 @@ bnx_watchdog(struct ifnet *ifp)
* If we are in this routine because of pause frames, then
* don't reset the hardware.
*/
- if (REG_RD(sc, BNX_EMAC_TX_STATUS) & BNX_EMAC_TX_STATUS_XOFFED)
+ if (REG_RD(sc, BNX_EMAC_TX_STATUS) & BNX_EMAC_TX_STATUS_XOFFED)
return;
aprint_error_dev(sc->bnx_dev, "Watchdog timeout -- resetting!\n");
@@ -5200,7 +5200,7 @@ bnx_intr(void *xsc)
* driver and we haven't asserted our
* interrupt then there's nothing to do.
*/
- if ((sc->status_block->status_idx == sc->last_status_idx) &&
+ if ((sc->status_block->status_idx == sc->last_status_idx) &&
(REG_RD(sc, BNX_PCICFG_MISC_STATUS) &
BNX_PCICFG_MISC_STATUS_INTA_VALUE))
return (0);
@@ -5228,12 +5228,12 @@ bnx_intr(void *xsc)
/* If any other attention is asserted then the chip is toast. */
if (((status_attn_bits & ~STATUS_ATTN_BITS_LINK_STATE) !=
- (sblk->status_attn_bits_ack &
+ (sblk->status_attn_bits_ack &
~STATUS_ATTN_BITS_LINK_STATE))) {
DBRUN(1, sc->unexpected_attentions++);
BNX_PRINTF(sc,
- "Fatal attention detected: 0x%08X\n",
+ "Fatal attention detected: 0x%08X\n",
sblk->status_attn_bits);
DBRUN(BNX_FATAL,
@@ -5262,7 +5262,7 @@ bnx_intr(void *xsc)
/* Prevent speculative reads from getting ahead of the
* status block.
*/
- bus_space_barrier(sc->bnx_btag, sc->bnx_bhandle, 0, 0,
+ bus_space_barrier(sc->bnx_btag, sc->bnx_bhandle, 0, 0,
BUS_SPACE_BARRIER_READ);
/* If there's no work left then exit the isr. */
@@ -5366,7 +5366,7 @@ allmulti:
/* Only make changes if the recive mode has actually changed. */
if (rx_mode != sc->rx_mode) {
- DBPRINT(sc, BNX_VERBOSE, "Enabling new receive mode: 0x%08X\n",
+ DBPRINT(sc, BNX_VERBOSE, "Enabling new receive mode: 0x%08X\n",
rx_mode);
sc->rx_mode = rx_mode;
@@ -5398,7 +5398,7 @@ bnx_stats_update(struct bnx_softc *sc)
stats = (struct statistics_block *)sc->stats_block;
- /*
+ /*
* Update the interface statistics from the
* hardware statistics.
*/
@@ -5415,10 +5415,10 @@ bnx_stats_update(struct bnx_softc *sc)
(u_long)stats->stat_Dot3StatsExcessiveCollisions +
(u_long)stats->stat_Dot3StatsLateCollisions;
- /*
- * Certain controllers don't report
+ /*
+ * Certain controllers don't report
* carrier sense errors correctly.
- * See errata E11_5708CA0_1165.
+ * See errata E11_5708CA0_1165.
*/
if (!(BNX_CHIP_NUM(sc) == BNX_CHIP_NUM_5706) &&
!(BNX_CHIP_ID(sc) == BNX_CHIP_ID_5708_A0))
@@ -5432,7 +5432,7 @@ bnx_stats_update(struct bnx_softc *sc)
(u_int64_t) stats->stat_IfHCInOctets_lo;
sc->stat_IfHCInBadOctets =
- ((u_int64_t) stats->stat_IfHCInBadOctets_hi << 32) +
+ ((u_int64_t) stats->stat_IfHCInBadOctets_hi << 32) +
(u_int64_t) stats->stat_IfHCInBadOctets_lo;
sc->stat_IfHCOutOctets =
@@ -5644,7 +5644,7 @@ bnx_dump_mbuf(struct bnx_softc *sc, struct mbuf *m)
}
while (mp) {
- aprint_debug("mbuf: vaddr = %p, m_len = %d, m_flags = ",
+ aprint_debug("mbuf: vaddr = %p, m_len = %d, m_flags = ",
mp, mp->m_len);
if (mp->m_flags & M_EXT)
@@ -5654,7 +5654,7 @@ bnx_dump_mbuf(struct bnx_softc *sc, struct mbuf *m)
aprint_debug("\n");
if (mp->m_flags & M_EXT)
- aprint_debug("- m_ext: vaddr = %p, ext_size = 0x%04zX\n",
+ aprint_debug("- m_ext: vaddr = %p, ext_size = 0x%04zX\n",
mp, mp->m_ext.ext_size);
mp = mp->m_next;
@@ -5733,7 +5733,7 @@ bnx_dump_txbd(struct bnx_softc *sc, int idx, struct tx_bd *txbd)
else
/* Normal tx_bd entry. */
BNX_PRINTF(sc, "tx_bd[0x%04X]: haddr = 0x%08X:%08X, nbytes = "
- "0x%08X, vlan tag = 0x%4X, flags = 0x%08X\n", idx,
+ "0x%08X, vlan tag = 0x%4X, flags = 0x%08X\n", idx,
txbd->tx_bd_haddr_hi, txbd->tx_bd_haddr_lo,
txbd->tx_bd_mss_nbytes, txbd->tx_bd_vlan_tag,
txbd->tx_bd_flags);
@@ -5753,7 +5753,7 @@ bnx_dump_rxbd(struct bnx_softc *sc, int idx, struct rx_bd *rxbd)
else
/* Normal tx_bd entry. */
BNX_PRINTF(sc, "rx_bd[0x%04X]: haddr = 0x%08X:%08X, nbytes = "
- "0x%08X, flags = 0x%08X\n", idx,
+ "0x%08X, flags = 0x%08X\n", idx,
rxbd->rx_bd_haddr_hi, rxbd->rx_bd_haddr_lo,
rxbd->rx_bd_len, rxbd->rx_bd_flags);
}
@@ -5884,61 +5884,61 @@ bnx_dump_status_block(struct bnx_softc *sc)
BNX_PRINTF(sc, "status_idx = 0x%04X\n", sblk->status_idx);
/* Theses indices are not used for normal L2 drivers. */
- if (sblk->status_rx_quick_consumer_index1 ||
+ if (sblk->status_rx_quick_consumer_index1 ||
sblk->status_tx_quick_consumer_index1)
BNX_PRINTF(sc, "rx_cons1 = 0x%08X, tx_cons1 = 0x%08X\n",
sblk->status_rx_quick_consumer_index1,
sblk->status_tx_quick_consumer_index1);
- if (sblk->status_rx_quick_consumer_index2 ||
+ if (sblk->status_rx_quick_consumer_index2 ||
sblk->status_tx_quick_consumer_index2)
BNX_PRINTF(sc, "rx_cons2 = 0x%08X, tx_cons2 = 0x%08X\n",
sblk->status_rx_quick_consumer_index2,
sblk->status_tx_quick_consumer_index2);
- if (sblk->status_rx_quick_consumer_index3 ||
+ if (sblk->status_rx_quick_consumer_index3 ||
sblk->status_tx_quick_consumer_index3)
BNX_PRINTF(sc, "rx_cons3 = 0x%08X, tx_cons3 = 0x%08X\n",
sblk->status_rx_quick_consumer_index3,
sblk->status_tx_quick_consumer_index3);
- if (sblk->status_rx_quick_consumer_index4 ||
+ if (sblk->status_rx_quick_consumer_index4 ||
sblk->status_rx_quick_consumer_index5)
BNX_PRINTF(sc, "rx_cons4 = 0x%08X, rx_cons5 = 0x%08X\n",
sblk->status_rx_quick_consumer_index4,
sblk->status_rx_quick_consumer_index5);
- if (sblk->status_rx_quick_consumer_index6 ||
+ if (sblk->status_rx_quick_consumer_index6 ||
sblk->status_rx_quick_consumer_index7)
BNX_PRINTF(sc, "rx_cons6 = 0x%08X, rx_cons7 = 0x%08X\n",
sblk->status_rx_quick_consumer_index6,
sblk->status_rx_quick_consumer_index7);
- if (sblk->status_rx_quick_consumer_index8 ||
+ if (sblk->status_rx_quick_consumer_index8 ||
sblk->status_rx_quick_consumer_index9)
BNX_PRINTF(sc, "rx_cons8 = 0x%08X, rx_cons9 = 0x%08X\n",
sblk->status_rx_quick_consumer_index8,
sblk->status_rx_quick_consumer_index9);
- if (sblk->status_rx_quick_consumer_index10 ||
+ if (sblk->status_rx_quick_consumer_index10 ||
sblk->status_rx_quick_consumer_index11)
BNX_PRINTF(sc, "rx_cons10 = 0x%08X, rx_cons11 = 0x%08X\n",
sblk->status_rx_quick_consumer_index10,
sblk->status_rx_quick_consumer_index11);
- if (sblk->status_rx_quick_consumer_index12 ||
+ if (sblk->status_rx_quick_consumer_index12 ||
sblk->status_rx_quick_consumer_index13)
BNX_PRINTF(sc, "rx_cons12 = 0x%08X, rx_cons13 = 0x%08X\n",
sblk->status_rx_quick_consumer_index12,
sblk->status_rx_quick_consumer_index13);
- if (sblk->status_rx_quick_consumer_index14 ||
+ if (sblk->status_rx_quick_consumer_index14 ||
sblk->status_rx_quick_consumer_index15)
BNX_PRINTF(sc, "rx_cons14 = 0x%08X, rx_cons15 = 0x%08X\n",
sblk->status_rx_quick_consumer_index14,
sblk->status_rx_quick_consumer_index15);
- if (sblk->status_completion_producer_index ||
+ if (sblk->status_completion_producer_index ||
sblk->status_cmd_consumer_index)
BNX_PRINTF(sc, "com_prod = 0x%08X, cmd_cons = 0x%08X\n",
sblk->status_completion_producer_index,
@@ -5997,7 +5997,7 @@ bnx_dump_stats_block(struct bnx_softc *sc)
if (sblk->stat_emac_tx_stat_dot3statsinternalmactransmiterrors)
BNX_PRINTF(sc, "0x%08X : "
- "emac_tx_stat_dot3statsinternalmactransmiterrors\n",
+ "emac_tx_stat_dot3statsinternalmactransmiterrors\n",
sblk->stat_emac_tx_stat_dot3statsinternalmactransmiterrors);
if (sblk->stat_Dot3StatsCarrierSenseErrors)
@@ -6019,7 +6019,7 @@ bnx_dump_stats_block(struct bnx_softc *sc)
if (sblk->stat_Dot3StatsMultipleCollisionFrames)
BNX_PRINTF(sc, "0x%08X : Dot3StatsMultipleCollisionFrames\n",
sblk->stat_Dot3StatsMultipleCollisionFrames);
-
+
if (sblk->stat_Dot3StatsDeferredTransmissions)
BNX_PRINTF(sc, "0x%08X : Dot3StatsDeferredTransmissions\n",
sblk->stat_Dot3StatsDeferredTransmissions);
@@ -6036,7 +6036,7 @@ bnx_dump_stats_block(struct bnx_softc *sc)
BNX_PRINTF(sc, "0x%08X : EtherStatsCollisions\n",
sblk->stat_EtherStatsCollisions);
- if (sblk->stat_EtherStatsFragments)
+ if (sblk->stat_EtherStatsFragments)
BNX_PRINTF(sc, "0x%08X : EtherStatsFragments\n",
sblk->stat_EtherStatsFragments);
@@ -6222,7 +6222,7 @@ bnx_dump_driver_state(struct bnx_softc *sc)
BNX_PRINTF(sc,
" 0x%08X - (sc->interrupts_generated) h/w intrs\n",
sc->interrupts_generated);
-
+
BNX_PRINTF(sc,
" 0x%08X - (sc->rx_interrupts) rx interrupts handled\n",
sc->rx_interrupts);
@@ -6333,12 +6333,12 @@ bnx_dump_hw_state(struct bnx_softc *sc)
val1 = REG_RD(sc, BNX_HC_STATUS);
BNX_PRINTF(sc, "0x%08X : (0x%04X) hc_status\n", val1, BNX_HC_STATUS);
- aprint_debug_dev(sc->bnx_dev,
+ aprint_debug_dev(sc->bnx_dev,
"----------------------------"
"----------------"
"----------------------------\n");
- aprint_debug_dev(sc->bnx_dev,
+ aprint_debug_dev(sc->bnx_dev,
"----------------------------"
" Register Dump "
"----------------------------\n");
@@ -6348,7 +6348,7 @@ bnx_dump_hw_state(struct bnx_softc *sc)
i, REG_RD(sc, i), REG_RD(sc, i + 0x4),
REG_RD(sc, i + 0x8), REG_RD(sc, i + 0xC));
- aprint_debug_dev(sc->bnx_dev,
+ aprint_debug_dev(sc->bnx_dev,
"----------------------------"
"----------------"
"----------------------------\n");
diff --git a/sys/dev/pci/if_bwi_pci.c b/sys/dev/pci/if_bwi_pci.c
index 8d81b43a1c3..9aba69356d9 100644
--- a/sys/dev/pci/if_bwi_pci.c
+++ b/sys/dev/pci/if_bwi_pci.c
@@ -1,4 +1,4 @@
-/* $NetBSD: if_bwi_pci.c,v 1.12 2011/07/26 20:51:24 dyoung Exp $ */
+/* $NetBSD: if_bwi_pci.c,v 1.13 2013/03/30 03:21:04 christos Exp $ */
/* $OpenBSD: if_bwi_pci.c,v 1.6 2008/02/14 22:10:02 brad Exp $ */
/*
@@ -24,7 +24,7 @@
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_bwi_pci.c,v 1.12 2011/07/26 20:51:24 dyoung Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_bwi_pci.c,v 1.13 2013/03/30 03:21:04 christos Exp $");
#include <sys/param.h>
#include <sys/callout.h>
@@ -121,7 +121,7 @@ bwi_pci_attach(device_t parent, device_t self, void *aux)
psc->psc_pcitag = pa->pa_tag;
/* map control / status registers */
- memtype = pci_mapreg_type(pa->pa_pc, pa->pa_tag, BWI_PCI_BAR0);
+ memtype = pci_mapreg_type(pa->pa_pc, pa->pa_tag, BWI_PCI_BAR0);
switch (memtype) {
case PCI_MAPREG_TYPE_MEM | PCI_MAPREG_MEM_TYPE_32BIT:
case PCI_MAPREG_TYPE_MEM | PCI_MAPREG_MEM_TYPE_64BIT:
diff --git a/sys/dev/pci/if_cas.c b/sys/dev/pci/if_cas.c
index b47cb211ca2..ffe05eb20d7 100644
--- a/sys/dev/pci/if_cas.c
+++ b/sys/dev/pci/if_cas.c
@@ -1,4 +1,4 @@
-/* $NetBSD: if_cas.c,v 1.18 2012/07/22 14:33:02 matt Exp $ */
+/* $NetBSD: if_cas.c,v 1.19 2013/03/30 03:21:04 christos Exp $ */
/* $OpenBSD: if_cas.c,v 1.29 2009/11/29 16:19:38 kettenis Exp $ */
/*
@@ -44,7 +44,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_cas.c,v 1.18 2012/07/22 14:33:02 matt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_cas.c,v 1.19 2013/03/30 03:21:04 christos Exp $");
#ifndef _MODULE
#include "opt_inet.h"
@@ -275,14 +275,14 @@ next:
desc = buf + sizeof(*vpd);
- /*
+ /*
* ...which is an instance property...
*/
if (desc[0] != 'I')
continue;
desc += 3;
- /*
+ /*
* ...that's a byte array with the proper
* length for a MAC address...
*/
@@ -296,7 +296,7 @@ next:
if (strcmp(desc, "local-mac-address") != 0)
continue;
desc += strlen("local-mac-address") + 1;
-
+
memcpy(enaddr, desc, ETHER_ADDR_LEN);
rv = 0;
}
@@ -549,7 +549,7 @@ cas_config(struct cas_softc *sc, const uint8_t *enaddr)
child = LIST_FIRST(&mii->mii_phys);
if (child == NULL &&
sc->sc_mif_config & (CAS_MIF_CONFIG_MDI0|CAS_MIF_CONFIG_MDI1)) {
- /*
+ /*
* Try the external PCS SERDES if we didn't find any
* MII devices.
*/
@@ -1292,7 +1292,7 @@ cas_rint(struct cas_softc *sc)
cp = rxs->rxs_kva + off * 256 + ETHER_ALIGN;
m = m_devget(cp, len, 0, ifp, NULL);
-
+
if (word[0] & CAS_RC0_RELEASE_HDR)
cas_add_rxbuf(sc, idx);
diff --git a/sys/dev/pci/if_de.c b/sys/dev/pci/if_de.c
index ae1dd93aad7..a9037792426 100644
--- a/sys/dev/pci/if_de.c
+++ b/sys/dev/pci/if_de.c
@@ -1,4 +1,4 @@
-/* $NetBSD: if_de.c,v 1.140 2012/10/27 17:18:32 chs Exp $ */
+/* $NetBSD: if_de.c,v 1.141 2013/03/30 03:21:04 christos Exp $ */
/*-
* Copyright (c) 1994-1997 Matt Thomas (matt@3am-software.com)
@@ -37,7 +37,7 @@
* board which support 21040, 21041, or 21140 (mostly).
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_de.c,v 1.140 2012/10/27 17:18:32 chs Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_de.c,v 1.141 2013/03/30 03:21:04 christos Exp $");
#define TULIP_HDR_DATA
@@ -1345,7 +1345,7 @@ static const tulip_phy_attr_t tulip_mii_phy_attrlist[] = {
"ICS 1890"
#endif
},
- { 0, 0, {{ 0, 0, 0},},
+ { 0, 0, {{ 0, 0, 0},},
#if defined(TULIP_DEBUG)
NULL
#endif
diff --git a/sys/dev/pci/if_et.c b/sys/dev/pci/if_et.c
index 26601417848..fca721746aa 100644
--- a/sys/dev/pci/if_et.c
+++ b/sys/dev/pci/if_et.c
@@ -1,15 +1,15 @@
-/* $NetBSD: if_et.c,v 1.6 2012/11/08 20:36:16 dyoung Exp $ */
+/* $NetBSD: if_et.c,v 1.7 2013/03/30 03:21:04 christos Exp $ */
/* $OpenBSD: if_et.c,v 1.11 2008/06/08 06:18:07 jsg Exp $ */
/*
* Copyright (c) 2007 The DragonFly Project. All rights reserved.
- *
+ *
* This code is derived from software contributed to The DragonFly Project
* by Sepherosa Ziehau <sepherosa@gmail.com>
- *
+ *
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
* are met:
- *
+ *
* 1. Redistributions of source code must retain the above copyright
* notice, this list of conditions and the following disclaimer.
* 2. Redistributions in binary form must reproduce the above copyright
@@ -19,7 +19,7 @@
* 3. Neither the name of The DragonFly Project nor the names of its
* contributors may be used to endorse or promote products derived
* from this software without specific, prior written permission.
- *
+ *
* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
* ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
* LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
@@ -32,12 +32,12 @@
* OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
* OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
- *
+ *
* $DragonFly: src/sys/dev/netif/et/if_et.c,v 1.1 2007/10/12 14:12:42 sephe Exp $
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_et.c,v 1.6 2012/11/08 20:36:16 dyoung Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_et.c,v 1.7 2013/03/30 03:21:04 christos Exp $");
#include "opt_inet.h"
#include "vlan.h"
@@ -55,7 +55,7 @@ __KERNEL_RCSID(0, "$NetBSD: if_et.c,v 1.6 2012/11/08 20:36:16 dyoung Exp $");
#include <sys/socket.h>
#include <sys/bus.h>
-
+
#include <net/if.h>
#include <net/if_dl.h>
#include <net/if_media.h>
@@ -71,7 +71,7 @@ __KERNEL_RCSID(0, "$NetBSD: if_et.c,v 1.6 2012/11/08 20:36:16 dyoung Exp $");
#endif
#include <net/bpf.h>
-
+
#include <dev/mii/mii.h>
#include <dev/mii/miivar.h>
@@ -505,7 +505,7 @@ et_bus_config(struct et_softc *sc)
*/
pci_conf_read(sc->sc_pct, sc->sc_pcitag, ET_PCIR_EEPROM_MISC);
val = pci_conf_read(sc->sc_pct, sc->sc_pcitag, ET_PCIR_EEPROM_MISC);
-
+
if (val & ET_PCIM_EEPROM_STATUS_ERROR) {
aprint_error_dev(sc->sc_dev, "EEPROM status error 0x%02x\n", val);
return ENXIO;
@@ -729,7 +729,7 @@ et_dma_free(struct et_softc *sc)
* Destroy RX stat ring DMA stuffs
*/
et_dma_mem_destroy(sc, rxst_ring->rsr_stat, rxst_ring->rsr_dmap);
-
+
/*
* Destroy RX status DMA stuffs
*/
@@ -820,7 +820,7 @@ et_dma_mbuf_destroy(struct et_softc *sc, int tx_done, const int rx_done[])
KASSERTMSG(rb->rb_mbuf == NULL,
"RX mbuf in %d RX ring is not freed yet\n", i);
- bus_dmamap_destroy(sc->sc_dmat, rb->rb_dmap);
+ bus_dmamap_destroy(sc->sc_dmat, rb->rb_dmap);
}
}
@@ -1905,7 +1905,7 @@ et_encap(struct et_softc *sc, struct mbuf **m0)
bus_dmamap_sync(sc->sc_dmat, tx_ring->tr_dmap, 0,
tx_ring->tr_dmap->dm_mapsize, BUS_DMASYNC_PREWRITE);
-
+
tx_ready_pos = __SHIFTIN(tx_ring->tr_ready_index,
ET_TX_READY_POS_INDEX);
diff --git a/sys/dev/pci/if_ex_pci.c b/sys/dev/pci/if_ex_pci.c
index 78ab9e3a092..ca884f04d34 100644
--- a/sys/dev/pci/if_ex_pci.c
+++ b/sys/dev/pci/if_ex_pci.c
@@ -1,4 +1,4 @@
-/* $NetBSD: if_ex_pci.c,v 1.54 2011/07/26 20:51:24 dyoung Exp $ */
+/* $NetBSD: if_ex_pci.c,v 1.55 2013/03/30 03:21:05 christos Exp $ */
/*-
* Copyright (c) 1998 The NetBSD Foundation, Inc.
@@ -31,7 +31,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_ex_pci.c,v 1.54 2011/07/26 20:51:24 dyoung Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_ex_pci.c,v 1.55 2013/03/30 03:21:05 christos Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -270,7 +270,7 @@ ex_pci_attach(device_t parent, device_t self, void *aux)
switch (error) {
case EOPNOTSUPP:
break;
- case 0:
+ case 0:
sc->enable = ex_pci_enable;
sc->disable = NULL;
break;
diff --git a/sys/dev/pci/if_fxp_pci.c b/sys/dev/pci/if_fxp_pci.c
index 397a20f54d3..ad8e97d8539 100644
--- a/sys/dev/pci/if_fxp_pci.c
+++ b/sys/dev/pci/if_fxp_pci.c
@@ -1,4 +1,4 @@
-/* $NetBSD: if_fxp_pci.c,v 1.79 2012/02/02 19:43:05 tls Exp $ */
+/* $NetBSD: if_fxp_pci.c,v 1.80 2013/03/30 03:21:05 christos Exp $ */
/*-
* Copyright (c) 1997, 1998, 1999, 2000, 2001 The NetBSD Foundation, Inc.
@@ -36,7 +36,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_fxp_pci.c,v 1.79 2012/02/02 19:43:05 tls Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_fxp_pci.c,v 1.80 2013/03/30 03:21:05 christos Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -213,7 +213,7 @@ fxp_pci_match(device_t parent, cfdata_t match, void *aux)
}
/*
- * On resume : (XXX it is necessary with new pmf framework ?)
+ * On resume : (XXX it is necessary with new pmf framework ?)
* Restore PCI configuration registers that may have been clobbered.
* This is necessary due to bugs on the Sony VAIO Z505-series on-board
* ethernet, after an APM suspend/resume, as well as after an ACPI
@@ -486,7 +486,7 @@ fxp_pci_attach(device_t parent, device_t self, void *aux)
pci_activate_null))) {
case EOPNOTSUPP:
break;
- case 0:
+ case 0:
sc->sc_enable = fxp_pci_enable;
sc->sc_disable = NULL;
break;
diff --git a/sys/dev/pci/if_gem_pci.c b/sys/dev/pci/if_gem_pci.c
index 1d4cae191ad..72f29815057 100644
--- a/sys/dev/pci/if_gem_pci.c
+++ b/sys/dev/pci/if_gem_pci.c
@@ -1,4 +1,4 @@
-/* $NetBSD: if_gem_pci.c,v 1.45 2012/09/23 01:11:14 chs Exp $ */
+/* $NetBSD: if_gem_pci.c,v 1.46 2013/03/30 03:21:05 christos Exp $ */
/*
*
@@ -34,7 +34,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_gem_pci.c,v 1.45 2012/09/23 01:11:14 chs Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_gem_pci.c,v 1.46 2013/03/30 03:21:05 christos Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -313,7 +313,7 @@ gem_pci_attach(device_t parent, device_t self, void *aux)
gempromvalid(buf + PROMDATA_DATA2) &&
(vpdoff = (buf[PROMDATA_PTR_VPD] |
(buf[PROMDATA_PTR_VPD + 1] << 8))) >= 0x1c) {
-
+
/*
* The VPD of gem is not in PCI 2.2 standard
* format. The length in the resource header
diff --git a/sys/dev/pci/if_iwi.c b/sys/dev/pci/if_iwi.c
index 983242fa2c5..c6f78750876 100644
--- a/sys/dev/pci/if_iwi.c
+++ b/sys/dev/pci/if_iwi.c
@@ -1,4 +1,4 @@
-/* $NetBSD: if_iwi.c,v 1.91 2012/06/02 21:36:44 dsl Exp $ */
+/* $NetBSD: if_iwi.c,v 1.92 2013/03/30 03:21:05 christos Exp $ */
/* $OpenBSD: if_iwi.c,v 1.111 2010/11/15 19:11:57 damien Exp $ */
/*-
@@ -19,7 +19,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_iwi.c,v 1.91 2012/06/02 21:36:44 dsl Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_iwi.c,v 1.92 2013/03/30 03:21:05 christos Exp $");
/*-
* Intel(R) PRO/Wireless 2200BG/2225BG/2915ABG driver
@@ -416,7 +416,7 @@ iwi_attach(device_t parent, device_t self, void *aux)
sc->sc_txtap.wt_ihdr.it_len = htole16(sc->sc_txtap_len);
sc->sc_txtap.wt_ihdr.it_present = htole32(IWI_TX_RADIOTAP_PRESENT);
- iwi_sysctlattach(sc);
+ iwi_sysctlattach(sc);
if (pmf_device_register(self, NULL, NULL))
pmf_class_network_register(self, ifp);
@@ -650,7 +650,7 @@ iwi_reset_tx_ring(struct iwi_softc *sc, struct iwi_tx_ring *ring)
m_freem(data->m);
data->m = NULL;
}
-
+
if (data->map != NULL) {
bus_dmamap_sync(sc->sc_dmat, data->map, 0,
data->map->dm_mapsize, BUS_DMASYNC_POSTWRITE);
@@ -841,7 +841,7 @@ iwi_media_change(struct ifnet *ifp)
return 0;
}
-/*
+/*
* Convert h/w rate code to IEEE rate code.
*/
static int
@@ -2155,7 +2155,7 @@ iwi_cache_firmware(struct iwi_softc *sc)
struct iwi_firmware *kfw = &sc->fw;
firmware_handle_t fwh;
struct iwi_firmware_hdr *hdr;
- off_t size;
+ off_t size;
char *fw;
int error;
@@ -2225,7 +2225,7 @@ iwi_cache_firmware(struct iwi_softc *sc)
kfw->boot = fw;
fw += kfw->boot_size;
kfw->ucode = fw;
- fw += kfw->ucode_size;
+ fw += kfw->ucode_size;
kfw->main = fw;
DPRINTF(("Firmware cached: boot %p, ucode %p, main %p\n",
diff --git a/sys/dev/pci/if_iwn.c b/sys/dev/pci/if_iwn.c
index 7af735cf09d..780f79bc8d8 100644
--- a/sys/dev/pci/if_iwn.c
+++ b/sys/dev/pci/if_iwn.c
@@ -1,4 +1,4 @@
-/* $NetBSD: if_iwn.c,v 1.62 2012/01/30 19:41:20 drochner Exp $ */
+/* $NetBSD: if_iwn.c,v 1.63 2013/03/30 03:21:05 christos Exp $ */
/* $OpenBSD: if_iwn.c,v 1.96 2010/05/13 09:25:03 damien Exp $ */
/*-
@@ -22,7 +22,7 @@
* adapters.
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_iwn.c,v 1.62 2012/01/30 19:41:20 drochner Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_iwn.c,v 1.63 2013/03/30 03:21:05 christos Exp $");
#define IWN_USE_RBUF /* Use local storage for RX */
#undef IWN_HWCRYPTO /* XXX does not even compile yet */
@@ -108,10 +108,10 @@ static const struct ieee80211_rateset iwn_rateset_11a =
{ 8, { 12, 18, 24, 36, 48, 72, 96, 108 } };
static const struct ieee80211_rateset iwn_rateset_11b =
- { 4, { 2, 4, 11, 22 } };
+ { 4, { 2, 4, 11, 22 } };
static const struct ieee80211_rateset iwn_rateset_11g =
- { 12, { 2, 4, 11, 22, 12, 18, 24, 36, 48, 72, 96, 108 } };
+ { 12, { 2, 4, 11, 22, 12, 18, 24, 36, 48, 72, 96, 108 } };
static int iwn_match(device_t , struct cfdata *, void *);
static void iwn_attach(device_t , device_t , void *);
@@ -413,7 +413,7 @@ iwn_attach(device_t parent __unused, device_t self, void *aux)
if (error != 0) {
aprint_error(": could not attach device\n");
return;
- }
+ }
if ((error = iwn_hw_prepare(sc)) != 0) {
aprint_error(": hardware not ready\n");
@@ -2814,7 +2814,7 @@ iwn_tx(struct iwn_softc *sc, struct mbuf *m, struct ieee80211_node *ni, int ac)
(IEEE80211_FC0_TYPE_MASK | IEEE80211_FC0_SUBTYPE_MASK)) ==
(IEEE80211_FC0_TYPE_CTL | IEEE80211_FC0_SUBTYPE_BAR))
flags |= IWN_TX_IMM_BA; /* Cannot happen yet. */
-#endif
+#endif
if (wh->i_fc[1] & IEEE80211_FC1_MORE_FRAG)
flags |= IWN_TX_MORE_FRAG; /* Cannot happen yet. */
diff --git a/sys/dev/pci/if_jme.c b/sys/dev/pci/if_jme.c
index a4cd2d9dce0..d92bd7afb8e 100644
--- a/sys/dev/pci/if_jme.c
+++ b/sys/dev/pci/if_jme.c
@@ -1,4 +1,4 @@
-/* $NetBSD: if_jme.c,v 1.21 2012/07/22 14:33:02 matt Exp $ */
+/* $NetBSD: if_jme.c,v 1.22 2013/03/30 03:21:05 christos Exp $ */
/*
* Copyright (c) 2008 Manuel Bouyer. All rights reserved.
@@ -58,7 +58,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_jme.c,v 1.21 2012/07/22 14:33:02 matt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_jme.c,v 1.22 2013/03/30 03:21:05 christos Exp $");
#include <sys/param.h>
@@ -687,7 +687,7 @@ jme_add_rxbuf(jme_softc_t *sc, struct mbuf *m)
m_freem(m);
return EINVAL;
}
-
+
if (m == NULL) {
sc->jme_rxmbuf[i] = NULL;
MGETHDR(m, M_DONTWAIT, MT_DATA);
@@ -2012,7 +2012,7 @@ jme_eeprom_macaddr(struct jme_softc *sc)
}
if (fup & JME_EEPROM_DESC_END)
break;
-
+
/* Try next eeprom descriptor. */
offset += JME_EEPROM_DESC_BYTES;
} while (match != ETHER_ADDR_LEN && offset < JME_EEPROM_END);
diff --git a/sys/dev/pci/if_kse.c b/sys/dev/pci/if_kse.c
index 6a38d9e9b48..682f47c73a8 100644
--- a/sys/dev/pci/if_kse.c
+++ b/sys/dev/pci/if_kse.c
@@ -1,4 +1,4 @@
-/* $NetBSD: if_kse.c,v 1.23 2012/10/27 17:18:33 chs Exp $ */
+/* $NetBSD: if_kse.c,v 1.24 2013/03/30 03:21:06 christos Exp $ */
/*-
* Copyright (c) 2006 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_kse.c,v 1.23 2012/10/27 17:18:33 chs Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_kse.c,v 1.24 2013/03/30 03:21:06 christos Exp $");
#include <sys/param.h>
@@ -608,7 +608,7 @@ kse_attach(device_t parent, device_t self, void *aux)
if (sc->sc_rxsoft[i].rxs_dmamap != NULL)
bus_dmamap_destroy(sc->sc_dmat,
sc->sc_rxsoft[i].rxs_dmamap);
- }
+ }
fail_4:
for (i = 0; i < KSE_TXQUEUELEN; i++) {
if (sc->sc_txsoft[i].txs_dmamap != NULL)
@@ -847,7 +847,7 @@ kse_watchdog(struct ifnet *ifp)
{
struct kse_softc *sc = ifp->if_softc;
- /*
+ /*
* Since we're not interrupting every packet, sweep
* up before we report an error.
*/
@@ -1147,7 +1147,7 @@ rxintr(struct kse_softc *sc)
BUS_DMASYNC_POSTREAD|BUS_DMASYNC_POSTWRITE);
rxstat = sc->sc_rxdescs[i].r0;
-
+
if (rxstat & R0_OWN) /* desc is left empty */
break;
diff --git a/sys/dev/pci/if_lii.c b/sys/dev/pci/if_lii.c
index 897bd569b50..7c10c5635e3 100644
--- a/sys/dev/pci/if_lii.c
+++ b/sys/dev/pci/if_lii.c
@@ -1,4 +1,4 @@
-/* $NetBSD: if_lii.c,v 1.11 2012/07/22 14:33:02 matt Exp $ */
+/* $NetBSD: if_lii.c,v 1.12 2013/03/30 03:21:06 christos Exp $ */
/*
* Copyright (c) 2008 The NetBSD Foundation.
@@ -31,7 +31,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_lii.c,v 1.11 2012/07/22 14:33:02 matt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_lii.c,v 1.12 2013/03/30 03:21:06 christos Exp $");
#include <sys/param.h>
@@ -1146,7 +1146,7 @@ lii_ioctl(struct ifnet *ifp, u_long cmd, void *data)
break;
case SIOCSIFMEDIA:
case SIOCGIFMEDIA:
- error = ifmedia_ioctl(ifp, (struct ifreq *)data,
+ error = ifmedia_ioctl(ifp, (struct ifreq *)data,
&sc->sc_mii.mii_media, cmd);
break;
default:
diff --git a/sys/dev/pci/if_lmc.c b/sys/dev/pci/if_lmc.c
index c75c2a2d80e..40318ff9e64 100644
--- a/sys/dev/pci/if_lmc.c
+++ b/sys/dev/pci/if_lmc.c
@@ -1,4 +1,4 @@
-/* $NetBSD: if_lmc.c,v 1.52 2012/10/29 12:51:39 chs Exp $ */
+/* $NetBSD: if_lmc.c,v 1.53 2013/03/30 03:21:06 christos Exp $ */
/*-
* Copyright (c) 2002-2006 David Boggs. <boggs@boggs.palo-alto.ca.us>
@@ -74,7 +74,7 @@
*/
# include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_lmc.c,v 1.52 2012/10/29 12:51:39 chs Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_lmc.c,v 1.53 2013/03/30 03:21:06 christos Exp $");
# include <sys/param.h> /* OS version */
# include "opt_inet.h" /* INET6, INET */
# include "opt_altq_enabled.h" /* ALTQ */
@@ -372,7 +372,7 @@ mii_read(softc_t *sc, u_int8_t regad)
int i;
u_int32_t csr;
u_int16_t data = 0;
-
+
WRITE_CSR(sc, TLP_SROM_MII, TLP_MII_MDOUT);
mii_shift_bits(sc, 0xFFFFF, 20); /* preamble */
@@ -614,7 +614,7 @@ xilinx_load_from_file(softc_t *sc, char *addr, u_int32_t len)
/* Hold RESET & DP low for more than 10 uSec. */
DELAY(50);
-
+
/* Done with RESET & DP; make them inputs. */
gpio_make_input(sc, GPIO_RESET | GPIO_DP);
@@ -5384,7 +5384,7 @@ nbsd_match(device_t parent, cfdata_t match, void *aux)
{
struct pci_attach_args *pa = aux;
u_int32_t cfid = pci_conf_read(pa->pa_pc, pa->pa_tag, TLP_CFID);
- u_int32_t csid = pci_conf_read(pa->pa_pc, pa->pa_tag, TLP_CSID);
+ u_int32_t csid = pci_conf_read(pa->pa_pc, pa->pa_tag, TLP_CSID);
if (cfid != TLP_CFID_TULIP) return 0;
switch (csid)
diff --git a/sys/dev/pci/if_malo_pci.c b/sys/dev/pci/if_malo_pci.c
index 4c39da890c3..02e37f72a5b 100644
--- a/sys/dev/pci/if_malo_pci.c
+++ b/sys/dev/pci/if_malo_pci.c
@@ -1,4 +1,4 @@
-/* $NetBSD: if_malo_pci.c,v 1.3 2012/08/05 09:16:54 degroote Exp $ */
+/* $NetBSD: if_malo_pci.c,v 1.4 2013/03/30 03:21:06 christos Exp $ */
/* $OpenBSD: if_malo_pci.c,v 1.6 2010/08/28 23:19:29 deraadt Exp $ */
/*
@@ -22,7 +22,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_malo_pci.c,v 1.3 2012/08/05 09:16:54 degroote Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_malo_pci.c,v 1.4 2013/03/30 03:21:06 christos Exp $");
#include <sys/param.h>
#include <sys/sockio.h>
@@ -123,7 +123,7 @@ malo_pci_attach(device_t parent, device_t self, void *aux)
}
error = pci_mapreg_map(pa, MALO_PCI_BAR1,
- memtype1, 0, &sc->sc_mem1_bt, &sc->sc_mem1_bh,
+ memtype1, 0, &sc->sc_mem1_bt, &sc->sc_mem1_bh,
NULL, &psc->sc_mapsize1);
if (error != 0) {
aprint_error_dev(self, "can't map 1st mem space\n");
@@ -142,7 +142,7 @@ malo_pci_attach(device_t parent, device_t self, void *aux)
}
error = pci_mapreg_map(pa, MALO_PCI_BAR2,
- memtype2, 0, &sc->sc_mem2_bt, &sc->sc_mem2_bh,
+ memtype2, 0, &sc->sc_mem2_bt, &sc->sc_mem2_bh,
NULL, &psc->sc_mapsize2);
if (error != 0) {
aprint_error_dev(self, "can't map 2nd mem space\n");
@@ -187,7 +187,7 @@ malo_pci_detach(device_t self, int flags)
return (0);
}
-static bool
+static bool
malo_pci_suspend(device_t self, const pmf_qual_t *qual)
{
struct malo_pci_softc *psc = device_private(self);
@@ -199,7 +199,7 @@ malo_pci_suspend(device_t self, const pmf_qual_t *qual)
return true;
}
-static bool
+static bool
malo_pci_resume(device_t self, const pmf_qual_t *qual)
{
struct malo_pci_softc *psc = device_private(self);
diff --git a/sys/dev/pci/if_msk.c b/sys/dev/pci/if_msk.c
index 04e2d2a7539..203310347e6 100644
--- a/sys/dev/pci/if_msk.c
+++ b/sys/dev/pci/if_msk.c
@@ -1,4 +1,4 @@
-/* $NetBSD: if_msk.c,v 1.42 2012/08/04 03:46:30 riastradh Exp $ */
+/* $NetBSD: if_msk.c,v 1.43 2013/03/30 03:21:06 christos Exp $ */
/* $OpenBSD: if_msk.c,v 1.42 2007/01/17 02:43:02 krw Exp $ */
/*
@@ -52,7 +52,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_msk.c,v 1.42 2012/08/04 03:46:30 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_msk.c,v 1.43 2013/03/30 03:21:06 christos Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -227,7 +227,7 @@ msk_miibus_readreg(device_t dev, int phy, int reg)
SK_YU_WRITE_2(sc_if, YUKON_SMICR, YU_SMICR_PHYAD(phy) |
YU_SMICR_REGAD(reg) | YU_SMICR_OP_READ);
-
+
for (i = 0; i < SK_TIMEOUT; i++) {
DELAY(1);
val = SK_YU_READ_2(sc_if, YUKON_SMICR);
@@ -239,7 +239,7 @@ msk_miibus_readreg(device_t dev, int phy, int reg)
aprint_error_dev(sc_if->sk_dev, "phy failed to come ready\n");
return (0);
}
-
+
DPRINTFN(9, ("msk_miibus_readreg: i=%d, timeout=%d\n", i,
SK_TIMEOUT));
@@ -317,7 +317,7 @@ msk_miibus_statchg(struct ifnet *ifp)
}
#define HASH_BITS 6
-
+
void
msk_setfilt(struct sk_if_softc *sc_if, void *addrv, int slot)
{
@@ -490,7 +490,7 @@ msk_newbuf(struct sk_if_softc *sc_if, int i, struct mbuf *m,
MGETHDR(m_new, M_DONTWAIT, MT_DATA);
if (m_new == NULL)
return (ENOBUFS);
-
+
/* Allocate the jumbo buffer */
buf = msk_jalloc(sc_if);
if (buf == NULL) {
@@ -799,12 +799,12 @@ void msk_reset(struct sk_softc *sc)
reg1 |= (SK_Y2_REG1_PHY1_COMA | SK_Y2_REG1_PHY2_COMA);
else
reg1 &= ~(SK_Y2_REG1_PHY1_COMA | SK_Y2_REG1_PHY2_COMA);
-
+
if (sc->sk_type == SK_YUKON_EC_U) {
uint32_t our;
CSR_WRITE_2(sc, SK_CSR, SK_CSR_WOL_ON);
-
+
/* enable all clocks. */
sk_win_write_4(sc, SK_Y2_PCI_REG(SK_PCI_OURREG3), 0);
our = sk_win_read_4(sc, SK_Y2_PCI_REG(SK_PCI_OURREG4));
@@ -812,7 +812,7 @@ void msk_reset(struct sk_softc *sc)
SK_Y2_REG4_ASPM_GPHY_LINK_DOWN|
SK_Y2_REG4_ASPM_INT_FIFO_EMPTY|
SK_Y2_REG4_ASPM_CLKRUN_REQUEST);
- /* Set all bits to 0 except bits 15..12 */
+ /* Set all bits to 0 except bits 15..12 */
sk_win_write_4(sc, SK_Y2_PCI_REG(SK_PCI_OURREG4), our);
/* Set to default value */
sk_win_write_4(sc, SK_Y2_PCI_REG(SK_PCI_OURREG5), 0);
@@ -820,7 +820,7 @@ void msk_reset(struct sk_softc *sc)
/* release PHY from PowerDown/Coma mode. */
sk_win_write_4(sc, SK_Y2_PCI_REG(SK_PCI_OURREG1), reg1);
-
+
if (sc->sk_type == SK_YUKON_XL && sc->sk_rev > SK_YUKON_XL_REV_A1)
sk_win_write_1(sc, SK_Y2_CLKGATE,
SK_Y2_CLKGATE_LINK1_GATE_DIS |
@@ -830,7 +830,7 @@ void msk_reset(struct sk_softc *sc)
SK_Y2_CLKGATE_LINK1_PCI_DIS | SK_Y2_CLKGATE_LINK2_PCI_DIS);
else
sk_win_write_1(sc, SK_Y2_CLKGATE, 0);
-
+
CSR_WRITE_2(sc, SK_LINK_CTRL, SK_LINK_RESET_SET);
CSR_WRITE_2(sc, SK_LINK_CTRL + SK_WIN_LEN, SK_LINK_RESET_SET);
DELAY(1000);
@@ -958,7 +958,7 @@ static bool
msk_resume(device_t dv, const pmf_qual_t *qual)
{
struct sk_if_softc *sc_if = device_private(dv);
-
+
msk_init_yukon(sc_if);
return true;
}
@@ -1457,7 +1457,7 @@ mskc_attach(device_t parent, device_t self, void *aux)
fail_5:
bus_dmamap_destroy(sc->sc_dmatag, sc->sk_status_map);
fail_4:
- bus_dmamem_unmap(sc->sc_dmatag, kva,
+ bus_dmamem_unmap(sc->sc_dmatag, kva,
MSK_STATUS_RING_CNT * sizeof(struct msk_status_desc));
fail_3:
bus_dmamem_free(sc->sc_dmatag, &seg, rseg);
@@ -1813,7 +1813,7 @@ msk_txeof(struct sk_if_softc *sc_if, int idx)
void
msk_tick(void *xsc_if)
{
- struct sk_if_softc *sc_if = xsc_if;
+ struct sk_if_softc *sc_if = xsc_if;
struct mii_data *mii = &sc_if->sk_mii;
uint16_t gpsr;
int s;
@@ -2038,7 +2038,7 @@ msk_init_yukon(struct sk_if_softc *sc_if)
/* Setup Yukon's address */
for (i = 0; i < 3; i++) {
/* Write Source Address 1 (unicast filter) */
- SK_YU_WRITE_2(sc_if, YUKON_SAL1 + i * 4,
+ SK_YU_WRITE_2(sc_if, YUKON_SAL1 + i * 4,
sc_if->sk_enaddr[i * 2] |
sc_if->sk_enaddr[i * 2 + 1] << 8);
}
@@ -2343,7 +2343,7 @@ msk_dump_bytes(const char *data, int len)
if ((j & 0xf) == 7 && j > 0)
printf(" ");
}
-
+
for (; j < 16; j++)
printf(" ");
printf(" ");
@@ -2352,9 +2352,9 @@ msk_dump_bytes(const char *data, int len)
int ch = data[i + j] & 0xff;
printf("%c", ' ' <= ch && ch <= '~' ? ch : ' ');
}
-
+
printf("\n");
-
+
if (c < 16)
break;
}
diff --git a/sys/dev/pci/if_nfe.c b/sys/dev/pci/if_nfe.c
index 8203812d48e..7fda39c76fe 100644
--- a/sys/dev/pci/if_nfe.c
+++ b/sys/dev/pci/if_nfe.c
@@ -1,4 +1,4 @@
-/* $NetBSD: if_nfe.c,v 1.57 2012/09/23 01:12:01 chs Exp $ */
+/* $NetBSD: if_nfe.c,v 1.58 2013/03/30 03:21:06 christos Exp $ */
/* $OpenBSD: if_nfe.c,v 1.77 2008/02/05 16:52:50 brad Exp $ */
/*-
@@ -21,7 +21,7 @@
/* Driver for NVIDIA nForce MCP Fast Ethernet and Gigabit Ethernet */
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_nfe.c,v 1.57 2012/09/23 01:12:01 chs Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_nfe.c,v 1.58 2013/03/30 03:21:06 christos Exp $");
#include "opt_inet.h"
#include "vlan.h"
@@ -958,7 +958,7 @@ skip1:
desc32->physaddr = htole32(physaddr);
}
-skip:
+skip:
if (sc->sc_flags & NFE_40BIT_ADDR) {
desc64->length = htole16(sc->rxq.bufsz);
desc64->flags = htole16(NFE_RX_READY);
diff --git a/sys/dev/pci/if_pcn.c b/sys/dev/pci/if_pcn.c
index fabdd0b0f48..445347fe49a 100644
--- a/sys/dev/pci/if_pcn.c
+++ b/sys/dev/pci/if_pcn.c
@@ -1,4 +1,4 @@
-/* $NetBSD: if_pcn.c,v 1.55 2012/07/22 14:33:03 matt Exp $ */
+/* $NetBSD: if_pcn.c,v 1.56 2013/03/30 03:21:07 christos Exp $ */
/*
* Copyright (c) 2001 Wasabi Systems, Inc.
@@ -65,7 +65,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_pcn.c,v 1.55 2012/07/22 14:33:03 matt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_pcn.c,v 1.56 2013/03/30 03:21:07 christos Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -503,7 +503,7 @@ pcn_is_vmware(const char *enaddr)
*/
if (enaddr[0] == 0x00 && enaddr[1] == 0x0c && enaddr[2] == 0x29)
return (TRUE);
-
+
/*
* VMware uses the OUI 00:50:56 for manually-set MAC
* addresses (and some auto-generated ones).
@@ -2117,9 +2117,9 @@ pcn_79c971_mediainit(struct pcn_softc *sc)
/*
* The built-in 10BASE-T interface is mapped to the MII
* on the PCNet-FAST. Unfortunately, there's no EEPROM
- * word that tells us which PHY to use.
- * This driver used to ignore all but the first PHY to
- * answer, but this code was removed to support multiple
+ * word that tells us which PHY to use.
+ * This driver used to ignore all but the first PHY to
+ * answer, but this code was removed to support multiple
* external PHYs. As the default instance will be the first
* one to answer, no harm is done by letting the possibly
* non-connected internal PHY show up.
diff --git a/sys/dev/pci/if_re_pci.c b/sys/dev/pci/if_re_pci.c
index 136afd6c221..6ae3e6c3a1e 100644
--- a/sys/dev/pci/if_re_pci.c
+++ b/sys/dev/pci/if_re_pci.c
@@ -1,4 +1,4 @@
-/* $NetBSD: if_re_pci.c,v 1.41 2012/01/30 19:41:20 drochner Exp $ */
+/* $NetBSD: if_re_pci.c,v 1.42 2013/03/30 03:21:07 christos Exp $ */
/*
* Copyright (c) 1997, 1998-2003
@@ -46,7 +46,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_re_pci.c,v 1.41 2012/01/30 19:41:20 drochner Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_re_pci.c,v 1.42 2013/03/30 03:21:07 christos Exp $");
#include <sys/types.h>
@@ -304,6 +304,6 @@ re_pci_detach(device_t self, int flags)
bus_space_unmap(sc->rtk_btag, sc->rtk_bhandle, sc->rtk_bsize);
sc->rtk_bsize = 0;
}
-
+
return 0;
}
diff --git a/sys/dev/pci/if_rtk_pci.c b/sys/dev/pci/if_rtk_pci.c
index a19c79a3d53..f3578bf2a4e 100644
--- a/sys/dev/pci/if_rtk_pci.c
+++ b/sys/dev/pci/if_rtk_pci.c
@@ -1,4 +1,4 @@
-/* $NetBSD: if_rtk_pci.c,v 1.43 2012/01/30 19:41:20 drochner Exp $ */
+/* $NetBSD: if_rtk_pci.c,v 1.44 2013/03/30 03:21:07 christos Exp $ */
/*
* Copyright (c) 1997, 1998
@@ -47,7 +47,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_rtk_pci.c,v 1.43 2012/01/30 19:41:20 drochner Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_rtk_pci.c,v 1.44 2013/03/30 03:21:07 christos Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -241,7 +241,7 @@ rtk_pci_attach(device_t parent, device_t self, void *aux)
rtk_attach(sc);
}
-static int
+static int
rtk_pci_detach(device_t self, int flags)
{
struct rtk_pci_softc *psc = device_private(self);
diff --git a/sys/dev/pci/if_sip.c b/sys/dev/pci/if_sip.c
index 4680b01acbb..2b0271371f9 100644
--- a/sys/dev/pci/if_sip.c
+++ b/sys/dev/pci/if_sip.c
@@ -1,4 +1,4 @@
-/* $NetBSD: if_sip.c,v 1.155 2012/09/23 01:10:59 chs Exp $ */
+/* $NetBSD: if_sip.c,v 1.156 2013/03/30 03:21:07 christos Exp $ */
/*-
* Copyright (c) 2001, 2002 The NetBSD Foundation, Inc.
@@ -73,7 +73,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_sip.c,v 1.155 2012/09/23 01:10:59 chs Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_sip.c,v 1.156 2013/03/30 03:21:07 christos Exp $");
@@ -293,7 +293,7 @@ struct sip_softc {
/* VLAN_ATTACHED */
int is_vlan;
} sc_prev;
-
+
short sc_if_flags;
int sc_rxptr; /* next ready Rx descriptor/descsoft */
@@ -1397,7 +1397,7 @@ sipcom_set_extsts(struct sip_softc *sc, int lasttx, struct mbuf *m0,
*/
if ((mtag = VLAN_OUTPUT_TAG(&sc->sc_ethercom, m0)) != NULL) {
sc->sc_txdescs[lasttx].sipd_extsts |=
- htole32(EXTSTS_VPKT |
+ htole32(EXTSTS_VPKT |
(bswap16(VLAN_TAG_VALUE(mtag)) &
EXTSTS_VTCI));
}
diff --git a/sys/dev/pci/if_sk.c b/sys/dev/pci/if_sk.c
index 559424d761c..ebf5e01ab57 100644
--- a/sys/dev/pci/if_sk.c
+++ b/sys/dev/pci/if_sk.c
@@ -1,4 +1,4 @@
-/* $NetBSD: if_sk.c,v 1.72 2012/07/22 14:33:03 matt Exp $ */
+/* $NetBSD: if_sk.c,v 1.73 2013/03/30 03:21:07 christos Exp $ */
/*-
* Copyright (c) 2003 The NetBSD Foundation, Inc.
@@ -115,7 +115,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_sk.c,v 1.72 2012/07/22 14:33:03 matt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_sk.c,v 1.73 2013/03/30 03:21:07 christos Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -707,7 +707,7 @@ sk_init_rx_ring(struct sk_if_softc *sc_if)
}
for (i = 0; i < SK_RX_RING_CNT; i++) {
- if (sk_newbuf(sc_if, i, NULL,
+ if (sk_newbuf(sc_if, i, NULL,
sc_if->sk_cdata.sk_rx_jumbo_map) == ENOBUFS) {
aprint_error_dev(sc_if->sk_dev,
"failed alloc of %dth mbuf\n", i);
@@ -1384,7 +1384,7 @@ sk_attach(device_t parent, device_t self, void *aux)
aprint_error("%s: jumbo buffer allocation failed\n", ifp->if_xname);
goto fail;
}
- sc_if->sk_ethercom.ec_capabilities = ETHERCAP_VLAN_MTU
+ sc_if->sk_ethercom.ec_capabilities = ETHERCAP_VLAN_MTU
| ETHERCAP_JUMBO_MTU;
ifp->if_softc = sc_if;
diff --git a/sys/dev/pci/if_stge.c b/sys/dev/pci/if_stge.c
index 8bed7e80102..8fc7f9e2bba 100644
--- a/sys/dev/pci/if_stge.c
+++ b/sys/dev/pci/if_stge.c
@@ -1,4 +1,4 @@
-/* $NetBSD: if_stge.c,v 1.55 2012/07/22 14:33:04 matt Exp $ */
+/* $NetBSD: if_stge.c,v 1.56 2013/03/30 03:21:07 christos Exp $ */
/*-
* Copyright (c) 2001 The NetBSD Foundation, Inc.
@@ -35,7 +35,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_stge.c,v 1.55 2012/07/22 14:33:04 matt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_stge.c,v 1.56 2013/03/30 03:21:07 christos Exp $");
#include <sys/param.h>
@@ -574,7 +574,7 @@ stge_attach(device_t parent, device_t self, void *aux)
} else {
uint16_t myaddr[ETHER_ADDR_LEN / 2];
for (i = 0; i <ETHER_ADDR_LEN / 2; i++) {
- stge_read_eeprom(sc,
+ stge_read_eeprom(sc,
STGE_EEPROM_StationAddress0 + i,
&myaddr[i]);
myaddr[i] = le16toh(myaddr[i]);
diff --git a/sys/dev/pci/if_tl.c b/sys/dev/pci/if_tl.c
index 9066a77a3f0..da3bea3eb12 100644
--- a/sys/dev/pci/if_tl.c
+++ b/sys/dev/pci/if_tl.c
@@ -1,4 +1,4 @@
-/* $NetBSD: if_tl.c,v 1.98 2012/07/22 14:33:04 matt Exp $ */
+/* $NetBSD: if_tl.c,v 1.99 2013/03/30 03:21:08 christos Exp $ */
/*
* Copyright (c) 1997 Manuel Bouyer. All rights reserved.
@@ -31,7 +31,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_tl.c,v 1.98 2012/07/22 14:33:04 matt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_tl.c,v 1.99 2013/03/30 03:21:08 christos Exp $");
#undef TLDEBUG
#define TL_PRIV_STATS
@@ -747,7 +747,7 @@ tl_init(struct ifnet *ifp)
error = 0;
else if (error != 0) {
errstring = "could not set media";
- goto bad;
+ goto bad;
}
/* start ticks calls */
diff --git a/sys/dev/pci/if_vge.c b/sys/dev/pci/if_vge.c
index 167d44c4318..da1985c078f 100644
--- a/sys/dev/pci/if_vge.c
+++ b/sys/dev/pci/if_vge.c
@@ -1,4 +1,4 @@
-/* $NetBSD: if_vge.c,v 1.53 2012/07/22 14:33:04 matt Exp $ */
+/* $NetBSD: if_vge.c,v 1.54 2013/03/30 03:21:08 christos Exp $ */
/*-
* Copyright (c) 2004
@@ -35,7 +35,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_vge.c,v 1.53 2012/07/22 14:33:04 matt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_vge.c,v 1.54 2013/03/30 03:21:08 christos Exp $");
/*
* VIA Networking Technologies VT612x PCI gigabit ethernet NIC driver.
@@ -1553,7 +1553,7 @@ vge_encap(struct vge_softc *sc, struct mbuf *m_head, int idx)
#ifdef DIAGNOSTIC
/* If this descriptor is still owned by the chip, bail. */
- VGE_TXDESCSYNC(sc, idx,
+ VGE_TXDESCSYNC(sc, idx,
BUS_DMASYNC_POSTREAD|BUS_DMASYNC_POSTWRITE);
td_sts = le32toh(txd->td_sts);
VGE_TXDESCSYNC(sc, idx, BUS_DMASYNC_PREREAD);
@@ -1636,7 +1636,7 @@ vge_encap(struct vge_softc *sc, struct mbuf *m_head, int idx)
*/
mtag = VLAN_OUTPUT_TAG(&sc->sc_ethercom, m_head);
if (mtag != NULL) {
- /*
+ /*
* No need htons() here since vge(4) chip assumes
* that tags are written in little endian and
* we already use htole32() here.
diff --git a/sys/dev/pci/if_vioif.c b/sys/dev/pci/if_vioif.c
index b665d0223f2..834fe8d5010 100644
--- a/sys/dev/pci/if_vioif.c
+++ b/sys/dev/pci/if_vioif.c
@@ -1,4 +1,4 @@
-/* $NetBSD: if_vioif.c,v 1.2 2011/11/19 12:32:54 jmcneill Exp $ */
+/* $NetBSD: if_vioif.c,v 1.3 2013/03/30 03:21:08 christos Exp $ */
/*
* Copyright (c) 2010 Minoura Makoto.
@@ -26,7 +26,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_vioif.c,v 1.2 2011/11/19 12:32:54 jmcneill Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_vioif.c,v 1.3 2013/03/30 03:21:08 christos Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -391,7 +391,7 @@ vioif_alloc_mems(struct vioif_softc *sc)
C_L2(ctrl_cmd_dmamap, ctrl_cmd,
sizeof(struct virtio_net_ctrl_cmd), 1, WRITE,
"control command");
-
+
/* control vq status */
C_L2(ctrl_status_dmamap, ctrl_status,
sizeof(struct virtio_net_ctrl_status), 1, READ,
@@ -652,7 +652,7 @@ vioif_stop(struct ifnet *ifp, int disable)
if (disable)
vioif_rx_drain(sc);
-
+
virtio_reinit_start(vsc);
virtio_negotiate_features(vsc, sc->sc_features);
virtio_start_vq_intr(vsc, &sc->sc_vq[0]);
@@ -883,7 +883,7 @@ vioif_rx_deq(struct vioif_softc *sc)
bpf_mtap(ifp, m);
(*ifp->if_input)(ifp, m);
}
-
+
return r;
}
@@ -1057,7 +1057,7 @@ vioif_ctrl_rx(struct vioif_softc *sc, int cmd, bool onoff)
sc->sc_ctrl_inuse = FREE;
cv_signal(&sc->sc_ctrl_wait);
mutex_exit(&sc->sc_ctrl_wait_lock);
-
+
return r;
}
@@ -1188,7 +1188,7 @@ out:
sc->sc_ctrl_inuse = FREE;
cv_signal(&sc->sc_ctrl_wait);
mutex_exit(&sc->sc_ctrl_wait_lock);
-
+
return r;
}
diff --git a/sys/dev/pci/if_vte.c b/sys/dev/pci/if_vte.c
index 97b8187ca42..3a337db48b6 100644
--- a/sys/dev/pci/if_vte.c
+++ b/sys/dev/pci/if_vte.c
@@ -1,4 +1,4 @@
-/* $NetBSD: if_vte.c,v 1.7 2012/07/22 14:33:04 matt Exp $ */
+/* $NetBSD: if_vte.c,v 1.8 2013/03/30 03:21:08 christos Exp $ */
/*
* Copyright (c) 2011 Manuel Bouyer. All rights reserved.
@@ -55,7 +55,7 @@
/* Driver for DM&P Electronics, Inc, Vortex86 RDC R6040 FastEthernet. */
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_vte.c,v 1.7 2012/07/22 14:33:04 matt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_vte.c,v 1.8 2013/03/30 03:21:08 christos Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -259,13 +259,13 @@ vte_attach(device_t parent, device_t self, void *aux)
strlcpy(ifp->if_xname, device_xname(self), IFNAMSIZ);
ifp->if_flags = IFF_BROADCAST|IFF_SIMPLEX|IFF_NOTRAILERS|IFF_MULTICAST;
- ifp->if_ioctl = vte_ifioctl;
- ifp->if_start = vte_ifstart;
+ ifp->if_ioctl = vte_ifioctl;
+ ifp->if_start = vte_ifstart;
ifp->if_watchdog = vte_ifwatchdog;
- ifp->if_init = vte_init;
- ifp->if_stop = vte_stop;
+ ifp->if_init = vte_init;
+ ifp->if_stop = vte_stop;
ifp->if_timer = 0;
- IFQ_SET_READY(&ifp->if_snd);
+ IFQ_SET_READY(&ifp->if_snd);
if_attach(ifp);
ether_ifattach(&(sc)->vte_if, (sc)->vte_eaddr);
@@ -467,7 +467,7 @@ vte_dma_alloc(struct vte_softc *sc)
}
/* Allocate and map DMA'able memory and load the DMA map for TX ring. */
error = bus_dmamem_alloc(sc->vte_dmatag, VTE_TX_RING_SZ,
- VTE_TX_RING_ALIGN, 0,
+ VTE_TX_RING_ALIGN, 0,
sc->vte_cdata.vte_tx_ring_seg, 1, &rseg,
BUS_DMA_NOWAIT);
if (error != 0) {
@@ -510,7 +510,7 @@ vte_dma_alloc(struct vte_softc *sc)
}
/* Allocate and map DMA'able memory and load the DMA map for RX ring. */
error = bus_dmamem_alloc(sc->vte_dmatag, VTE_RX_RING_SZ,
- VTE_RX_RING_ALIGN, 0,
+ VTE_RX_RING_ALIGN, 0,
sc->vte_cdata.vte_rx_ring_seg, 1, &rseg,
BUS_DMA_NOWAIT);
if (error != 0) {
@@ -1000,7 +1000,7 @@ vte_txeof(struct vte_softc *sc)
if (sc->vte_cdata.vte_tx_cnt == 0)
return;
bus_dmamap_sync(sc->vte_dmatag,
- sc->vte_cdata.vte_tx_ring_map, 0,
+ sc->vte_cdata.vte_tx_ring_map, 0,
sc->vte_cdata.vte_tx_ring_map->dm_mapsize,
BUS_DMASYNC_POSTREAD | BUS_DMASYNC_POSTWRITE);
cons = sc->vte_cdata.vte_tx_cons;
@@ -1017,7 +1017,7 @@ vte_txeof(struct vte_softc *sc)
ifp->if_collisions += (status & 0xf);
sc->vte_cdata.vte_tx_cnt--;
/* Reclaim transmitted mbufs. */
- bus_dmamap_sync(sc->vte_dmatag, txd->tx_dmamap, 0,
+ bus_dmamap_sync(sc->vte_dmatag, txd->tx_dmamap, 0,
txd->tx_dmamap->dm_mapsize, BUS_DMASYNC_POSTWRITE);
bus_dmamap_unload(sc->vte_dmatag, txd->tx_dmamap);
if ((txd->tx_flags & VTE_TXMBUF) == 0)
diff --git a/sys/dev/pci/if_wm.c b/sys/dev/pci/if_wm.c
index e1096d9bdba..2cccdd59cf8 100644
--- a/sys/dev/pci/if_wm.c
+++ b/sys/dev/pci/if_wm.c
@@ -1,4 +1,4 @@
-/* $NetBSD: if_wm.c,v 1.245 2013/02/13 16:58:04 msaitoh Exp $ */
+/* $NetBSD: if_wm.c,v 1.246 2013/03/30 03:21:08 christos Exp $ */
/*
* Copyright (c) 2001, 2002, 2003, 2004 Wasabi Systems, Inc.
@@ -37,32 +37,32 @@
/*******************************************************************************
- Copyright (c) 2001-2005, Intel Corporation
+ Copyright (c) 2001-2005, Intel Corporation
All rights reserved.
-
- Redistribution and use in source and binary forms, with or without
+
+ Redistribution and use in source and binary forms, with or without
modification, are permitted provided that the following conditions are met:
-
- 1. Redistributions of source code must retain the above copyright notice,
+
+ 1. Redistributions of source code must retain the above copyright notice,
this list of conditions and the following disclaimer.
-
- 2. Redistributions in binary form must reproduce the above copyright
- notice, this list of conditions and the following disclaimer in the
+
+ 2. Redistributions in binary form must reproduce the above copyright
+ notice, this list of conditions and the following disclaimer in the
documentation and/or other materials provided with the distribution.
-
- 3. Neither the name of the Intel Corporation nor the names of its
- contributors may be used to endorse or promote products derived from
+
+ 3. Neither the name of the Intel Corporation nor the names of its
+ contributors may be used to endorse or promote products derived from
this software without specific prior written permission.
-
+
THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
- AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
- LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
+ LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
POSSIBILITY OF SUCH DAMAGE.
@@ -76,7 +76,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_wm.c,v 1.245 2013/02/13 16:58:04 msaitoh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_wm.c,v 1.246 2013/03/30 03:21:08 christos Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -2107,7 +2107,7 @@ wm_detach(device_t self, int flags __unused)
if_detach(ifp);
- /* Unload RX dmamaps and free mbufs */
+ /* Unload RX dmamaps and free mbufs */
wm_rxdrain(sc);
/* Free dmamap. It's the same as the end of the wm_attach() function */
@@ -2956,9 +2956,9 @@ wm_nq_tx_offload(struct wm_softc *sc, struct wm_txsoft *txs,
sc->sc_nq_txdescs[sc->sc_txnext].nqrx_ctx.nqtxc_vl_len =
htole32(vl_len);
sc->sc_nq_txdescs[sc->sc_txnext].nqrx_ctx.nqtxc_sn = 0;
- sc->sc_nq_txdescs[sc->sc_txnext].nqrx_ctx.nqtxc_cmd =
+ sc->sc_nq_txdescs[sc->sc_txnext].nqrx_ctx.nqtxc_cmd =
htole32(cmdc);
- sc->sc_nq_txdescs[sc->sc_txnext].nqrx_ctx.nqtxc_mssidx =
+ sc->sc_nq_txdescs[sc->sc_txnext].nqrx_ctx.nqtxc_mssidx =
htole32(mssidx);
WM_CDTXSYNC(sc, sc->sc_txnext, 1, BUS_DMASYNC_PREWRITE);
DPRINTF(WM_DEBUG_TX,
@@ -3159,7 +3159,7 @@ wm_nq_start(struct ifnet *ifp)
htole32(fields);
DPRINTF(WM_DEBUG_TX,
("%s: TX: adv data desc %d 0x%" PRIx64 "\n",
- device_xname(sc->sc_dev), nexttx,
+ device_xname(sc->sc_dev), nexttx,
(uint64_t)dmamap->dm_segs[0].ds_addr));
DPRINTF(WM_DEBUG_TX,
("\t 0x%08x%08x\n", fields,
@@ -5152,7 +5152,7 @@ wm_read_eeprom_uwire(struct wm_softc *sc, int word, int wordcnt, uint16_t *data)
delay(2);
}
/* XXX: end of workaround */
-
+
/* Set CHIP SELECT. */
reg |= EECD_CS;
CSR_WRITE(sc, WMREG_EECD, reg);
@@ -5544,7 +5544,7 @@ wm_add_rxbuf(struct wm_softc *sc, int idx)
if ((sc->sc_flags & WM_F_NEWQUEUE) != 0) {
if ((sc->sc_rctl & RCTL_EN) != 0)
WM_INIT_RXDESC(sc, idx);
- } else
+ } else
WM_INIT_RXDESC(sc, idx);
return 0;
@@ -6283,7 +6283,7 @@ wm_gmii_mediainit(struct wm_softc *sc, pci_product_id_t prodid)
*
* For some devices, we can determine the PHY access method
* from sc_type.
- *
+ *
* For ICH8 variants, it's difficult to detemine the PHY access
* method by sc_type, so use the PCI product ID for some devices.
* For other ICH8 variants, try to use igp's method. If the PHY
@@ -7863,7 +7863,7 @@ wm_release_hw_control(struct wm_softc *sc)
if ((sc->sc_flags & WM_F_HAS_MANAGE) == 0)
return;
-
+
if (sc->sc_type == WM_T_82573) {
reg = CSR_READ(sc, WMREG_SWSM);
reg &= ~SWSM_DRV_LOAD;
@@ -7980,7 +7980,7 @@ wm_kmrn_lock_loss_workaround_ich8lan(struct wm_softc *sc)
reg = CSR_READ(sc, WMREG_PHY_CTRL);
reg |= PHY_CTRL_GBE_DIS | PHY_CTRL_NOND0A_GBE_DIS;
CSR_WRITE(sc, WMREG_PHY_CTRL, reg);
-
+
/*
* Call gig speed drop workaround on Gig disable before accessing
* any PHY registers.
@@ -8260,7 +8260,7 @@ wm_init_manageability(struct wm_softc *sc)
manc |= MANC_EN_MNG2HOST;
manc2h |= MANC2H_PORT_623| MANC2H_PORT_624;
CSR_WRITE(sc, WMREG_MANC2H, manc2h);
-
+
}
CSR_WRITE(sc, WMREG_MANC, manc);
@@ -8291,7 +8291,7 @@ wm_get_wakeup(struct wm_softc *sc)
case WM_T_82583:
sc->sc_flags |= WM_F_HAS_AMT;
/* FALLTHROUGH */
- case WM_T_80003:
+ case WM_T_80003:
case WM_T_82541:
case WM_T_82547:
case WM_T_82571:
diff --git a/sys/dev/pci/if_wpi.c b/sys/dev/pci/if_wpi.c
index 9c0c43bbef8..9203f8984de 100644
--- a/sys/dev/pci/if_wpi.c
+++ b/sys/dev/pci/if_wpi.c
@@ -1,4 +1,4 @@
-/* $NetBSD: if_wpi.c,v 1.54 2012/11/25 19:50:34 riastradh Exp $ */
+/* $NetBSD: if_wpi.c,v 1.55 2013/03/30 03:21:08 christos Exp $ */
/*-
* Copyright (c) 2006, 2007
@@ -18,7 +18,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_wpi.c,v 1.54 2012/11/25 19:50:34 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_wpi.c,v 1.55 2013/03/30 03:21:08 christos Exp $");
/*
* Driver for Intel PRO/Wireless 3945ABG 802.11 network adapters.
@@ -128,7 +128,7 @@ static void wpi_mem_lock(struct wpi_softc *);
static void wpi_mem_unlock(struct wpi_softc *);
static uint32_t wpi_mem_read(struct wpi_softc *, uint16_t);
static void wpi_mem_write(struct wpi_softc *, uint16_t, uint32_t);
-static void wpi_mem_write_region_4(struct wpi_softc *, uint16_t,
+static void wpi_mem_write_region_4(struct wpi_softc *, uint16_t,
const uint32_t *, int);
static int wpi_read_prom_data(struct wpi_softc *, uint32_t, void *, int);
static int wpi_load_microcode(struct wpi_softc *, const uint8_t *, int);
@@ -158,7 +158,7 @@ static int wpi_wme_update(struct ieee80211com *);
static int wpi_mrr_setup(struct wpi_softc *);
static void wpi_set_led(struct wpi_softc *, uint8_t, uint8_t, uint8_t);
static void wpi_enable_tsf(struct wpi_softc *, struct ieee80211_node *);
-static int wpi_set_txpower(struct wpi_softc *,
+static int wpi_set_txpower(struct wpi_softc *,
struct ieee80211_channel *, int);
static int wpi_get_power_index(struct wpi_softc *,
struct wpi_power_group *, struct ieee80211_channel *, int);
@@ -489,7 +489,7 @@ wpi_alloc_shared(struct wpi_softc *sc)
int error;
/* must be aligned on a 4K-page boundary */
error = wpi_dma_contig_alloc(sc->sc_dmat, &sc->shared_dma,
- (void **)&sc->shared, sizeof (struct wpi_shared),
+ (void **)&sc->shared, sizeof (struct wpi_shared),
WPI_BUF_ALIGN,BUS_DMA_NOWAIT);
if (error != 0)
aprint_error_dev(sc->sc_dev,
@@ -579,7 +579,7 @@ wpi_alloc_rpool(struct wpi_softc *sc)
error = wpi_dma_contig_alloc(sc->sc_dmat, &ring->buf_dma, NULL,
WPI_RBUF_COUNT * WPI_RBUF_SIZE, WPI_BUF_ALIGN, BUS_DMA_NOWAIT);
if (error != 0) {
- aprint_normal_dev(sc->sc_dev,
+ aprint_normal_dev(sc->sc_dev,
"could not allocate Rx buffers DMA memory\n");
return error;
}
@@ -861,7 +861,7 @@ wpi_newstate(struct ieee80211com *ic, enum ieee80211_state nstate, int arg)
switch (nstate) {
case IEEE80211_S_SCAN:
-
+
if (sc->is_scanning)
break;
@@ -889,7 +889,7 @@ wpi_newstate(struct ieee80211com *ic, enum ieee80211_state nstate, int arg)
sc->config.associd = 0;
sc->config.filter &= ~htole32(WPI_FILTER_BSS);
if ((error = wpi_auth(sc)) != 0) {
- aprint_error_dev(sc->sc_dev,
+ aprint_error_dev(sc->sc_dev,
"could not send authentication request\n");
return error;
}
@@ -901,7 +901,7 @@ wpi_newstate(struct ieee80211com *ic, enum ieee80211_state nstate, int arg)
wpi_set_led(sc, WPI_LED_LINK, 5, 5);
break;
}
-
+
ni = ic->ic_bss;
if (ic->ic_opmode != IEEE80211_M_STA) {
@@ -1054,7 +1054,7 @@ wpi_mem_write_region_4(struct wpi_softc *sc, uint16_t addr,
for (; wlen > 0; wlen--, data++, addr += 4)
wpi_mem_write(sc, addr, *data);
}
-
+
/*
* Read `len' bytes from the EEPROM. We access the EEPROM through the MAC
@@ -1439,7 +1439,7 @@ wpi_rx_intr(struct wpi_softc *sc, struct wpi_rx_desc *desc,
struct ieee80211_frame *wh;
struct ieee80211_node *ni;
struct mbuf *m, *mnew;
- int data_off ;
+ int data_off ;
stat = (struct wpi_rx_stat *)(desc + 1);
@@ -1468,9 +1468,9 @@ wpi_rx_intr(struct wpi_softc *sc, struct wpi_rx_desc *desc,
}
/* Compute where are the useful datas */
- data_off = (char*)(head + 1) - mtod(data->m, char*);
-
- /*
+ data_off = (char*)(head + 1) - mtod(data->m, char*);
+
+ /*
* If the number of free entry is too low
* just dup the data->m socket and reuse the same rbuf entry
* Note that thi test is not protected by a mutex because the
@@ -1480,7 +1480,7 @@ wpi_rx_intr(struct wpi_softc *sc, struct wpi_rx_desc *desc,
* evaluates as true, so nb_free_entries can grow any time.
*/
if (sc->rxq.nb_free_entries <= WPI_RBUF_LOW_LIMIT) {
-
+
/* Prepare the mbuf for the m_dup */
data->m->m_pkthdr.len = data->m->m_len = le16toh(head->len);
data->m->m_data = (char*) data->m->m_data + data_off;
@@ -1506,7 +1506,7 @@ wpi_rx_intr(struct wpi_softc *sc, struct wpi_rx_desc *desc,
KASSERT(rbuf != NULL);
/* attach Rx buffer to mbuf */
- MEXTADD(mnew, rbuf->vaddr, WPI_RBUF_SIZE, 0, wpi_free_rbuf,
+ MEXTADD(mnew, rbuf->vaddr, WPI_RBUF_SIZE, 0, wpi_free_rbuf,
rbuf);
mnew->m_flags |= M_EXT_RW;
@@ -1525,7 +1525,7 @@ wpi_rx_intr(struct wpi_softc *sc, struct wpi_rx_desc *desc,
if (ic->ic_state == IEEE80211_S_SCAN)
wpi_fix_channel(ic, m);
-
+
if (sc->sc_drvbpf != NULL) {
struct wpi_rx_radiotap_header *tap = &sc->sc_rxtap;
@@ -1681,7 +1681,7 @@ wpi_notif_intr(struct wpi_softc *sc)
le32toh(uc->valid)));
if (le32toh(uc->valid) != 1) {
- aprint_error_dev(sc->sc_dev,
+ aprint_error_dev(sc->sc_dev,
"microcontroller initialization failed\n");
}
break;
@@ -1985,7 +1985,7 @@ wpi_tx_data(struct wpi_softc *sc, struct mbuf *m0, struct ieee80211_node *ni,
(1 + data->map->dm_nsegs) << 24);
desc->segs[0].addr = htole32(ring->cmd_dma.paddr +
ring->cur * sizeof (struct wpi_tx_cmd));
- desc->segs[0].len = htole32(4 + sizeof (struct wpi_cmd_data) +
+ desc->segs[0].len = htole32(4 + sizeof (struct wpi_cmd_data) +
((hdrlen + 3) & ~3));
for (i = 1; i <= data->map->dm_nsegs; i++) {
@@ -2611,7 +2611,7 @@ wpi_setup_beacon(struct wpi_softc *sc, struct ieee80211_node *ni)
error = bus_dmamap_load_mbuf(sc->sc_dmat, data->map, m0,
BUS_DMA_READ | BUS_DMA_NOWAIT);
if (error) {
- aprint_error_dev(sc->sc_dev, "could not map beacon\n");
+ aprint_error_dev(sc->sc_dev, "could not map beacon\n");
m_freem(m0);
return error;
}
@@ -2668,7 +2668,7 @@ wpi_auth(struct wpi_softc *sc)
error = wpi_cmd(sc, WPI_CMD_CONFIGURE, &sc->config,
sizeof (struct wpi_config), 1);
if (error != 0) {
- aprint_error_dev(sc->sc_dev, "could not configure\n");
+ aprint_error_dev(sc->sc_dev, "could not configure\n");
return error;
}
@@ -2688,7 +2688,7 @@ wpi_auth(struct wpi_softc *sc)
node.antenna = WPI_ANTENNA_BOTH;
error = wpi_cmd(sc, WPI_CMD_ADD_NODE, &node, sizeof node, 1);
if (error != 0) {
- aprint_error_dev(sc->sc_dev, "could not add BSS node\n");
+ aprint_error_dev(sc->sc_dev, "could not add BSS node\n");
return error;
}
@@ -2721,7 +2721,7 @@ wpi_scan(struct wpi_softc *sc, uint16_t flags)
MGETHDR(data->m, M_DONTWAIT, MT_DATA);
if (data->m == NULL) {
- aprint_error_dev(sc->sc_dev,
+ aprint_error_dev(sc->sc_dev,
"could not allocate mbuf for scan command\n");
return ENOMEM;
}
@@ -2730,7 +2730,7 @@ wpi_scan(struct wpi_softc *sc, uint16_t flags)
if (!(data->m->m_flags & M_EXT)) {
m_freem(data->m);
data->m = NULL;
- aprint_error_dev(sc->sc_dev,
+ aprint_error_dev(sc->sc_dev,
"could not allocate mbuf for scan command\n");
return ENOMEM;
}
@@ -2947,7 +2947,7 @@ wpi_config(struct wpi_softc *sc)
node.id = WPI_ID_BROADCAST;
node.rate = wpi_plcp_signal(2);
node.action = htole32(WPI_ACTION_SET_RATE);
- node.antenna = WPI_ANTENNA_BOTH;
+ node.antenna = WPI_ANTENNA_BOTH;
error = wpi_cmd(sc, WPI_CMD_ADD_NODE, &node, sizeof node, 0);
if (error != 0) {
aprint_error_dev(sc->sc_dev, "could not add broadcast node\n");
@@ -3033,7 +3033,7 @@ wpi_reset(struct wpi_softc *sc)
DELAY(10);
}
if (ntries == 1000) {
- aprint_error_dev(sc->sc_dev,
+ aprint_error_dev(sc->sc_dev,
"timeout waiting for clock stabilization\n");
return ETIMEDOUT;
}
@@ -3068,7 +3068,7 @@ wpi_hw_config(struct wpi_softc *sc)
hw |= WPI_HW_SKU_MRC;
hw &= ~WPI_HW_REV_D;
- if ((le16toh(sc->rev) & 0xf0) == 0xd0)
+ if ((le16toh(sc->rev) & 0xf0) == 0xd0)
hw |= WPI_HW_REV_D;
if (sc->type > 1)
@@ -3155,7 +3155,7 @@ wpi_init(struct ifnet *ifp)
/* wait for thermal sensors to calibrate */
for (ntries = 0; ntries < 1000; ntries++) {
- if ((sc->temp = (int)WPI_READ(sc, WPI_TEMPERATURE)) != 0)
+ if ((sc->temp = (int)WPI_READ(sc, WPI_TEMPERATURE)) != 0)
break;
DELAY(10);
}
@@ -3220,7 +3220,7 @@ wpi_stop(struct ifnet *ifp, int disable)
/* reset Rx ring */
wpi_reset_rx_ring(sc, &sc->rxq);
-
+
wpi_mem_lock(sc);
wpi_mem_write(sc, WPI_MEM_CLOCK2, 0x200);
wpi_mem_unlock(sc);
diff --git a/sys/dev/pci/if_xge.c b/sys/dev/pci/if_xge.c
index 5edf4ac5a12..40d6fb44b55 100644
--- a/sys/dev/pci/if_xge.c
+++ b/sys/dev/pci/if_xge.c
@@ -1,4 +1,4 @@
-/* $NetBSD: if_xge.c,v 1.17 2012/10/27 17:18:34 chs Exp $ */
+/* $NetBSD: if_xge.c,v 1.18 2013/03/30 03:21:09 christos Exp $ */
/*
* Copyright (c) 2004, SUNET, Swedish University Computer Network.
@@ -43,7 +43,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_xge.c,v 1.17 2012/10/27 17:18:34 chs Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_xge.c,v 1.18 2013/03/30 03:21:09 christos Exp $");
#include <sys/param.h>
@@ -204,7 +204,7 @@ pif_wcsr(struct xge_softc *sc, bus_size_t csr, uint64_t val)
lval = val&0xffffffff;
hval = val>>32;
- bus_space_write_4(sc->sc_st, sc->sc_sh, csr, lval);
+ bus_space_write_4(sc->sc_st, sc->sc_sh, csr, lval);
bus_space_write_4(sc->sc_st, sc->sc_sh, csr+4, hval);
}
@@ -225,7 +225,7 @@ txp_wcsr(struct xge_softc *sc, bus_size_t csr, uint64_t val)
lval = val&0xffffffff;
hval = val>>32;
- bus_space_write_4(sc->sc_txt, sc->sc_txh, csr, lval);
+ bus_space_write_4(sc->sc_txt, sc->sc_txh, csr, lval);
bus_space_write_4(sc->sc_txt, sc->sc_txh, csr+4, hval);
}
@@ -238,7 +238,7 @@ pif_wkey(struct xge_softc *sc, bus_size_t csr, uint64_t val)
lval = val&0xffffffff;
hval = val>>32;
PIF_WCSR(RMAC_CFG_KEY, RMAC_KEY_VALUE);
- bus_space_write_4(sc->sc_st, sc->sc_sh, csr, lval);
+ bus_space_write_4(sc->sc_st, sc->sc_sh, csr, lval);
PIF_WCSR(RMAC_CFG_KEY, RMAC_KEY_VALUE);
bus_space_write_4(sc->sc_st, sc->sc_sh, csr+4, hval);
}
@@ -328,7 +328,7 @@ xge_attach(device_t parent, device_t self, void *aux)
/*
* The MAC addr may be all FF's, which is not good.
- * Resolve it by writing some magics to GPIO_CONTROL and
+ * Resolve it by writing some magics to GPIO_CONTROL and
* force a chip reset to read in the serial eeprom again.
*/
for (i = 0; i < sizeof(fix_mac)/sizeof(fix_mac[0]); i++) {
@@ -578,7 +578,7 @@ xge_ifmedia_status(struct ifnet *ifp, struct ifmediareq *ifmr)
ifmr->ifm_active = IFM_ETHER|IFM_10G_LR;
reg = PIF_RCSR(ADAPTER_STATUS);
- if ((reg & (RMAC_REMOTE_FAULT|RMAC_LOCAL_FAULT)) == 0)
+ if ((reg & (RMAC_REMOTE_FAULT|RMAC_LOCAL_FAULT)) == 0)
ifmr->ifm_status |= IFM_ACTIVE;
}
@@ -606,7 +606,7 @@ xge_enable(struct xge_softc *sc)
}
-int
+int
xge_init(struct ifnet *ifp)
{
struct xge_softc *sc = ifp->if_softc;
@@ -695,7 +695,7 @@ xge_intr(void *pv)
while ((PIF_RCSR(ADAPTER_STATUS) & QUIESCENT) != QUIESCENT)
;
PIF_WCSR(MAC_RMAC_ERR_REG, RMAC_LINK_STATE_CHANGE_INT);
-
+
val = PIF_RCSR(ADAPTER_STATUS);
if ((val & (RMAC_REMOTE_FAULT|RMAC_LOCAL_FAULT)) == 0)
xge_enable(sc); /* Only if link restored */
@@ -819,7 +819,7 @@ xge_intr(void *pv)
return 0;
}
-int
+int
xge_ioctl(struct ifnet *ifp, u_long cmd, void *data)
{
struct xge_softc *sc = ifp->if_softc;
@@ -917,7 +917,7 @@ allmulti:
;
}
-void
+void
xge_start(struct ifnet *ifp)
{
struct xge_softc *sc = ifp->if_softc;
@@ -1094,7 +1094,7 @@ xge_alloc_rxmem(struct xge_softc *sc)
rxpp->r4_next = (uint64_t)sc->sc_rxmap->dm_segs[0].ds_addr +
(i*sizeof(struct rxd_4k)) + sizeof(struct rxd_4k);
}
- sc->sc_rxd_4k[NRXPAGES-1]->r4_next =
+ sc->sc_rxd_4k[NRXPAGES-1]->r4_next =
(uint64_t)sc->sc_rxmap->dm_segs[0].ds_addr;
return 0;
@@ -1155,7 +1155,7 @@ xge_add_rxbuf(struct xge_softc *sc, int id)
MCLGET(m[3], M_DONTWAIT);
if (m[4])
MCLGET(m[4], M_DONTWAIT);
- if (!m[0] || !m[1] || !m[2] || !m[3] || !m[4] ||
+ if (!m[0] || !m[1] || !m[2] || !m[3] || !m[4] ||
((m[3]->m_flags & M_EXT) == 0) || ((m[4]->m_flags & M_EXT) == 0)) {
/* Out of something */
for (i = 0; i < 5; i++)
@@ -1245,7 +1245,7 @@ xge_setup_xgxs(struct xge_softc *sc)
PIF_WCSR(DTX_CONTROL, 0x00180400000000e0ULL); DELAY(50);
PIF_WCSR(DTX_CONTROL, 0x00180400000000ecULL); DELAY(50);
- /*
+ /*
* Reading the MDIO control with value 0x1804001c0F001c
* means the TxLanes were already in sync
* Reading the MDIO control with value 0x1804000c0x001c
@@ -1255,7 +1255,7 @@ xge_setup_xgxs(struct xge_softc *sc)
#if 0
val = PIF_RCSR(MDIO_CONTROL);
if (val != 0x1804001c0F001cULL) {
- printf("%s: MDIO_CONTROL: %llx != %llx\n",
+ printf("%s: MDIO_CONTROL: %llx != %llx\n",
XNAME, val, 0x1804001c0F001cULL);
return 1;
}
@@ -1272,7 +1272,7 @@ xge_setup_xgxs(struct xge_softc *sc)
/* Reading the DTX control register Should be 0x5152040001c */
val = PIF_RCSR(DTX_CONTROL);
if (val != 0x5152040001cULL) {
- printf("%s: DTX_CONTROL: %llx != %llx\n",
+ printf("%s: DTX_CONTROL: %llx != %llx\n",
XNAME, val, 0x5152040001cULL);
return 1;
}