diff options
| author | imp <imp@FreeBSD.org> | 2003-02-19 05:47:46 +0000 |
|---|---|---|
| committer | imp <imp@FreeBSD.org> | 2003-02-19 05:47:46 +0000 |
| commit | cf874b345d0f766fb64cf4737e1c85ccc78d2bee (patch) | |
| tree | 9e20e320fe15ae4bf68f8335fcf9d3e71d3b3614 /sys/net/if_ef.c | |
| parent | b72619cecb8265d3efb3781b0acff1380762c173 (diff) | |
| download | FreeBSD-src-cf874b345d0f766fb64cf4737e1c85ccc78d2bee.zip FreeBSD-src-cf874b345d0f766fb64cf4737e1c85ccc78d2bee.tar.gz | |
Back out M_* changes, per decision of the TRB.
Approved by: trb
Diffstat (limited to 'sys/net/if_ef.c')
| -rw-r--r-- | sys/net/if_ef.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/sys/net/if_ef.c b/sys/net/if_ef.c index e7362ae..b064d38 100644 --- a/sys/net/if_ef.c +++ b/sys/net/if_ef.c @@ -430,7 +430,7 @@ ef_output(struct ifnet *ifp, struct mbuf **mp, struct sockaddr *dst, short *tp, type = htons(m->m_pkthdr.len); break; case ETHER_FT_8022: - M_PREPEND(m, ETHER_HDR_LEN + 3, 0); + M_PREPEND(m, ETHER_HDR_LEN + 3, M_TRYWAIT); if (m == NULL) { *mp = NULL; return ENOBUFS; @@ -453,7 +453,7 @@ ef_output(struct ifnet *ifp, struct mbuf **mp, struct sockaddr *dst, short *tp, *hlen += 3; break; case ETHER_FT_SNAP: - M_PREPEND(m, 8, 0); + M_PREPEND(m, 8, M_TRYWAIT); if (m == NULL) { *mp = NULL; return ENOBUFS; @@ -484,14 +484,14 @@ ef_clone(struct ef_link *efl, int ft) int ifnlen; efp = (struct efnet*)malloc(sizeof(struct efnet), M_IFADDR, - M_ZERO); + M_WAITOK | M_ZERO); if (efp == NULL) return ENOMEM; efp->ef_ifp = ifp; eifp = &efp->ef_ac.ac_if; ifnlen = 1 + snprintf(cbuf, sizeof(cbuf), "%s%df", ifp->if_name, ifp->if_unit); - ifname = (char*)malloc(ifnlen, M_IFADDR, 0); + ifname = (char*)malloc(ifnlen, M_IFADDR, M_WAITOK); eifp->if_name = strcpy(ifname, cbuf); eifp->if_unit = ft; eifp->if_softc = efp; @@ -514,7 +514,7 @@ ef_load(void) if (ifp->if_type != IFT_ETHER) continue; EFDEBUG("Found interface %s%d\n", ifp->if_name, ifp->if_unit); efl = (struct ef_link*)malloc(sizeof(struct ef_link), - M_IFADDR, M_ZERO); + M_IFADDR, M_WAITOK | M_ZERO); if (efl == NULL) { error = ENOMEM; break; |
