summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Knudsen <mk@cvs.openbsd.org>2010-03-02 20:54:28 +0000
committerMichael Knudsen <mk@cvs.openbsd.org>2010-03-02 20:54:28 +0000
commit457544956b17414db0a843c5b6abb9d208b6e10d (patch)
tree46f4c2e4e25779a50584dd0dba4dc09dfee9d18f
parentfee7c835db0ae03612bc4f849d091cf2b74a7b1f (diff)
Rename sc_sc to sc_softc.
-rw-r--r--sys/dev/usb/if_urndis.c10
-rw-r--r--sys/dev/usb/if_urndisreg.h4
2 files changed, 7 insertions, 7 deletions
diff --git a/sys/dev/usb/if_urndis.c b/sys/dev/usb/if_urndis.c
index 3be504fcacf..04cbdad34ee 100644
--- a/sys/dev/usb/if_urndis.c
+++ b/sys/dev/usb/if_urndis.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: if_urndis.c,v 1.2 2010/03/02 20:27:25 mk Exp $ */
+/* $OpenBSD: if_urndis.c,v 1.3 2010/03/02 20:54:27 mk Exp $ */
/*
* Copyright (c) 2010 Jonathan Armani <dbd@asystant.net>
@@ -942,7 +942,7 @@ urndis_rx_list_init(struct urndis_softc *sc)
cd = &sc->sc_data;
for (i = 0; i < RNDIS_RX_LIST_CNT; i++) {
c = &cd->sc_rx_chain[i];
- c->sc_sc = sc;
+ c->sc_softc = sc;
c->sc_idx = i;
if (urndis_newbuf(sc, c, NULL) == ENOBUFS)
@@ -972,7 +972,7 @@ urndis_tx_list_init(struct urndis_softc *sc)
cd = &sc->sc_data;
for (i = 0; i < RNDIS_TX_LIST_CNT; i++) {
c = &cd->sc_tx_chain[i];
- c->sc_sc = sc;
+ c->sc_softc = sc;
c->sc_idx = i;
c->sc_mbuf = NULL;
if (c->sc_xfer == NULL) {
@@ -1228,7 +1228,7 @@ urndis_rxeof(usbd_xfer_handle xfer, usbd_private_handle priv, usbd_status status
size_t total_len;
c = priv;
- sc = c->sc_sc;
+ sc = c->sc_softc;
ifp = GET_IFP(sc);
total_len = 0;
@@ -1283,7 +1283,7 @@ urndis_txeof(usbd_xfer_handle xfer, usbd_private_handle priv, usbd_status status
int s;
c = priv;
- sc = c->sc_sc;
+ sc = c->sc_softc;
ifp = GET_IFP(sc);
DPRINTF(("%s: urndis_txeof\n", DEVNAME(sc)));
diff --git a/sys/dev/usb/if_urndisreg.h b/sys/dev/usb/if_urndisreg.h
index ccbbcf48cf5..ace3482b9fe 100644
--- a/sys/dev/usb/if_urndisreg.h
+++ b/sys/dev/usb/if_urndisreg.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: if_urndisreg.h,v 1.4 2010/03/02 20:51:42 mk Exp $ */
+/* $OpenBSD: if_urndisreg.h,v 1.5 2010/03/02 20:54:27 mk Exp $ */
/*
* Copyright (c) 2010 Jonathan Armani <dbd@asystant.net>
@@ -24,7 +24,7 @@
#define RNDIS_BUFSZ 1542
struct urndis_chain {
- struct urndis_softc *sc_sc;
+ struct urndis_softc *sc_softc;
usbd_xfer_handle sc_xfer;
char *sc_buf;
struct mbuf *sc_mbuf;