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/netgraph/ng_pptpgre.c | |
parent | 9dbbb2829e57340aef670a1b9b522a4db9c01e3a (diff) | |
download | src-86fea6be59ad2f1fb3bb539eb35ae7bf9ce276c0.tar.gz src-86fea6be59ad2f1fb3bb539eb35ae7bf9ce276c0.zip |
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++)
Notes
Notes:
svn path=/head/; revision=108107
Diffstat (limited to 'sys/netgraph/ng_pptpgre.c')
-rw-r--r-- | sys/netgraph/ng_pptpgre.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sys/netgraph/ng_pptpgre.c b/sys/netgraph/ng_pptpgre.c index f87e415171e1..50811da57bee 100644 --- a/sys/netgraph/ng_pptpgre.c +++ b/sys/netgraph/ng_pptpgre.c @@ -532,7 +532,7 @@ ng_pptpgre_xmit(node_p node, item_p item) m->m_len = m->m_pkthdr.len = grelen; m->m_pkthdr.rcvif = NULL; } else { - M_PREPEND(m, grelen, M_NOWAIT); + M_PREPEND(m, grelen, M_DONTWAIT); if (m == NULL || (m->m_len < grelen && (m = m_pullup(m, grelen)) == NULL)) { priv->stats.memoryFailures++; |