[src/netbsd-1-6]: src/sys/netatalk Pull up revision 1.13 (requested by itojun...

[grant <grant%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/23615c62be22
branches:  netbsd-1-6
changeset: 530372:23615c62be22
user:      grant <grant%NetBSD.org@localhost>
date:      Thu Jun 19 09:36:17 2003 +0000

description:
Pull up revision 1.13 (requested by itojun in ticket #1316):

- don't use M_WAIT within splnet.
- retain m_pkthdr for mbuf passed down to ifp->if_output.
  pointed out by is@netbsd

diffstat:

 sys/netatalk/aarp.c |  14 ++++++++++----
 1 files changed, 10 insertions(+), 4 deletions(-)

diffs (42 lines):

diff -r f624cbcccbae -r 23615c62be22 sys/netatalk/aarp.c
--- a/sys/netatalk/aarp.c       Thu Jun 19 02:40:45 2003 +0000
+++ b/sys/netatalk/aarp.c       Thu Jun 19 09:36:17 2003 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: aarp.c,v 1.8 2001/11/15 09:48:26 lukem Exp $   */
+/*     $NetBSD: aarp.c,v 1.8.10.1 2003/06/19 09:36:17 grant Exp $      */
 
 /*
  * Copyright (c) 1990,1991 Regents of The University of Michigan.
@@ -27,7 +27,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: aarp.c,v 1.8 2001/11/15 09:48:26 lukem Exp $");
+__KERNEL_RCSID(0, "$NetBSD: aarp.c,v 1.8.10.1 2003/06/19 09:36:17 grant Exp $");
 
 #include <sys/param.h>
 #include <sys/socket.h>
@@ -198,7 +198,10 @@
                bcopy(atmulticastaddr, eh->ether_dhost,
                    sizeof(eh->ether_dhost));
                eh->ether_type = 0;     /* if_output will treat as 802 */
-               M_PREPEND(m, sizeof(struct llc), M_WAIT);
+               M_PREPEND(m, sizeof(struct llc), M_DONTWAIT);
+               if (!m)
+                       return;
+
                llc = mtod(m, struct llc *);
                llc->llc_dsap = llc->llc_ssap = LLC_SNAP_LSAP;
                llc->llc_control = LLC_UI;
@@ -591,7 +594,10 @@
                bcopy(atmulticastaddr, eh->ether_dhost,
                    sizeof(eh->ether_dhost));
                eh->ether_type = 0;     /* if_output will treat as 802 */
-               M_PREPEND(m, sizeof(struct llc), M_WAIT);
+               M_PREPEND(m, sizeof(struct llc), M_DONTWAIT);
+               if (!m)
+                       return;
+
                llc = mtod(m, struct llc *);
                llc->llc_dsap = llc->llc_ssap = LLC_SNAP_LSAP;
                llc->llc_control = LLC_UI;