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_gif.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_gif.c')
-rw-r--r-- | sys/net/if_gif.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/sys/net/if_gif.c b/sys/net/if_gif.c index 1cb4463..fce294d 100644 --- a/sys/net/if_gif.c +++ b/sys/net/if_gif.c @@ -137,7 +137,7 @@ gif_clone_create(ifc, unit) { struct gif_softc *sc; - sc = malloc (sizeof(struct gif_softc), M_GIF, M_WAITOK); + sc = malloc (sizeof(struct gif_softc), M_GIF, 0); bzero(sc, sizeof(struct gif_softc)); sc->gif_if.if_softc = sc; @@ -777,12 +777,12 @@ gif_set_tunnel(ifp, src, dst) } osrc = sc->gif_psrc; - sa = (struct sockaddr *)malloc(src->sa_len, M_IFADDR, M_WAITOK); + sa = (struct sockaddr *)malloc(src->sa_len, M_IFADDR, 0); bcopy((caddr_t)src, (caddr_t)sa, src->sa_len); sc->gif_psrc = sa; odst = sc->gif_pdst; - sa = (struct sockaddr *)malloc(dst->sa_len, M_IFADDR, M_WAITOK); + sa = (struct sockaddr *)malloc(dst->sa_len, M_IFADDR, 0); bcopy((caddr_t)dst, (caddr_t)sa, dst->sa_len); sc->gif_pdst = sa; |