diff options
| author | Bosko Milekic <bmilekic@FreeBSD.org> | 2002-12-19 22:58:27 +0000 |
|---|---|---|
| committer | Bosko Milekic <bmilekic@FreeBSD.org> | 2002-12-19 22:58:27 +0000 |
| commit | 86fea6be59ad2f1fb3bb539eb35ae7bf9ce276c0 (patch) | |
| tree | fb78678839efbdec9c58873ff5e7df1cf42aa7f5 /sys/netinet | |
| parent | 9dbbb2829e57340aef670a1b9b522a4db9c01e3a (diff) | |
Notes
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 a547c6619b6c..478cdfae3ed5 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 d7ccad7c55c3..8a41f99a9506 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)); |