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/netinet | |
| 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/netinet')
| -rw-r--r-- | sys/netinet/ip_encap.c | 2 | ||||
| -rw-r--r-- | sys/netinet/ip_fw.c | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/sys/netinet/ip_encap.c b/sys/netinet/ip_encap.c index a547c66..478cdfa 100644 --- a/sys/netinet/ip_encap.c +++ b/sys/netinet/ip_encap.c @@ -487,7 +487,7 @@ encap_fillarg(m, ep) { struct m_tag *tag; - tag = m_tag_get(PACKET_TAG_ENCAP, sizeof (void*), M_NOWAIT); + tag = m_tag_get(PACKET_TAG_ENCAP, sizeof (void*), M_DONTWAIT); if (tag) { *(void**)(tag+1) = ep->arg; m_tag_prepend(m, tag); diff --git a/sys/netinet/ip_fw.c b/sys/netinet/ip_fw.c index d7ccad7..8a41f99 100644 --- a/sys/netinet/ip_fw.c +++ b/sys/netinet/ip_fw.c @@ -882,7 +882,7 @@ add_dyn_rule(struct ipfw_flow_id *id, u_int8_t dyn_type, struct ip_fw *rule) } i = hash_packet(id); - r = malloc(sizeof *r, M_IPFW, M_DONTWAIT | M_ZERO); + r = malloc(sizeof *r, M_IPFW, M_NOWAIT | M_ZERO); if (r == NULL) { printf ("sorry cannot allocate state\n"); return NULL ; @@ -1695,7 +1695,7 @@ add_entry(struct ip_fw_head *head, struct ip_fw *rule) u_short nbr = 0; int s; - ftmp = malloc(sizeof *ftmp, M_IPFW, M_DONTWAIT | M_ZERO); + ftmp = malloc(sizeof *ftmp, M_IPFW, M_NOWAIT | M_ZERO); if (!ftmp) return (ENOSPC); bcopy(rule, ftmp, sizeof(*ftmp)); |
