diff options
| author |   brad <brad@openbsd.org> | 2014-11-29 22:53:58 +0000 |
|---|---|---|
| committer | brad <brad@openbsd.org> | 2014-11-29 22:53:58 +0000 |
| commit | 0da1f952acf0e5bfca77958aefcf7ca8f13781ec (patch) | |
| tree | c5dda4942626b938ac59559e734eb892388f9a3f | |
| parent | Explicitly initialize client->state to S_REBOOTING rather than (diff) | |
| download | wireguard-openbsd-0da1f952acf0e5bfca77958aefcf7ca8f13781ec.tar.xz wireguard-openbsd-0da1f952acf0e5bfca77958aefcf7ca8f13781ec.zip | |
rxr ioctl handling.
ok sf@
| -rw-r--r-- | sys/dev/pci/if_vio.c | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/sys/dev/pci/if_vio.c b/sys/dev/pci/if_vio.c index 91b505904b3..1bc448ce7f8 100644 --- a/sys/dev/pci/if_vio.c +++ b/sys/dev/pci/if_vio.c @@ -1,4 +1,4 @@ -/* $OpenBSD: if_vio.c,v 1.18 2014/07/12 18:48:52 tedu Exp $ */ +/* $OpenBSD: if_vio.c,v 1.19 2014/11/29 22:53:58 brad Exp $ */ /* * Copyright (c) 2012 Stefan Fritsch, Alexander Fiveg. @@ -822,8 +822,9 @@ int vio_ioctl(struct ifnet *ifp, u_long cmd, caddr_t data) { struct vio_softc *sc = ifp->if_softc; - int s, r = 0; struct ifaddr *ifa = (struct ifaddr *)data; + struct ifreq *ifr = (struct ifreq *)data; + int s, r = 0; s = splnet(); switch (cmd) { @@ -853,8 +854,11 @@ vio_ioctl(struct ifnet *ifp, u_long cmd, caddr_t data) break; case SIOCGIFMEDIA: case SIOCSIFMEDIA: - r = ifmedia_ioctl(ifp, (struct ifreq *)data, &sc->sc_media, - cmd); + r = ifmedia_ioctl(ifp, ifr, &sc->sc_media, cmd); + break; + case SIOCGIFRXR: + r = if_rxr_ioctl((struct if_rxrinfo *)ifr->ifr_data, + NULL, MCLBYTES, &sc->sc_rx_ring); break; default: r = ether_ioctl(ifp, &sc->sc_ac, cmd, data); |