kernel: Fix a few more mbuf MB_* vs. kmalloc M_* flag misuses.

diff --git a/sys/dev/netif/msk/if_msk.c b/sys/dev/netif/msk/if_msk.c
index ce2eb9d..990f781 100644 (file)
--- a/sys/dev/netif/msk/if_msk.c
+++ b/sys/dev/netif/msk/if_msk.c
@@ -773,7 +773,7 @@ msk_jumbo_newbuf(struct msk_if_softc *sc_if, int idx)
        int nsegs;
        void *buf;
 
-       MGETHDR(m, M_DONTWAIT, MT_DATA);
+       MGETHDR(m, MB_DONTWAIT, MT_DATA);
        if (m == NULL)
                return (ENOBUFS);
        buf = msk_jalloc(sc_if);

diff --git a/sys/netgraph7/atm/ngatmbase.c b/sys/netgraph7/atm/ngatmbase.c
index dd630a5..e92565f 100644 (file)
--- a/sys/netgraph7/atm/ngatmbase.c
+++ b/sys/netgraph7/atm/ngatmbase.c
@@ -29,8 +29,6 @@
  * In-kernel UNI stack message functions.
  *
  * $FreeBSD: src/sys/netgraph/atm/ngatmbase.c,v 1.3 2005/01/07 01:45:40 imp Exp $
- * $DragonFly: src/sys/netgraph7/atm/ngatmbase.c,v 1.2 2008/06/26 23:05:37 dillon Exp $
- * $DragonFly: src/sys/netgraph7/atm/ngatmbase.c,v 1.2 2008/06/26 23:05:37 dillon Exp $
  */
 
 #include <sys/param.h>
@@ -95,7 +93,7 @@ uni_msg_extend(struct uni_msg *m, size_t s)
        lead = uni_msg_leading(m);
        len = uni_msg_len(m);
        s += lead + len + EXTRA;
-       if ((b = kmalloc(s, M_UNIMSG, MB_DONTWAIT)) == NULL) {
+       if ((b = kmalloc(s, M_UNIMSG, M_NOWAIT)) == NULL) {
                uni_msg_destroy(m);
                return (ENOMEM);
        }

diff --git a/sys/netinet/sctp_output.c b/sys/netinet/sctp_output.c
index 761abde..feeadc9 100644 (file)
--- a/sys/netinet/sctp_output.c
+++ b/sys/netinet/sctp_output.c
@@ -4916,7 +4916,7 @@ sctp_sendall (struct sctp_inpcb *inp, struct uio *uio, struct mbuf *m, struct sc
 {
        int ret;
        struct sctp_copy_all *ca;
-       ca = kmalloc(sizeof(struct sctp_copy_all), M_PCB, MB_WAIT);
+       ca = kmalloc(sizeof(struct sctp_copy_all), M_PCB, M_NOWAIT);
        if (ca == NULL) {
                m_freem(m);
                return (ENOMEM);
@@ -7505,7 +7505,7 @@ sctp_output(struct sctp_inpcb *inp, struct mbuf *m, struct sockaddr *addr,
                                asoc->strmout = NULL;
                                asoc->streamoutcnt = asoc->pre_open_streams;
                                asoc->strmout = kmalloc(asoc->streamoutcnt * sizeof(struct sctp_stream_out),
-                                                       M_PCB, MB_WAIT);
+                                                       M_PCB, M_WAITOK);
                                for (i = 0; i < asoc->streamoutcnt; i++) {
                                        /*
                                         * inbound side must be set to 0xffff,
@@ -10287,7 +10287,7 @@ sctp_sosend(struct socket *so,
                                        asoc->strmout =
                                            kmalloc(asoc->streamoutcnt *
                                                sizeof(struct sctp_stream_out),
-                                               M_PCB, MB_WAIT);
+                                               M_PCB, M_WAITOK);
                                        for (i = 0; i < asoc->streamoutcnt; i++) {
                                                /*
                                                 * inbound side must be set to 0xffff,