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/netinet6 | |
| parent | 9dbbb2829e57340aef670a1b9b522a4db9c01e3a (diff) | |
Notes
Diffstat (limited to 'sys/netinet6')
| -rw-r--r-- | sys/netinet6/esp_core.c | 2 | ||||
| -rw-r--r-- | sys/netinet6/ip6_fw.c | 4 | ||||
| -rw-r--r-- | sys/netinet6/ip6_input.c | 2 | ||||
| -rw-r--r-- | sys/netinet6/ipcomp_output.c | 4 |
4 files changed, 6 insertions, 6 deletions
diff --git a/sys/netinet6/esp_core.c b/sys/netinet6/esp_core.c index 54ca34669618..db09b9405c40 100644 --- a/sys/netinet6/esp_core.c +++ b/sys/netinet6/esp_core.c @@ -219,7 +219,7 @@ esp_schedule(algo, sav) sav->schedlen = (*algo->schedlen)(algo); if (sav->schedlen < 0) return EINVAL; - sav->sched = malloc(sav->schedlen, M_SECA, M_DONTWAIT); + sav->sched = malloc(sav->schedlen, M_SECA, M_NOWAIT); if (!sav->sched) { sav->schedlen = 0; return ENOBUFS; diff --git a/sys/netinet6/ip6_fw.c b/sys/netinet6/ip6_fw.c index da968e2f9e39..c3e6d88d4735 100644 --- a/sys/netinet6/ip6_fw.c +++ b/sys/netinet6/ip6_fw.c @@ -845,8 +845,8 @@ add_entry6(struct ip6_fw_head *chainptr, struct ip6_fw *frwl) u_short nbr = 0; int s; - fwc = malloc(sizeof *fwc, M_IP6FW, M_DONTWAIT); - ftmp = malloc(sizeof *ftmp, M_IP6FW, M_DONTWAIT); + fwc = malloc(sizeof *fwc, M_IP6FW, M_NOWAIT); + ftmp = malloc(sizeof *ftmp, M_IP6FW, M_NOWAIT); if (!fwc || !ftmp) { dprintf(("%s malloc said no\n", err_prefix)); if (fwc) free(fwc, M_IP6FW); diff --git a/sys/netinet6/ip6_input.c b/sys/netinet6/ip6_input.c index 82c103694419..e76727fa1bbd 100644 --- a/sys/netinet6/ip6_input.c +++ b/sys/netinet6/ip6_input.c @@ -1623,7 +1623,7 @@ ip6_addaux(m) if (!tag) { tag = m_tag_get(PACKET_TAG_IPV6_INPUT, sizeof (struct ip6aux), - M_NOWAIT); + M_DONTWAIT); if (tag) m_tag_prepend(m, tag); } diff --git a/sys/netinet6/ipcomp_output.c b/sys/netinet6/ipcomp_output.c index 009b01e02e33..71e5755c986d 100644 --- a/sys/netinet6/ipcomp_output.c +++ b/sys/netinet6/ipcomp_output.c @@ -171,12 +171,12 @@ ipcomp_output(m, nexthdrp, md, isr, af) * compromise two m_copym(). we will be going through every byte of * the payload during compression process anyways. */ - mcopy = m_copym(m, 0, M_COPYALL, M_NOWAIT); + mcopy = m_copym(m, 0, M_COPYALL, M_DONTWAIT); if (mcopy == NULL) { error = ENOBUFS; return 0; } - md0 = m_copym(md, 0, M_COPYALL, M_NOWAIT); + md0 = m_copym(md, 0, M_COPYALL, M_DONTWAIT); if (md0 == NULL) { m_freem(mcopy); error = ENOBUFS; |