Remove lwp parameter from wrapifioctl (always curlwp)

brlib/libnetconfig/netconfig.c

@@ -54,12 +54,12 @@ static struct socket *rtso;
 #define CHECKDOMAIN(dom) if (!(dom)) return EAFNOSUPPORT
 
 static int
-wrapifioctl(struct socket *so, u_long cmd, void *data, struct lwp *l)
+wrapifioctl(struct socket *so, u_long cmd, void *data)
 {
 	int rv;
 
 	KERNEL_LOCK(1, NULL);
-	rv = ifioctl(so, cmd, data, l);
+	rv = ifioctl(so, cmd, data, curlwp);
 	KERNEL_UNLOCK_ONE(NULL);
 
 	return rv;
@@ -72,7 +72,7 @@ rump_netconfig_ifcreate(const char *ifname)
 
 	memset(&ifr, 0, sizeof(ifr));
 	strlcpy(ifr.ifr_name, ifname, sizeof(ifr.ifr_name));
-	return wrapifioctl(in4so, SIOCIFCREATE, &ifr, curlwp);
+	return wrapifioctl(in4so, SIOCIFCREATE, &ifr);
 }
 
 static void
@@ -97,11 +97,11 @@ chflag(const char *ifname, void (*edflag)(short *))
 
 	memset(&ifr, 0, sizeof(ifr));
 	strlcpy(ifr.ifr_name, ifname, sizeof(ifr.ifr_name));
-	if ((rv = wrapifioctl(in4so, SIOCGIFFLAGS, &ifr, curlwp)) != 0)
+	if ((rv = wrapifioctl(in4so, SIOCGIFFLAGS, &ifr)) != 0)
 		return rv;
 	edflag(&ifr.ifr_flags);
 
-	return wrapifioctl(in4so, SIOCSIFFLAGS, &ifr, curlwp);
+	return wrapifioctl(in4so, SIOCSIFFLAGS, &ifr);
 }
 
 int
@@ -129,7 +129,7 @@ rump_netconfig_ifsetlinkstr(const char *ifname, const char *linkstr)
 	ifd.ifd_data = __UNCONST(linkstr);
 	ifd.ifd_len = strlen(linkstr)+1;
 
-	return wrapifioctl(in4so, SIOCSLINKSTR, &ifd, curlwp);
+	return wrapifioctl(in4so, SIOCSLINKSTR, &ifd);
 }
 
 int
@@ -139,7 +139,7 @@ rump_netconfig_ifdestroy(const char *ifname)
 
 	memset(&ifr, 0, sizeof(ifr));
 	strlcpy(ifr.ifr_name, ifname, sizeof(ifr.ifr_name));
-	return wrapifioctl(in4so, SIOCIFDESTROY, &ifr, curlwp);
+	return wrapifioctl(in4so, SIOCIFDESTROY, &ifr);
 }
 
 static int
@@ -169,7 +169,7 @@ cfg_ipv4(const char *ifname, const char *addr, in_addr_t m_addr)
 	sin->sin_len = sizeof(*sin);
 	sin->sin_addr.s_addr = inet_addr(addr) | ~m_addr;
 
-	rv = wrapifioctl(in4so, SIOCAIFADDR, &ia, curlwp);
+	rv = wrapifioctl(in4so, SIOCAIFADDR, &ia);
 	/*
 	 * small pause so that we can assume interface is usable when
 	 * we return (ARPs have trickled through, etc.)
@@ -227,7 +227,7 @@ rump_netconfig_ipv6_ifaddr(const char *ifname, const char *addr, int prefixlen)
 	memset(&sin6->sin6_addr, 0, sizeof(sin6->sin6_addr));
 	memset(&sin6->sin6_addr, 0xff, prefixlen / 8);
 
-	rv = wrapifioctl(in6so, SIOCAIFADDR_IN6, &ia, curlwp);
+	rv = wrapifioctl(in6so, SIOCAIFADDR_IN6, &ia);
 	/*
 	 * small pause so that we can assume interface is usable when
 	 * we return (ARPs have trickled through, etc.)