Rename the macro MCLGETI to MCLGETL and removes the dead parameter ifp.

OK dlg@, bluhm@
No Opinion mpi@
Not against it claudio@

5 files changed, 12 insertions, 12 deletions

diff --git a/sys/net/bpf.c b/sys/net/bpf.c
index a0f13505874..b7e84d6e52f 100644
--- a/sys/net/bpf.c
+++ b/sys/net/bpf.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: bpf.c,v 1.196 2020/12/12 00:15:34 dlg Exp $	*/
+/*	$OpenBSD: bpf.c,v 1.197 2020/12/12 11:49:02 jan Exp $	*/
 /*	$NetBSD: bpf.c,v 1.33 1997/02/21 23:59:35 thorpej Exp $	*/
 
 /*
@@ -207,7 +207,7 @@ bpf_movein(struct uio *uio, struct bpf_d *d, struct mbuf **mp,
 	m->m_pkthdr.len = len - hlen;
 
 	if (len > MHLEN) {
-		MCLGETI(m, M_WAIT, NULL, len);
+		MCLGETL(m, M_WAIT, len);
 		if ((m->m_flags & M_EXT) == 0) {
 			error = ENOBUFS;
 			goto bad;
diff --git a/sys/net/if_aggr.c b/sys/net/if_aggr.c
index 7f65384e5fe..17f104eaa70 100644
--- a/sys/net/if_aggr.c
+++ b/sys/net/if_aggr.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: if_aggr.c,v 1.34 2020/08/21 22:59:27 kn Exp $ */
+/*	$OpenBSD: if_aggr.c,v 1.35 2020/12/12 11:49:02 jan Exp $ */
 
 /*
  * Copyright (c) 2019 The University of Queensland
@@ -2664,7 +2664,7 @@ aggr_ntt_transmit(struct aggr_port *p)
 		return;
 
 	if (len > MHLEN) {
-		MCLGETI(m, M_DONTWAIT, NULL, len);
+		MCLGETL(m, M_DONTWAIT, len);
 		if (!ISSET(m->m_flags, M_EXT)) {
 			m_freem(m);
 			return;
diff --git a/sys/net/if_gre.c b/sys/net/if_gre.c
index ca23567b3ca..cbe26346715 100644
--- a/sys/net/if_gre.c
+++ b/sys/net/if_gre.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: if_gre.c,v 1.162 2020/12/10 04:27:07 gnezdo Exp $ */
+/*	$OpenBSD: if_gre.c,v 1.163 2020/12/12 11:49:02 jan Exp $ */
 /*	$NetBSD: if_gre.c,v 1.9 1999/10/25 19:18:11 drochner Exp $ */
 
 /*
@@ -3198,7 +3198,7 @@ gre_keepalive_send(void *arg)
 		return;
 
 	if (len > MHLEN) {
-		MCLGETI(m, M_DONTWAIT, NULL, len);
+		MCLGETL(m, M_DONTWAIT, len);
 		if (!ISSET(m->m_flags, M_EXT)) {
 			m_freem(m);
 			return;
@@ -4099,7 +4099,7 @@ eoip_keepalive_send(void *arg)
 		return;
 
 	if (linkhdr > MHLEN) {
-		MCLGETI(m, M_DONTWAIT, NULL, linkhdr);
+		MCLGETL(m, M_DONTWAIT, linkhdr);
 		if (!ISSET(m->m_flags, M_EXT)) {
 			m_freem(m);
 			return;
diff --git a/sys/net/if_pfsync.c b/sys/net/if_pfsync.c
index ccb3772d57c..01acf4cb394 100644
--- a/sys/net/if_pfsync.c
+++ b/sys/net/if_pfsync.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: if_pfsync.c,v 1.278 2020/08/24 15:30:58 kn Exp $	*/
+/*	$OpenBSD: if_pfsync.c,v 1.279 2020/12/12 11:49:02 jan Exp $	*/
 
 /*
  * Copyright (c) 2002 Michael Shalayeff
@@ -1627,7 +1627,7 @@ pfsync_sendout(void)
 	}
 
 	if (max_linkhdr + sc->sc_len > MHLEN) {
-		MCLGETI(m, M_DONTWAIT, NULL, max_linkhdr + sc->sc_len);
+		MCLGETL(m, M_DONTWAIT, max_linkhdr + sc->sc_len);
 		if (!ISSET(m->m_flags, M_EXT)) {
 			m_free(m);
 			sc->sc_if.if_oerrors++;
diff --git a/sys/net/switchctl.c b/sys/net/switchctl.c
index e315dcd3773..66fa510bcc8 100644
--- a/sys/net/switchctl.c
+++ b/sys/net/switchctl.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: switchctl.c,v 1.21 2020/04/07 13:27:52 visa Exp $	*/
+/*	$OpenBSD: switchctl.c,v 1.22 2020/12/12 11:49:02 jan Exp $	*/
 
 /*
  * Copyright (c) 2016 Kazuya GODA <goda@openbsd.org>
@@ -224,7 +224,7 @@ switchwrite(dev_t dev, struct uio *uio, int ioflag)
 		if (m == NULL)
 			return (ENOBUFS);
 		if (len >= MHLEN) {
-			MCLGETI(m, M_DONTWAIT, NULL, MIN(MAXMCLBYTES, len));
+			MCLGETL(m, M_DONTWAIT, MIN(MAXMCLBYTES, len));
 			if ((m->m_flags & M_EXT) == 0) {
 				m_free(m);
 				return (ENOBUFS);
@@ -262,7 +262,7 @@ switchwrite(dev_t dev, struct uio *uio, int ioflag)
 			goto save_return;
 		}
 		if (len >= MLEN) {
-			MCLGETI(n, M_DONTWAIT, NULL, MIN(MAXMCLBYTES, len));
+			MCLGETL(n, M_DONTWAIT, MIN(MAXMCLBYTES, len));
 			if ((n->m_flags & M_EXT) == 0) {
 				m_free(n);
 				error = ENOBUFS;