diff options
author | Gleb Smirnoff <glebius@FreeBSD.org> | 2012-12-05 08:04:20 +0000 |
---|---|---|
committer | Gleb Smirnoff <glebius@FreeBSD.org> | 2012-12-05 08:04:20 +0000 |
commit | eb1b1807afd1266445720b768b1bdbcdf7655a0a (patch) | |
tree | bf083a0829f8044362fc83354c8e8b60d1f7932a /sys/netinet/ip_options.c | |
parent | 6dbda21756f4e6634972b1a9405c49fe0605de6d (diff) | |
download | src-eb1b1807afd1266445720b768b1bdbcdf7655a0a.tar.gz src-eb1b1807afd1266445720b768b1bdbcdf7655a0a.zip |
Mechanically substitute flags from historic mbuf allocator with
malloc(9) flags within sys.
Exceptions:
- sys/contrib not touched
- sys/mbuf.h edited manually
Notes
Notes:
svn path=/head/; revision=243882
Diffstat (limited to 'sys/netinet/ip_options.c')
-rw-r--r-- | sys/netinet/ip_options.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sys/netinet/ip_options.c b/sys/netinet/ip_options.c index df320271cc77..239c69974f7e 100644 --- a/sys/netinet/ip_options.c +++ b/sys/netinet/ip_options.c @@ -411,7 +411,7 @@ ip_srcroute(struct mbuf *m0) if (opts->ip_nhops == 0) return (NULL); - m = m_get(M_DONTWAIT, MT_DATA); + m = m_get(M_NOWAIT, MT_DATA); if (m == NULL) return (NULL); @@ -495,7 +495,7 @@ ip_insertoptions(struct mbuf *m, struct mbuf *opt, int *phlen) if (p->ipopt_dst.s_addr) ip->ip_dst = p->ipopt_dst; if (m->m_flags & M_EXT || m->m_data - optlen < m->m_pktdat) { - MGETHDR(n, M_DONTWAIT, MT_DATA); + MGETHDR(n, M_NOWAIT, MT_DATA); if (n == NULL) { *phlen = 0; return (m); |