Re: diff: replace useless use of MCLGETL with MCLGET

[Alexander Bluhm]

On Sat, Dec 12, 2020 at 02:05:48PM +0100, Jan Klemkow wrote:
> Thus, this diff removes '(void)' from the MCLGET macro
> -#define MCLGET(m, how) (void) m_clget((m), (how), MCLBYTES)
> +#define MCLGET(m, how) m_clget((m), (how), MCLBYTES)

The MCLGET API is to add a cluster to an existing mbuf.  Returning
the mbuf changes that.  I don't think a macro cleanup justifies an
API change.

bluhm

diff: replace useless use of MCLGETL with MCLGET

[Jan Klemkow]

Hi,

The use of MCLGETL with the default length MCLBYTES is useless.  Thus,
this diff removes '(void)' from the MCLGET macro as it is in the MCLGETL
and replaces all uses of MCLGETL with MCLBYTES by MCLGET.

OK?

bye,
Jan

Index: arch/octeon/dev/if_ogx.c
===
RCS file: /cvs/src/sys/arch/octeon/dev/if_ogx.c,v
retrieving revision 1.3
diff -u -p -r1.3 if_ogx.c
--- arch/octeon/dev/if_ogx.c12 Dec 2020 11:48:52 -  1.3
+++ arch/octeon/dev/if_ogx.c12 Dec 2020 12:58:31 -
@@ -1147,7 +1147,7 @@ ogx_load_mbufs(struct ogx_softc *sc, uns
paddr_t pktbuf;
 
for ( ; n > 0; n--) {
-   m = MCLGETL(NULL, M_NOWAIT, MCLBYTES);
+   m = MCLGET(NULL, M_NOWAIT);
if (m == NULL)
break;
 
Index: dev/fdt/if_dwge.c
===
RCS file: /cvs/src/sys/dev/fdt/if_dwge.c,v
retrieving revision 1.7
diff -u -p -r1.7 if_dwge.c
--- dev/fdt/if_dwge.c   12 Dec 2020 11:48:52 -  1.7
+++ dev/fdt/if_dwge.c   12 Dec 2020 12:58:31 -
@@ -1283,7 +1283,7 @@ dwge_alloc_mbuf(struct dwge_softc *sc, b
 {
struct mbuf *m = NULL;
 
-   m = MCLGETL(NULL, M_DONTWAIT, MCLBYTES);
+   m = MCLGET(NULL, M_DONTWAIT);
if (!m)
return (NULL);
m->m_len = m->m_pkthdr.len = MCLBYTES;
Index: dev/fdt/if_dwxe.c
===
RCS file: /cvs/src/sys/dev/fdt/if_dwxe.c,v
retrieving revision 1.18
diff -u -p -r1.18 if_dwxe.c
--- dev/fdt/if_dwxe.c   12 Dec 2020 11:48:52 -  1.18
+++ dev/fdt/if_dwxe.c   12 Dec 2020 12:58:31 -
@@ -1342,7 +1342,7 @@ dwxe_alloc_mbuf(struct dwxe_softc *sc, b
 {
struct mbuf *m = NULL;
 
-   m = MCLGETL(NULL, M_DONTWAIT, MCLBYTES);
+   m = MCLGET(NULL, M_DONTWAIT);
if (!m)
return (NULL);
m->m_len = m->m_pkthdr.len = MCLBYTES;
Index: dev/fdt/if_fec.c
===
RCS file: /cvs/src/sys/dev/fdt/if_fec.c,v
retrieving revision 1.11
diff -u -p -r1.11 if_fec.c
--- dev/fdt/if_fec.c12 Dec 2020 11:48:52 -  1.11
+++ dev/fdt/if_fec.c12 Dec 2020 12:58:31 -
@@ -1298,7 +1298,7 @@ fec_alloc_mbuf(struct fec_softc *sc, bus
 {
struct mbuf *m = NULL;
 
-   m = MCLGETL(NULL, M_DONTWAIT, MCLBYTES);
+   m = MCLGET(NULL, M_DONTWAIT);
if (!m)
return (NULL);
m->m_len = m->m_pkthdr.len = MCLBYTES;
Index: dev/fdt/if_mvneta.c
===
RCS file: /cvs/src/sys/dev/fdt/if_mvneta.c,v
retrieving revision 1.16
diff -u -p -r1.16 if_mvneta.c
--- dev/fdt/if_mvneta.c 12 Dec 2020 11:48:52 -  1.16
+++ dev/fdt/if_mvneta.c 12 Dec 2020 12:58:31 -
@@ -1654,7 +1654,7 @@ mvneta_alloc_mbuf(struct mvneta_softc *s
 {
struct mbuf *m = NULL;
 
-   m = MCLGETL(NULL, M_DONTWAIT, MCLBYTES);
+   m = MCLGET(NULL, M_DONTWAIT);
if (!m)
return (NULL);
m->m_len = m->m_pkthdr.len = MCLBYTES;
Index: dev/fdt/if_mvpp.c
===
RCS file: /cvs/src/sys/dev/fdt/if_mvpp.c,v
retrieving revision 1.44
diff -u -p -r1.44 if_mvpp.c
--- dev/fdt/if_mvpp.c   12 Dec 2020 11:48:52 -  1.44
+++ dev/fdt/if_mvpp.c   12 Dec 2020 12:58:31 -
@@ -3124,7 +3124,7 @@ mvpp2_alloc_mbuf(struct mvpp2_softc *sc,
 {
struct mbuf *m = NULL;
 
-   m = MCLGETL(NULL, M_DONTWAIT, MCLBYTES);
+   m = MCLGET(NULL, M_DONTWAIT);
if (!m)
return (NULL);
m->m_len = m->m_pkthdr.len = MCLBYTES;
Index: dev/ic/bcmgenet.c
===
RCS file: /cvs/src/sys/dev/ic/bcmgenet.c,v
retrieving revision 1.4
diff -u -p -r1.4 bcmgenet.c
--- dev/ic/bcmgenet.c   12 Dec 2020 11:48:52 -  1.4
+++ dev/ic/bcmgenet.c   12 Dec 2020 12:58:31 -
@@ -300,7 +300,7 @@ genet_alloc_mbufcl(struct genet_softc *s
 {
struct mbuf *m;
 
-   m = MCLGETL(NULL, M_DONTWAIT, MCLBYTES);
+   m = MCLGET(NULL, M_DONTWAIT);
if (m != NULL)
m->m_pkthdr.len = m->m_len = m->m_ext.ext_size;
 
Index: dev/ic/elink3.c
===
RCS file: /cvs/src/sys/dev/ic/elink3.c,v
retrieving revision 1.98
diff -u -p -r1.98 elink3.c
--- dev/ic/elink3.c 12 Dec 2020 11:48:52 -  1.98
+++ dev/ic/elink3.c 12 Dec 2020 12:58:31 -
@@ -1343,7 +1343,7 @@ epget(struct ep_softc *sc, int totlen)
m = sc->mb[sc->next_mb];
sc->mb[sc->next_mb] = NULL;
if (m == NULL) {
-   m = MCLGETL(NULL, M_DONTWAIT, MCLBYTES);
+   m = MCLGET(NULL, M_DONTWAIT);
/* If the queue is no longer full, refill. */
if (!timeout_pending(>sc_epmbuffill_tmo))