diff options
| author | alfred <alfred@FreeBSD.org> | 2003-01-21 08:56:16 +0000 |
|---|---|---|
| committer | alfred <alfred@FreeBSD.org> | 2003-01-21 08:56:16 +0000 |
| commit | bf8e8a6e8f0bd9165109f0a258730dd242299815 (patch) | |
| tree | f16a2fb9fa7a7fbc4c19e981d278d5f6eb53234d /sys/net/if_gre.c | |
| parent | 2180deee00350fff613a1d1d1328eddc4c0ba9c8 (diff) | |
| download | FreeBSD-src-bf8e8a6e8f0bd9165109f0a258730dd242299815.zip FreeBSD-src-bf8e8a6e8f0bd9165109f0a258730dd242299815.tar.gz | |
Remove M_TRYWAIT/M_WAITOK/M_WAIT. Callers should use 0.
Merge M_NOWAIT/M_DONTWAIT into a single flag M_NOWAIT.
Diffstat (limited to 'sys/net/if_gre.c')
| -rw-r--r-- | sys/net/if_gre.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/sys/net/if_gre.c b/sys/net/if_gre.c index 6585396..33a4eff 100644 --- a/sys/net/if_gre.c +++ b/sys/net/if_gre.c @@ -160,7 +160,7 @@ gre_clone_create(ifc, unit) { struct gre_softc *sc; - sc = malloc(sizeof(struct gre_softc), M_GRE, M_WAITOK); + sc = malloc(sizeof(struct gre_softc), M_GRE, 0); memset(sc, 0, sizeof(struct gre_softc)); sc->sc_if.if_name = GRENAME; @@ -294,7 +294,7 @@ gre_output(struct ifnet *ifp, struct mbuf *m, struct sockaddr *dst, if ((m->m_data - msiz) < m->m_pktdat) { /* need new mbuf */ - MGETHDR(m0, M_DONTWAIT, MT_HEADER); + MGETHDR(m0, M_NOWAIT, MT_HEADER); if (m0 == NULL) { _IF_DROP(&ifp->if_snd); m_freem(m); @@ -348,7 +348,7 @@ gre_output(struct ifnet *ifp, struct mbuf *m, struct sockaddr *dst, error = EAFNOSUPPORT; goto end; } - M_PREPEND(m, sizeof(struct greip), M_DONTWAIT); + M_PREPEND(m, sizeof(struct greip), M_NOWAIT); } else { _IF_DROP(&ifp->if_snd); m_freem(m); |
