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/net/if_iso88025subr.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/net/if_iso88025subr.c')
| -rw-r--r-- | sys/net/if_iso88025subr.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/sys/net/if_iso88025subr.c b/sys/net/if_iso88025subr.c index 91d67fdd5323..7f9e8bd10ae0 100644 --- a/sys/net/if_iso88025subr.c +++ b/sys/net/if_iso88025subr.c @@ -338,7 +338,7 @@ iso88025_output(ifp, m, dst, ro) bcopy((caddr_t)&(satoipx_addr(dst).x_host), (caddr_t)edst, ISO88025_ADDR_LEN); - M_PREPEND(m, 3, M_WAIT); + M_PREPEND(m, 3, M_WAITOK); m = m_pullup(m, 3); if (m == 0) senderr(ENOBUFS); @@ -382,7 +382,7 @@ iso88025_output(ifp, m, dst, ro) */ if (snap_type != 0) { struct llc *l; - M_PREPEND(m, LLC_SNAPFRAMELEN, M_DONTWAIT); + M_PREPEND(m, LLC_SNAPFRAMELEN, M_NOWAIT); if (m == 0) senderr(ENOBUFS); l = mtod(m, struct llc *); @@ -398,7 +398,7 @@ iso88025_output(ifp, m, dst, ro) * Add local net header. If no space in first mbuf, * allocate another. */ - M_PREPEND(m, ISO88025_HDR_LEN + rif_len, M_DONTWAIT); + M_PREPEND(m, ISO88025_HDR_LEN + rif_len, M_NOWAIT); if (m == 0) senderr(ENOBUFS); th = mtod(m, struct iso88025_header *); |