diff options
| author | alfred <alfred@FreeBSD.org> | 2003-01-21 08:56:16 +0000 |
|---|---|---|
| committer | alfred <alfred@FreeBSD.org> | 2003-01-21 08:56:16 +0000 |
| commit | bf8e8a6e8f0bd9165109f0a258730dd242299815 (patch) | |
| tree | f16a2fb9fa7a7fbc4c19e981d278d5f6eb53234d /sys/netgraph/bluetooth/drivers | |
| parent | 2180deee00350fff613a1d1d1328eddc4c0ba9c8 (diff) | |
| download | FreeBSD-src-bf8e8a6e8f0bd9165109f0a258730dd242299815.zip FreeBSD-src-bf8e8a6e8f0bd9165109f0a258730dd242299815.tar.gz | |
Remove M_TRYWAIT/M_WAITOK/M_WAIT. Callers should use 0.
Merge M_NOWAIT/M_DONTWAIT into a single flag M_NOWAIT.
Diffstat (limited to 'sys/netgraph/bluetooth/drivers')
| -rw-r--r-- | sys/netgraph/bluetooth/drivers/bt3c/ng_bt3c_pccard.c | 4 | ||||
| -rw-r--r-- | sys/netgraph/bluetooth/drivers/h4/ng_h4.c | 4 | ||||
| -rw-r--r-- | sys/netgraph/bluetooth/drivers/ubt/ng_ubt.c | 6 |
3 files changed, 7 insertions, 7 deletions
diff --git a/sys/netgraph/bluetooth/drivers/bt3c/ng_bt3c_pccard.c b/sys/netgraph/bluetooth/drivers/bt3c/ng_bt3c_pccard.c index 443c18a..2b008bf 100644 --- a/sys/netgraph/bluetooth/drivers/bt3c/ng_bt3c_pccard.c +++ b/sys/netgraph/bluetooth/drivers/bt3c/ng_bt3c_pccard.c @@ -832,7 +832,7 @@ bt3c_receive(bt3c_softc_p sc) sc->state = NG_BT3C_W4_PKT_IND; sc->want = 1; - MGETHDR(sc->m, M_DONTWAIT, MT_DATA); + MGETHDR(sc->m, M_NOWAIT, MT_DATA); if (sc->m == NULL) { NG_BT3C_ERR(sc->dev, "Could not get mbuf\n"); NG_BT3C_STAT_IERROR(sc->stat); @@ -996,7 +996,7 @@ bt3c_append(struct mbuf *m0, int c) } if (m->m_len >= len) { - MGET(m->m_next, M_DONTWAIT, m0->m_type); + MGET(m->m_next, M_NOWAIT, m0->m_type); if (m->m_next == NULL) return (ENOBUFS); diff --git a/sys/netgraph/bluetooth/drivers/h4/ng_h4.c b/sys/netgraph/bluetooth/drivers/h4/ng_h4.c index 650c6f4..d793c04 100644 --- a/sys/netgraph/bluetooth/drivers/h4/ng_h4.c +++ b/sys/netgraph/bluetooth/drivers/h4/ng_h4.c @@ -170,7 +170,7 @@ ng_h4_open(dev_t dev, struct tty *tp) } /* Initialize private struct */ - MALLOC(sc, ng_h4_info_p, sizeof(*sc), M_NETGRAPH_H4, M_WAITOK | M_ZERO); + MALLOC(sc, ng_h4_info_p, sizeof(*sc), M_NETGRAPH_H4, M_ZERO); if (sc == NULL) { error = ENOMEM; goto out; @@ -516,7 +516,7 @@ ng_h4_input(int c, struct tty *tp) if (sc->hook != NULL && NG_HOOK_IS_VALID(sc->hook)) { struct mbuf *m = NULL; - MGETHDR(m, M_DONTWAIT, MT_DATA); + MGETHDR(m, M_NOWAIT, MT_DATA); if (m != NULL) { m->m_pkthdr.len = 0; diff --git a/sys/netgraph/bluetooth/drivers/ubt/ng_ubt.c b/sys/netgraph/bluetooth/drivers/ubt/ng_ubt.c index 603d722..71cb2df 100644 --- a/sys/netgraph/bluetooth/drivers/ubt/ng_ubt.c +++ b/sys/netgraph/bluetooth/drivers/ubt/ng_ubt.c @@ -1012,7 +1012,7 @@ ubt_intr_complete(usbd_xfer_handle h, usbd_private_handle p, usbd_status s) /* Copy HCI event frame to mbuf */ - MGETHDR(m, M_DONTWAIT, MT_DATA); + MGETHDR(m, M_NOWAIT, MT_DATA); if (m == NULL) { NG_UBT_ALERT( "%s: %s - Could not allocate mbuf\n", __func__, USBDEVNAME(sc->sc_dev)); @@ -1148,7 +1148,7 @@ ubt_bulk_in_complete(usbd_xfer_handle h, usbd_private_handle p, usbd_status s) if (h->actlen < sizeof(*hdr)) goto done; - MGETHDR(m, M_DONTWAIT, MT_DATA); + MGETHDR(m, M_NOWAIT, MT_DATA); if (m == NULL) { NG_UBT_ALERT( "%s: %s - Could not allocate mbuf\n", __func__, USBDEVNAME(sc->sc_dev)); @@ -1426,7 +1426,7 @@ ubt_isoc_in_complete(usbd_xfer_handle h, usbd_private_handle p, usbd_status s) /* Copy SCO data frame to mbuf */ - MGETHDR(m, M_DONTWAIT, MT_DATA); + MGETHDR(m, M_NOWAIT, MT_DATA); if (m == NULL) { NG_UBT_ALERT( "%s: %s - Could not allocate mbuf\n", |
