diff options
| author | mux <mux@FreeBSD.org> | 2002-10-19 11:31:50 +0000 |
|---|---|---|
| committer | mux <mux@FreeBSD.org> | 2002-10-19 11:31:50 +0000 |
| commit | 451ff53efa679aff57666e2a6dc6257e84c67724 (patch) | |
| tree | c92a65beb5bf174c94d71bff3353ec40242fd021 /sys | |
| parent | 62ac3ba58f038262eed3fb073c55af571b77635a (diff) | |
| download | FreeBSD-src-451ff53efa679aff57666e2a6dc6257e84c67724.zip FreeBSD-src-451ff53efa679aff57666e2a6dc6257e84c67724.tar.gz | |
Several malloc() calls were passing the M_DONTWAIT flag
which is an mbuf allocation flag. Use the correct
M_NOWAIT malloc() flag. Fortunately, both were defined
to 1, so this commit is a no-op.
Diffstat (limited to 'sys')
| -rw-r--r-- | sys/netinet/ip_fw2.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/sys/netinet/ip_fw2.c b/sys/netinet/ip_fw2.c index 3714d53..5cfcc75 100644 --- a/sys/netinet/ip_fw2.c +++ b/sys/netinet/ip_fw2.c @@ -851,7 +851,7 @@ realloc_dynamic_table(void) free(ipfw_dyn_v, M_IPFW); for (;;) { ipfw_dyn_v = malloc(curr_dyn_buckets * sizeof(ipfw_dyn_rule *), - M_IPFW, M_DONTWAIT | M_ZERO); + M_IPFW, M_NOWAIT | M_ZERO); if (ipfw_dyn_v != NULL || curr_dyn_buckets <= 2) break; curr_dyn_buckets /= 2; @@ -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; @@ -1981,7 +1981,7 @@ add_rule(struct ip_fw **head, struct ip_fw *input_rule) if (*head == NULL && input_rule->rulenum != IPFW_DEFAULT_RULE) return (EINVAL); - rule = malloc(l, M_IPFW, M_DONTWAIT | M_ZERO); + rule = malloc(l, M_IPFW, M_NOWAIT | M_ZERO); if (rule == NULL) return (ENOSPC); |
