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/netipsec/keysock.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/netipsec/keysock.c')
-rw-r--r-- | sys/netipsec/keysock.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/sys/netipsec/keysock.c b/sys/netipsec/keysock.c index 143b600bb4f7..475befaf10b1 100644 --- a/sys/netipsec/keysock.c +++ b/sys/netipsec/keysock.c @@ -143,7 +143,7 @@ key_sendup0(rp, m, promisc) if (promisc) { struct sadb_msg *pmsg; - M_PREPEND(m, sizeof(struct sadb_msg), M_DONTWAIT); + M_PREPEND(m, sizeof(struct sadb_msg), M_NOWAIT); if (m && m->m_len < sizeof(struct sadb_msg)) m = m_pullup(m, sizeof(struct sadb_msg)); if (!m) { @@ -214,14 +214,14 @@ key_sendup(so, msg, len, target) m = mprev = NULL; while (tlen > 0) { if (tlen == len) { - MGETHDR(n, M_DONTWAIT, MT_DATA); + MGETHDR(n, M_NOWAIT, MT_DATA); if (n == NULL) { V_pfkeystat.in_nomem++; return ENOBUFS; } n->m_len = MHLEN; } else { - MGET(n, M_DONTWAIT, MT_DATA); + MGET(n, M_NOWAIT, MT_DATA); if (n == NULL) { V_pfkeystat.in_nomem++; return ENOBUFS; @@ -229,7 +229,7 @@ key_sendup(so, msg, len, target) n->m_len = MLEN; } if (tlen >= MCLBYTES) { /*XXX better threshold? */ - MCLGET(n, M_DONTWAIT); + MCLGET(n, M_NOWAIT); if ((n->m_flags & M_EXT) == 0) { m_free(n); m_freem(m); |