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/netatalk | |
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/netatalk')
-rw-r--r-- | sys/netatalk/aarp.c | 10 | ||||
-rw-r--r-- | sys/netatalk/at_control.c | 2 | ||||
-rw-r--r-- | sys/netatalk/ddp_output.c | 4 | ||||
-rw-r--r-- | sys/netatalk/ddp_pcb.c | 2 | ||||
-rw-r--r-- | sys/netatalk/ddp_usrreq.c | 2 |
5 files changed, 10 insertions, 10 deletions
diff --git a/sys/netatalk/aarp.c b/sys/netatalk/aarp.c index b89dfdc..a22488a 100644 --- a/sys/netatalk/aarp.c +++ b/sys/netatalk/aarp.c @@ -127,7 +127,7 @@ aarpwhohas( struct arpcom *ac, struct sockaddr_at *sat ) struct llc *llc; struct sockaddr sa; - if (( m = m_gethdr( M_NOWAIT, MT_DATA )) == NULL ) { + if (( m = m_gethdr( M_DONTWAIT, MT_DATA )) == NULL ) { return; } #ifdef MAC @@ -166,7 +166,7 @@ aarpwhohas( struct arpcom *ac, struct sockaddr_at *sat ) bcopy((caddr_t)atmulticastaddr, (caddr_t)eh->ether_dhost, sizeof( eh->ether_dhost )); eh->ether_type = htons(sizeof(struct llc) + sizeof(struct ether_aarp)); - M_PREPEND( m, sizeof( struct llc ), 0 ); + M_PREPEND( m, sizeof( struct llc ), M_TRYWAIT ); llc = mtod( m, struct llc *); llc->llc_dsap = llc->llc_ssap = LLC_SNAP_LSAP; llc->llc_control = LLC_UI; @@ -440,7 +440,7 @@ at_aarpinput( struct arpcom *ac, struct mbuf *m) if ( aa->aa_flags & AFA_PHASE2 ) { eh->ether_type = htons( sizeof( struct llc ) + sizeof( struct ether_aarp )); - M_PREPEND( m, sizeof( struct llc ), M_NOWAIT ); + M_PREPEND( m, sizeof( struct llc ), M_DONTWAIT ); if ( m == NULL ) { return; } @@ -551,7 +551,7 @@ aarpprobe( void *arg ) aa->aa_ch = timeout( aarpprobe, (caddr_t)ac, hz / 5 ); } - if (( m = m_gethdr( M_NOWAIT, MT_DATA )) == NULL ) { + if (( m = m_gethdr( M_DONTWAIT, MT_DATA )) == NULL ) { return; } #ifdef MAC @@ -579,7 +579,7 @@ aarpprobe( void *arg ) sizeof( eh->ether_dhost )); eh->ether_type = htons( sizeof( struct llc ) + sizeof( struct ether_aarp )); - M_PREPEND( m, sizeof( struct llc ), 0 ); + M_PREPEND( m, sizeof( struct llc ), M_TRYWAIT ); llc = mtod( m, struct llc *); llc->llc_dsap = llc->llc_ssap = LLC_SNAP_LSAP; llc->llc_control = LLC_UI; diff --git a/sys/netatalk/at_control.c b/sys/netatalk/at_control.c index 8f90911..d7e7586 100644 --- a/sys/netatalk/at_control.c +++ b/sys/netatalk/at_control.c @@ -138,7 +138,7 @@ at_control(struct socket *so, u_long cmd, caddr_t data, * allocate a fresh one. */ if ( aa == (struct at_ifaddr *) 0 ) { - aa0 = malloc(sizeof(struct at_ifaddr), M_IFADDR, M_ZERO); + aa0 = malloc(sizeof(struct at_ifaddr), M_IFADDR, M_WAITOK | M_ZERO); if (( aa = at_ifaddr ) != NULL ) { /* * Don't let the loopback be first, since the first diff --git a/sys/netatalk/ddp_output.c b/sys/netatalk/ddp_output.c index e3fb384..f15914b 100644 --- a/sys/netatalk/ddp_output.c +++ b/sys/netatalk/ddp_output.c @@ -55,7 +55,7 @@ ddp_output( struct mbuf *m, struct socket *so) mac_create_mbuf_from_socket(so, m); #endif - M_PREPEND( m, sizeof( struct ddpehdr ), 0 ); + M_PREPEND( m, sizeof( struct ddpehdr ), M_TRYWAIT ); deh = mtod( m, struct ddpehdr *); deh->deh_pad = 0; @@ -196,7 +196,7 @@ ddp_route( struct mbuf *m, struct route *ro) * packets end up poorly aligned due to the three byte elap header. */ if ( !(aa->aa_flags & AFA_PHASE2) ) { - MGET( m0, 0, MT_HEADER ); + MGET( m0, M_TRYWAIT, MT_HEADER ); if ( m0 == 0 ) { m_freem( m ); printf("ddp_route: no buffers\n"); diff --git a/sys/netatalk/ddp_pcb.c b/sys/netatalk/ddp_pcb.c index 0bd2e6d..fa79cec 100644 --- a/sys/netatalk/ddp_pcb.c +++ b/sys/netatalk/ddp_pcb.c @@ -420,7 +420,7 @@ at_pcballoc( struct socket *so ) { struct ddpcb *ddp; - MALLOC(ddp, struct ddpcb *, sizeof *ddp, M_PCB, M_ZERO); + MALLOC(ddp, struct ddpcb *, sizeof *ddp, M_PCB, M_WAITOK | M_ZERO); ddp->ddp_lsat.sat_port = ATADDR_ANYPORT; ddp->ddp_next = ddpcb; diff --git a/sys/netatalk/ddp_usrreq.c b/sys/netatalk/ddp_usrreq.c index 0bd2e6d..fa79cec 100644 --- a/sys/netatalk/ddp_usrreq.c +++ b/sys/netatalk/ddp_usrreq.c @@ -420,7 +420,7 @@ at_pcballoc( struct socket *so ) { struct ddpcb *ddp; - MALLOC(ddp, struct ddpcb *, sizeof *ddp, M_PCB, M_ZERO); + MALLOC(ddp, struct ddpcb *, sizeof *ddp, M_PCB, M_WAITOK | M_ZERO); ddp->ddp_lsat.sat_port = ATADDR_ANYPORT; ddp->ddp_next = ddpcb; |