diff options
| author |   itojun <itojun@openbsd.org> | 2003-06-06 09:47:21 +0000 |
|---|---|---|
| committer | itojun <itojun@openbsd.org> | 2003-06-06 09:47:21 +0000 |
| commit | 3d29f4a590c2325486c29e9f54b7aefe3ec05641 (patch) | |
| tree | 6643f7ac9bf650876c0d64e942cc305ecba375c5 | |
| parent | don't use M_WAIT in network stack. use M_PREPEND to keep m_pkthdr. (diff) | |
| download | wireguard-openbsd-3d29f4a590c2325486c29e9f54b7aefe3ec05641.tar.xz wireguard-openbsd-3d29f4a590c2325486c29e9f54b7aefe3ec05641.zip | |
avoid M_WAIT in network stack; netbsd revision 1.13
| -rw-r--r-- | sys/netatalk/aarp.c | 12 |
1 files changed, 9 insertions, 3 deletions
diff --git a/sys/netatalk/aarp.c b/sys/netatalk/aarp.c index 0e180775227..9d110728124 100644 --- a/sys/netatalk/aarp.c +++ b/sys/netatalk/aarp.c @@ -1,4 +1,4 @@ -/* $OpenBSD: aarp.c,v 1.4 2002/03/14 01:27:10 millert Exp $ */ +/* $OpenBSD: aarp.c,v 1.5 2003/06/06 09:47:21 itojun Exp $ */ /* * Copyright (c) 1990,1991 Regents of The University of Michigan. @@ -233,7 +233,10 @@ aarpwhohas( ac, sat ) bcopy((caddr_t)atmulticastaddr, (caddr_t)eh->ether_dhost, sizeof( eh->ether_dhost )); eh->ether_type = htons(AT_LLC_SIZE + sizeof(struct ether_aarp)); - M_PREPEND( m, AT_LLC_SIZE, M_WAIT ); + M_PREPEND( m, AT_LLC_SIZE, M_DONTWAIT ); + if (!m) + return; + llc = mtod( m, struct llc *); llc->llc_dsap = llc->llc_ssap = LLC_SNAP_LSAP; llc->llc_control = LLC_UI; @@ -660,7 +663,10 @@ aarpprobe( arg ) sizeof( eh->ether_dhost )); eh->ether_type = htons( AT_LLC_SIZE + sizeof( struct ether_aarp )); - M_PREPEND( m, AT_LLC_SIZE, M_WAIT ); + M_PREPEND( m, AT_LLC_SIZE, M_DONTWAIT ); + if (!m) + return; + llc = mtod( m, struct llc *); llc->llc_dsap = llc->llc_ssap = LLC_SNAP_LSAP; llc->llc_control = LLC_UI; |