Module Name: src
Committed By: christos
Date: Sat Mar 30 03:15:53 UTC 2013
Modified Files:
src/sys/dev/usb: if_atu.c if_smsc.c if_upgt.c if_urndis.c
Log Message:
remove trailing whitespace
To generate a diff of this commit:
cvs rdiff -u -r1.48 -r1.49 src/sys/dev/usb/if_atu.c
cvs rdiff -u -r1.8 -r1.9 src/sys/dev/usb/if_smsc.c src/sys/dev/usb/if_upgt.c
cvs rdiff -u -r1.4 -r1.5 src/sys/dev/usb/if_urndis.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/dev/usb/if_atu.c
diff -u src/sys/dev/usb/if_atu.c:1.48 src/sys/dev/usb/if_atu.c:1.49
--- src/sys/dev/usb/if_atu.c:1.48 Tue Jan 22 07:40:42 2013
+++ src/sys/dev/usb/if_atu.c Fri Mar 29 23:15:52 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: if_atu.c,v 1.48 2013/01/22 12:40:42 jmcneill Exp $ */
+/* $NetBSD: if_atu.c,v 1.49 2013/03/30 03:15:52 christos Exp $ */
/* $OpenBSD: if_atu.c,v 1.48 2004/12/30 01:53:21 dlg Exp $ */
/*
* Copyright (c) 2003, 2004
@@ -48,7 +48,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_atu.c,v 1.48 2013/01/22 12:40:42 jmcneill Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_atu.c,v 1.49 2013/03/30 03:15:52 christos Exp $");
#include <sys/param.h>
#include <sys/sockio.h>
@@ -693,8 +693,8 @@ atu_initial_config(struct atu_softc *sc)
cmd.WEP_DefaultKeyID = ic->ic_def_txkey;
for (i = 0; i < IEEE80211_WEP_NKID; i++) {
- memcpy(cmd.WEP_DefaultKey[i], ic->ic_nw_keys[i].wk_key,
- ic->ic_nw_keys[i].wk_keylen);
+ memcpy(cmd.WEP_DefaultKey[i], ic->ic_nw_keys[i].wk_key,
+ ic->ic_nw_keys[i].wk_keylen);
}
}
Index: src/sys/dev/usb/if_smsc.c
diff -u src/sys/dev/usb/if_smsc.c:1.8 src/sys/dev/usb/if_smsc.c:1.9
--- src/sys/dev/usb/if_smsc.c:1.8 Mon Mar 11 05:35:38 2013
+++ src/sys/dev/usb/if_smsc.c Fri Mar 29 23:15:52 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: if_smsc.c,v 1.8 2013/03/11 09:35:38 skrll Exp $ */
+/* $NetBSD: if_smsc.c,v 1.9 2013/03/30 03:15:52 christos Exp $ */
/* $OpenBSD: if_smsc.c,v 1.4 2012/09/27 12:38:11 jsg Exp $ */
/* $FreeBSD: src/sys/dev/usb/net/if_smsc.c,v 1.1 2012/08/15 04:03:55 gonzo Exp $ */
@@ -574,7 +574,7 @@ smsc_init(struct ifnet *ifp)
/* Load the multicast filter. */
smsc_setmulti(sc);
-
+
/* Open RX and TX pipes. */
err = usbd_open_pipe(sc->sc_iface, sc->sc_ed[SMSC_ENDPT_RX],
USBD_EXCLUSIVE_USE, &sc->sc_ep[SMSC_ENDPT_RX]);
@@ -1044,7 +1044,7 @@ smsc_attach(device_t parent, device_t se
ifp->if_stop = smsc_stop;
sc->sc_ec.ec_capabilities = ETHERCAP_VLAN_MTU;
-
+
/* Setup some of the basics */
sc->sc_phyno = 1;
@@ -1308,7 +1308,7 @@ smsc_rxeof(usbd_xfer_handle xfer, usbd_p
m->m_pkthdr.rcvif = ifp;
pktlen -= 2; // JDM
-
+
m->m_pkthdr.len = m->m_len = pktlen;
#define ETHER_ALIGN 2
m_adj(m, ETHER_ALIGN);
Index: src/sys/dev/usb/if_upgt.c
diff -u src/sys/dev/usb/if_upgt.c:1.8 src/sys/dev/usb/if_upgt.c:1.9
--- src/sys/dev/usb/if_upgt.c:1.8 Tue Jan 22 07:40:43 2013
+++ src/sys/dev/usb/if_upgt.c Fri Mar 29 23:15:53 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: if_upgt.c,v 1.8 2013/01/22 12:40:43 jmcneill Exp $ */
+/* $NetBSD: if_upgt.c,v 1.9 2013/03/30 03:15:53 christos Exp $ */
/* $OpenBSD: if_upgt.c,v 1.49 2010/04/20 22:05:43 tedu Exp $ */
/*
@@ -18,7 +18,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_upgt.c,v 1.8 2013/01/22 12:40:43 jmcneill Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_upgt.c,v 1.9 2013/03/30 03:15:53 christos Exp $");
#include <sys/param.h>
#include <sys/callout.h>
@@ -727,7 +727,7 @@ upgt_fw_verify(struct upgt_softc *sc)
if (*uc != 0)
break;
}
- if (offset == sc->sc_fw_size) {
+ if (offset == sc->sc_fw_size) {
aprint_error_dev(sc->sc_dev,
"firmware Boot Record Area not found\n");
return EIO;
Index: src/sys/dev/usb/if_urndis.c
diff -u src/sys/dev/usb/if_urndis.c:1.4 src/sys/dev/usb/if_urndis.c:1.5
--- src/sys/dev/usb/if_urndis.c:1.4 Thu Mar 1 23:22:57 2012
+++ src/sys/dev/usb/if_urndis.c Fri Mar 29 23:15:53 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: if_urndis.c,v 1.4 2012/03/02 04:22:57 jakllsch Exp $ */
+/* $NetBSD: if_urndis.c,v 1.5 2013/03/30 03:15:53 christos Exp $ */
/* $OpenBSD: if_urndis.c,v 1.31 2011/07/03 15:47:17 matthew Exp $ */
/*
@@ -21,7 +21,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_urndis.c,v 1.4 2012/03/02 04:22:57 jakllsch Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_urndis.c,v 1.5 2013/03/30 03:15:53 christos Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -330,7 +330,7 @@ urndis_ctrl_handle_query(struct urndis_s
"go out of buffer limit %u\n",
DEVNAME(sc),
le32toh(msg->rm_infobuflen),
- le32toh(msg->rm_infobufoffset),
+ le32toh(msg->rm_infobufoffset),
le32toh(msg->rm_infobuflen) +
le32toh(msg->rm_infobufoffset) + (uint32_t)RNDIS_HEADER_OFFSET,
le32toh(msg->rm_len));
@@ -580,7 +580,7 @@ urndis_ctrl_set(struct urndis_softc *sc,
rval = urndis_ctrl_handle(sc, hdr, NULL, NULL);
if (rval != RNDIS_STATUS_SUCCESS)
printf("%s: set failed 0x%x\n", DEVNAME(sc), rval);
-
+
return rval;
}
@@ -781,7 +781,7 @@ urndis_decap(struct urndis_softc *sc, st
ifp = GET_IFP(sc);
offset = 0;
-
+
while (len > 0) {
msg = (struct urndis_packet_msg *)((char*)c->sc_buf + offset);
m = c->sc_mbuf;
@@ -834,7 +834,7 @@ urndis_decap(struct urndis_softc *sc, st
}
if (le32toh(msg->rm_dataoffset) +
- le32toh(msg->rm_datalen) + RNDIS_HEADER_OFFSET
+ le32toh(msg->rm_datalen) + RNDIS_HEADER_OFFSET
> le32toh(msg->rm_len)) {
printf("%s: urndis_decap invalid data "
"len/offset/end_position(%u/%u/%u) -> "
@@ -1475,7 +1475,7 @@ urndis_attach(device_t parent, device_t
}
/* Initialize packet filter */
- sc->sc_filter = RNDIS_PACKET_TYPE_BROADCAST;
+ sc->sc_filter = RNDIS_PACKET_TYPE_BROADCAST;
sc->sc_filter |= RNDIS_PACKET_TYPE_ALL_MULTICAST;
filter = htole32(sc->sc_filter);
if (urndis_ctrl_set(sc, OID_GEN_CURRENT_PACKET_FILTER, &filter,
@@ -1504,7 +1504,7 @@ urndis_detach(device_t self, int flags)
DPRINTF(("urndis_detach: %s flags %u\n", DEVNAME(sc),
flags));
-
+
if (!sc->sc_attached)
return 0;
