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/if_ethersubr.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/if_ethersubr.c')
| -rw-r--r-- | sys/net/if_ethersubr.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sys/net/if_ethersubr.c b/sys/net/if_ethersubr.c index 4273f0e..c40c4d6 100644 --- a/sys/net/if_ethersubr.c +++ b/sys/net/if_ethersubr.c @@ -470,7 +470,7 @@ ether_ipfw_chk(struct mbuf **m0, struct ifnet *dst, * Restore Ethernet header, as needed, in case the * mbuf chain was replaced by ipfw. */ - M_PREPEND(m, ETHER_HDR_LEN, M_NOWAIT); + M_PREPEND(m, ETHER_HDR_LEN, M_DONTWAIT); if (m == NULL) { *m0 = m; return 0; @@ -894,7 +894,7 @@ discard: * Put back the ethernet header so netgraph has a * consistent view of inbound packets. */ - M_PREPEND(m, sizeof (struct ether_header), M_NOWAIT); + M_PREPEND(m, sizeof (struct ether_header), M_DONTWAIT); (*ng_ether_input_orphan_p)(ifp, m); return; } |
