diff options
| author | bmilekic <bmilekic@FreeBSD.org> | 2002-12-19 22:58:27 +0000 |
|---|---|---|
| committer | bmilekic <bmilekic@FreeBSD.org> | 2002-12-19 22:58:27 +0000 |
| commit | 514c635ee6d3ff47b542ec91a037e7a241c1357c (patch) | |
| tree | fb78678839efbdec9c58873ff5e7df1cf42aa7f5 /sys/net/bridge.c | |
| parent | 13bc2a4ca63803cb5287e5acd86ed9b2e3238689 (diff) | |
| download | FreeBSD-src-514c635ee6d3ff47b542ec91a037e7a241c1357c.zip FreeBSD-src-514c635ee6d3ff47b542ec91a037e7a241c1357c.tar.gz | |
o Untangle the confusion with the malloc flags {M_WAITOK, M_NOWAIT} and
the mbuf allocator flags {M_TRYWAIT, M_DONTWAIT}.
o Fix a bpf_compat issue where malloc() was defined to just call
bpf_alloc() and pass the 'canwait' flag(s) along. It's been changed
to call bpf_alloc() but pass the corresponding M_TRYWAIT or M_DONTWAIT
flag (and only one of those two).
Submitted by: Hiten Pandya <hiten@unixdaemons.com> (hiten->commit_count++)
Diffstat (limited to 'sys/net/bridge.c')
| -rw-r--r-- | sys/net/bridge.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sys/net/bridge.c b/sys/net/bridge.c index b5fa0e9..295c208 100644 --- a/sys/net/bridge.c +++ b/sys/net/bridge.c @@ -239,7 +239,7 @@ add_cluster(u_int16_t cluster_id, struct arpcom *ac) goto found; /* Not found, need to reallocate */ - c = malloc((1+n_clusters) * sizeof (*c), M_IFADDR, M_DONTWAIT | M_ZERO); + c = malloc((1+n_clusters) * sizeof (*c), M_IFADDR, M_NOWAIT | M_ZERO); if (c == NULL) {/* malloc failure */ printf("-- bridge: cannot add new cluster\n"); return NULL; @@ -793,7 +793,7 @@ static struct mbuf * bdg_forward(struct mbuf *m0, struct ifnet *dst) { #define EH_RESTORE(_m) do { \ - M_PREPEND((_m), ETHER_HDR_LEN, M_NOWAIT); \ + M_PREPEND((_m), ETHER_HDR_LEN, M_DONTWAIT); \ if ((_m) == NULL) { \ bdg_dropped++; \ return NULL; \ |
