Author: yongari
Date: Sat Nov 13 01:07:45 2010
New Revision: 215221
URL: http://svn.freebsd.org/changeset/base/215221
Log:
MFC r214841-214842:
r214841:
Remove extra white spaces.
r214842:
style(9).
Modified:
stable/7/sys/dev/re/if_re.c
Directory Properties:
stable/7/sys/ (props changed)
stable/7/sys/cddl/contrib/opensolaris/ (props changed)
stable/7/sys/contrib/dev/acpica/ (props changed)
stable/7/sys/contrib/pf/ (props changed)
Modified: stable/7/sys/dev/re/if_re.c
==============================================================================
--- stable/7/sys/dev/re/if_re.c Sat Nov 13 01:05:47 2010 (r215220)
+++ stable/7/sys/dev/re/if_re.c Sat Nov 13 01:07:45 2010 (r215221)
@@ -881,7 +881,7 @@ re_probe(device_t dev)
uint16_t devid, vendor;
uint16_t revid, sdevid;
int i;
-
+
vendor = pci_get_vendor(dev);
devid = pci_get_device(dev);
revid = pci_get_revid(dev);
@@ -1122,7 +1122,7 @@ re_attach(device_t dev)
/*
* Prefer memory space register mapping over IO space.
* Because RTL8169SC does not seem to work when memory mapping
- * is used always activate io mapping.
+ * is used always activate io mapping.
*/
if (devid == RT_DEVICEID_8169SC)
prefer_iomap = 1;
@@ -2018,9 +2018,9 @@ re_rxeof(struct rl_softc *sc)
sc->rl_ldata.rl_rx_prodidx = i;
if (maxpkt)
- return(EAGAIN);
+ return (EAGAIN);
- return(0);
+ return (0);
}
static void
@@ -2109,7 +2109,7 @@ re_tick(void *xsc)
* Reclaim transmitted frames here. Technically it is not
* necessary to do here but it ensures periodic reclamation
* regardless of Tx completion interrupt which seems to be
- * lost on PCIe based controllers under certain situations.
+ * lost on PCIe based controllers under certain situations.
*/
re_txeof(sc);
re_watchdog(sc);
@@ -2833,7 +2833,7 @@ re_ioctl(struct ifnet *ifp, u_long comma
if (ifr->ifr_reqcap & IFCAP_POLLING) {
error = ether_poll_register(re_poll, ifp);
if (error)
- return(error);
+ return (error);
RL_LOCK(sc);
/* Disable interrupts */
CSR_WRITE_2(sc, RL_IMR, 0x0000);
_______________________________________________
[email protected] mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "[email protected]"
