summaryrefslogtreecommitdiff
path: root/sys
diff options
context:
space:
mode:
authorDavid Gwynne <dlg@cvs.openbsd.org>2019-11-26 06:23:31 +0000
committerDavid Gwynne <dlg@cvs.openbsd.org>2019-11-26 06:23:31 +0000
commitd038c18a60afc049fa55a1490ad798f2e1864613 (patch)
tree26543a4f37b7fd1ae50a1a4d02aeff5082c1a664 /sys
parent7c6d37926052b102f0bd22de1f871d57f86953ed (diff)
s/sc_arpcom/sc_ac/ to be consistent with other drivers.
no functional change
Diffstat (limited to 'sys')
-rw-r--r--sys/net/if_tun.c16
1 files changed, 8 insertions, 8 deletions
diff --git a/sys/net/if_tun.c b/sys/net/if_tun.c
index 929e5a163b5..c1339ad5ce4 100644
--- a/sys/net/if_tun.c
+++ b/sys/net/if_tun.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: if_tun.c,v 1.194 2019/11/26 04:03:48 dlg Exp $ */
+/* $OpenBSD: if_tun.c,v 1.195 2019/11/26 06:23:30 dlg Exp $ */
/* $NetBSD: if_tun.c,v 1.24 1996/05/07 02:40:48 thorpej Exp $ */
/*
@@ -81,8 +81,8 @@
#include <net/if_tun.h>
struct tun_softc {
- struct arpcom sc_arpcom; /* ethernet common data */
-#define sc_if sc_arpcom.ac_if
+ struct arpcom sc_ac; /* ethernet common data */
+#define sc_if sc_ac.ac_if
struct selinfo sc_rsel; /* read select */
struct selinfo sc_wsel; /* write select (not used) */
LIST_ENTRY(tun_softc)
@@ -547,7 +547,7 @@ tun_ioctl(struct ifnet *ifp, u_long cmd, caddr_t data)
break;
default:
if (sc->sc_flags & TUN_LAYER2)
- error = ether_ioctl(ifp, &sc->sc_arpcom, cmd, data);
+ error = ether_ioctl(ifp, &sc->sc_ac, cmd, data);
else
error = ENOTTY;
}
@@ -721,15 +721,15 @@ tun_dev_ioctl(struct tun_softc *sc, u_long cmd, caddr_t data, int flag,
case SIOCGIFADDR:
if (!(sc->sc_flags & TUN_LAYER2))
return (EINVAL);
- bcopy(sc->sc_arpcom.ac_enaddr, data,
- sizeof(sc->sc_arpcom.ac_enaddr));
+ bcopy(sc->sc_ac.ac_enaddr, data,
+ sizeof(sc->sc_ac.ac_enaddr));
break;
case SIOCSIFADDR:
if (!(sc->sc_flags & TUN_LAYER2))
return (EINVAL);
- bcopy(data, sc->sc_arpcom.ac_enaddr,
- sizeof(sc->sc_arpcom.ac_enaddr));
+ bcopy(data, sc->sc_ac.ac_enaddr,
+ sizeof(sc->sc_ac.ac_enaddr));
break;
default:
#ifdef PIPEX