Author: glebius
Date: Tue Apr 10 06:52:21 2012
New Revision: 234086
URL: http://svn.freebsd.org/changeset/base/234086
Log:
M_DONTWAIT is a flag from historical mbuf(9)
allocator, not malloc(9) or uma(9) flag.
Modified:
head/sys/dev/sfxge/sfxge_rx.c
Modified: head/sys/dev/sfxge/sfxge_rx.c
==============================================================================
--- head/sys/dev/sfxge/sfxge_rx.c Tue Apr 10 06:25:11 2012
(r234085)
+++ head/sys/dev/sfxge/sfxge_rx.c Tue Apr 10 06:52:21 2012
(r234086)
@@ -176,10 +176,10 @@ static inline struct mbuf *sfxge_rx_allo
/* 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 sf
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;
_______________________________________________
svn-src-head@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
