Re: Argument order fix for MCLGETI
On 2019/09/25 10:22, Claudio Jeker wrote: > On Wed, Sep 25, 2019 at 04:10:10PM +0800, Kevin Lo wrote: > > ok? > > OK claudio@ > > How did that even work? /me adds ti, lge, nfe, nge to a list for next time the kernel grows too much ;-)
Re: Argument order fix for MCLGETI
On Wed, Sep 25, 2019 at 04:10:10PM +0800, Kevin Lo wrote:
> ok?
OK claudio@
How did that even work?
> Index: sys/dev/ic/ti.c
> ===
> RCS file: /cvs/src/sys/dev/ic/ti.c,v
> retrieving revision 1.25
> diff -u -p -u -p -r1.25 ti.c
> --- sys/dev/ic/ti.c 22 Jan 2017 10:17:38 - 1.25
> +++ sys/dev/ic/ti.c 25 Sep 2019 08:06:26 -
> @@ -576,7 +576,7 @@ ti_newbuf_std(struct ti_softc *sc, int i
> sc->ti_cdata.ti_rx_std_map[i] = dmamap;
>
> if (m == NULL) {
> - m_new = MCLGETI(NULL, MCLBYTES, NULL, M_DONTWAIT);
> + m_new = MCLGETI(NULL, M_DONTWAIT, NULL, MCLBYTES);
> if (m_new == NULL)
> return (ENOBUFS);
>
> @@ -695,7 +695,7 @@ ti_newbuf_jumbo(struct ti_softc *sc, int
> bus_dmamap_unload(sc->sc_dmatag, dmamap);
>
> if (m == NULL) {
> - m_new = MCLGETI(NULL, TI_JUMBO_FRAMELEN, NULL, M_DONTWAIT);
> + m_new = MCLGETI(NULL, M_DONTWAIT, NULL, TI_JUMBO_FRAMELEN);
> if (m_new == NULL)
> return (ENOBUFS);
>
> Index: sys/dev/pci/if_lge.c
> ===
> RCS file: /cvs/src/sys/dev/pci/if_lge.c,v
> retrieving revision 1.73
> diff -u -p -u -p -r1.73 if_lge.c
> --- sys/dev/pci/if_lge.c 22 Jan 2017 10:17:38 - 1.73
> +++ sys/dev/pci/if_lge.c 25 Sep 2019 08:06:26 -
> @@ -626,7 +626,7 @@ lge_newbuf(struct lge_softc *sc, struct
> struct mbuf *m_new = NULL;
>
> if (m == NULL) {
> - m_new = MCLGETI(NULL, LGE_JLEN, NULL, M_DONTWAIT);
> + m_new = MCLGETI(NULL, M_DONTWAIT, NULL, LGE_JLEN);
> if (m_new == NULL)
> return (ENOBUFS);
> } else {
> Index: sys/dev/pci/if_nfe.c
> ===
> RCS file: /cvs/src/sys/dev/pci/if_nfe.c,v
> retrieving revision 1.120
> diff -u -p -u -p -r1.120 if_nfe.c
> --- sys/dev/pci/if_nfe.c 8 Sep 2017 05:36:52 - 1.120
> +++ sys/dev/pci/if_nfe.c 25 Sep 2019 08:06:26 -
> @@ -697,7 +697,7 @@ nfe_rxeof(struct nfe_softc *sc)
>* old mbuf. In the unlikely case that the old mbuf can't be
>* reloaded either, explicitly panic.
>*/
> - mnew = MCLGETI(NULL, MCLBYTES, NULL, M_DONTWAIT);
> + mnew = MCLGETI(NULL, M_DONTWAIT, NULL, MCLBYTES);
> if (mnew == NULL) {
> ifp->if_ierrors++;
> goto skip;
> @@ -1210,7 +1210,7 @@ nfe_alloc_rx_ring(struct nfe_softc *sc,
> for (i = 0; i < NFE_RX_RING_COUNT; i++) {
> data = >rxq.data[i];
>
> - data->m = MCLGETI(NULL, MCLBYTES, NULL, M_DONTWAIT);
> + data->m = MCLGETI(NULL, M_DONTWAIT, NULL, MCLBYTES);
> if (data->m == NULL) {
> printf("%s: could not allocate rx mbuf\n",
> sc->sc_dev.dv_xname);
> Index: sys/dev/pci/if_nge.c
> ===
> RCS file: /cvs/src/sys/dev/pci/if_nge.c,v
> retrieving revision 1.92
> diff -u -p -u -p -r1.92 if_nge.c
> --- sys/dev/pci/if_nge.c 22 Jan 2017 10:17:38 - 1.92
> +++ sys/dev/pci/if_nge.c 25 Sep 2019 08:06:26 -
> @@ -962,7 +962,7 @@ nge_newbuf(struct nge_softc *sc, struct
> struct mbuf *m_new = NULL;
>
> if (m == NULL) {
> - m_new = MCLGETI(NULL, NGE_MCLBYTES, NULL, M_DONTWAIT);
> + m_new = MCLGETI(NULL, M_DONTWAIT, NULL, NGE_MCLBYTES);
> if (m_new == NULL)
> return (ENOBUFS);
> } else {
>
--
:wq Claudio
Argument order fix for MCLGETI
ok?
Index: sys/dev/ic/ti.c
===
RCS file: /cvs/src/sys/dev/ic/ti.c,v
retrieving revision 1.25
diff -u -p -u -p -r1.25 ti.c
--- sys/dev/ic/ti.c 22 Jan 2017 10:17:38 - 1.25
+++ sys/dev/ic/ti.c 25 Sep 2019 08:06:26 -
@@ -576,7 +576,7 @@ ti_newbuf_std(struct ti_softc *sc, int i
sc->ti_cdata.ti_rx_std_map[i] = dmamap;
if (m == NULL) {
- m_new = MCLGETI(NULL, MCLBYTES, NULL, M_DONTWAIT);
+ m_new = MCLGETI(NULL, M_DONTWAIT, NULL, MCLBYTES);
if (m_new == NULL)
return (ENOBUFS);
@@ -695,7 +695,7 @@ ti_newbuf_jumbo(struct ti_softc *sc, int
bus_dmamap_unload(sc->sc_dmatag, dmamap);
if (m == NULL) {
- m_new = MCLGETI(NULL, TI_JUMBO_FRAMELEN, NULL, M_DONTWAIT);
+ m_new = MCLGETI(NULL, M_DONTWAIT, NULL, TI_JUMBO_FRAMELEN);
if (m_new == NULL)
return (ENOBUFS);
Index: sys/dev/pci/if_lge.c
===
RCS file: /cvs/src/sys/dev/pci/if_lge.c,v
retrieving revision 1.73
diff -u -p -u -p -r1.73 if_lge.c
--- sys/dev/pci/if_lge.c22 Jan 2017 10:17:38 - 1.73
+++ sys/dev/pci/if_lge.c25 Sep 2019 08:06:26 -
@@ -626,7 +626,7 @@ lge_newbuf(struct lge_softc *sc, struct
struct mbuf *m_new = NULL;
if (m == NULL) {
- m_new = MCLGETI(NULL, LGE_JLEN, NULL, M_DONTWAIT);
+ m_new = MCLGETI(NULL, M_DONTWAIT, NULL, LGE_JLEN);
if (m_new == NULL)
return (ENOBUFS);
} else {
Index: sys/dev/pci/if_nfe.c
===
RCS file: /cvs/src/sys/dev/pci/if_nfe.c,v
retrieving revision 1.120
diff -u -p -u -p -r1.120 if_nfe.c
--- sys/dev/pci/if_nfe.c8 Sep 2017 05:36:52 - 1.120
+++ sys/dev/pci/if_nfe.c25 Sep 2019 08:06:26 -
@@ -697,7 +697,7 @@ nfe_rxeof(struct nfe_softc *sc)
* old mbuf. In the unlikely case that the old mbuf can't be
* reloaded either, explicitly panic.
*/
- mnew = MCLGETI(NULL, MCLBYTES, NULL, M_DONTWAIT);
+ mnew = MCLGETI(NULL, M_DONTWAIT, NULL, MCLBYTES);
if (mnew == NULL) {
ifp->if_ierrors++;
goto skip;
@@ -1210,7 +1210,7 @@ nfe_alloc_rx_ring(struct nfe_softc *sc,
for (i = 0; i < NFE_RX_RING_COUNT; i++) {
data = >rxq.data[i];
- data->m = MCLGETI(NULL, MCLBYTES, NULL, M_DONTWAIT);
+ data->m = MCLGETI(NULL, M_DONTWAIT, NULL, MCLBYTES);
if (data->m == NULL) {
printf("%s: could not allocate rx mbuf\n",
sc->sc_dev.dv_xname);
Index: sys/dev/pci/if_nge.c
===
RCS file: /cvs/src/sys/dev/pci/if_nge.c,v
retrieving revision 1.92
diff -u -p -u -p -r1.92 if_nge.c
--- sys/dev/pci/if_nge.c22 Jan 2017 10:17:38 - 1.92
+++ sys/dev/pci/if_nge.c25 Sep 2019 08:06:26 -
@@ -962,7 +962,7 @@ nge_newbuf(struct nge_softc *sc, struct
struct mbuf *m_new = NULL;
if (m == NULL) {
- m_new = MCLGETI(NULL, NGE_MCLBYTES, NULL, M_DONTWAIT);
+ m_new = MCLGETI(NULL, M_DONTWAIT, NULL, NGE_MCLBYTES);
if (m_new == NULL)
return (ENOBUFS);
} else {
