diff options
| author | Gleb Smirnoff <glebius@FreeBSD.org> | 2012-04-10 06:52:21 +0000 |
|---|---|---|
| committer | Gleb Smirnoff <glebius@FreeBSD.org> | 2012-04-10 06:52:21 +0000 |
| commit | e275c0d349ac9e9077d3b79d147a5874a00672d2 (patch) | |
| tree | f84d7a9de4268273100e33f1d58a294154789164 /sys/dev/sfxge/sfxge_rx.c | |
| parent | fdd72b4a328906072f1691b8163d04fe1bb87cd4 (diff) | |
| download | src-e275c0d349ac9e9077d3b79d147a5874a00672d2.tar.gz src-e275c0d349ac9e9077d3b79d147a5874a00672d2.zip | |
M_DONTWAIT is a flag from historical mbuf(9)
allocator, not malloc(9) or uma(9) flag.
Notes
Notes:
svn path=/head/; revision=234086
Diffstat (limited to 'sys/dev/sfxge/sfxge_rx.c')
| -rw-r--r-- | sys/dev/sfxge/sfxge_rx.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/sys/dev/sfxge/sfxge_rx.c b/sys/dev/sfxge/sfxge_rx.c index 7dd5160f4c93..2aa8a3e27d81 100644 --- a/sys/dev/sfxge/sfxge_rx.c +++ b/sys/dev/sfxge/sfxge_rx.c @@ -176,10 +176,10 @@ static inline struct mbuf *sfxge_rx_alloc_mbuf(struct sfxge_softc *sc) /* Allocate mbuf structure */ args.flags = M_PKTHDR; args.type = MT_DATA; - m = (struct mbuf *)uma_zalloc_arg(zone_mbuf, &args, M_DONTWAIT); + m = (struct mbuf *)uma_zalloc_arg(zone_mbuf, &args, M_NOWAIT); /* Allocate (and attach) packet buffer */ - if (m && !uma_zalloc_arg(sc->rx_buffer_zone, m, M_DONTWAIT)) { + if (m && !uma_zalloc_arg(sc->rx_buffer_zone, m, M_NOWAIT)) { uma_zfree(zone_mbuf, m); m = NULL; } @@ -586,7 +586,7 @@ static void sfxge_lro_new_conn(struct sfxge_lro_state *st, uint32_t conn_hash, c = TAILQ_FIRST(&st->free_conns); TAILQ_REMOVE(&st->free_conns, c, link); } else { - c = malloc(sizeof(*c), M_SFXGE, M_DONTWAIT); + c = malloc(sizeof(*c), M_SFXGE, M_NOWAIT); if (c == NULL) return; c->mbuf = NULL; |