summaryrefslogtreecommitdiffstats
path: root/sys/netinet
diff options
context:
space:
mode:
authortb <tb@openbsd.org>2018-06-03 18:35:48 +0000
committertb <tb@openbsd.org>2018-06-03 18:35:48 +0000
commitddfad7508fe122068d00ba9a13a34b37f5a65010 (patch)
tree46284a8bd9443a66520547c5581f929a21bc4cf1 /sys/netinet
parenton i386, libm does sysctl to discover is the system has SSE. Whitelist (diff)
downloadwireguard-openbsd-ddfad7508fe122068d00ba9a13a34b37f5a65010.tar.xz
wireguard-openbsd-ddfad7508fe122068d00ba9a13a34b37f5a65010.zip
SIOCSIFNETMASK takes a 'struct ifreq', so use 'ifr' for it and drop the
now unused 'ifra' from in_ioctl(). Discussed with mpi and visa
Diffstat (limited to 'sys/netinet')
-rw-r--r--sys/netinet/in.c5
1 files changed, 2 insertions, 3 deletions
diff --git a/sys/netinet/in.c b/sys/netinet/in.c
index a4c102ce068..b5ef386d21d 100644
--- a/sys/netinet/in.c
+++ b/sys/netinet/in.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: in.c,v 1.158 2018/06/03 17:46:22 tb Exp $ */
+/* $OpenBSD: in.c,v 1.159 2018/06/03 18:35:48 tb Exp $ */
/* $NetBSD: in.c,v 1.26 1996/02/13 23:41:39 christos Exp $ */
/*
@@ -215,7 +215,6 @@ in_ioctl(u_long cmd, caddr_t data, struct ifnet *ifp, int privileged)
struct ifreq *ifr = (struct ifreq *)data;
struct ifaddr *ifa;
struct in_ifaddr *ia = NULL;
- struct in_aliasreq *ifra = (struct in_aliasreq *)data;
struct sockaddr_in oldaddr;
int error = 0;
@@ -307,7 +306,7 @@ in_ioctl(u_long cmd, caddr_t data, struct ifnet *ifp, int privileged)
}
ia->ia_netmask = ia->ia_sockmask.sin_addr.s_addr =
- ifra->ifra_addr.sin_addr.s_addr;
+ satosin(&ifr->ifr_addr)->sin_addr.s_addr;
break;
}