[src/netbsd-1-4]: src/sys/net Pull up revision 1.51:

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

details:   https://anonhg.NetBSD.org/src/rev/ff1308c445f5
branches:  netbsd-1-4
changeset: 469280:ff1308c445f5
user:      he <he%NetBSD.org@localhost>
date:      Tue Aug 24 19:19:30 1999 +0000

description:
Pull up revision 1.51:
  Fix a problem in ifa_ifwithnet() for netatalk, making atalkd
  work in more configurations.  (bouyer)

diffstat:

 sys/net/if.c |  18 +++++++++++++++++-
 1 files changed, 17 insertions(+), 1 deletions(-)

diffs (46 lines):

diff -r 51b0c95d61dd -r ff1308c445f5 sys/net/if.c
--- a/sys/net/if.c      Mon Aug 23 08:58:32 1999 +0000
+++ b/sys/net/if.c      Tue Aug 24 19:19:30 1999 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: if.c,v 1.48 1998/12/10 15:10:48 christos Exp $ */
+/*     $NetBSD: if.c,v 1.48.2.1 1999/08/24 19:19:30 he Exp $   */
 
 /*
  * Copyright (c) 1980, 1986, 1993
@@ -38,6 +38,7 @@
 #include "opt_compat_linux.h"
 #include "opt_compat_svr4.h"
 #include "opt_compat_43.h"
+#include "opt_atalk.h"
 
 #include <sys/param.h>
 #include <sys/mbuf.h>
@@ -53,6 +54,10 @@
 #include <net/if_dl.h>
 #include <net/if_types.h>
 #include <net/radix.h>
+#ifdef NETATALK
+#include <netatalk/at_extern.h>
+#include <netatalk/at.h>
+#endif
 
 int    ifqmaxlen = IFQ_MAXLEN;
 void   if_slowtimo __P((void *arg));
@@ -204,6 +209,17 @@
            if (sdl->sdl_index && sdl->sdl_index <= if_index)
                return (ifnet_addrs[sdl->sdl_index - 1]);
        }
+#ifdef NETATALK
+       if (af == AF_APPLETALK) {
+               for (ifp = ifnet.tqh_first; ifp != 0;
+                   ifp = ifp->if_list.tqe_next) {
+                       ifa = at_ifawithnet((struct sockaddr_at *)addr, ifp);
+                       if (ifa)
+                               return ifa;
+               }
+               return NULL;
+       }
+#endif
        for (ifp = ifnet.tqh_first; ifp != 0; ifp = ifp->if_list.tqe_next)
                for (ifa = ifp->if_addrlist.tqh_first; ifa != 0; ifa = ifa->ifa_list.tqe_next) {
                        register char *cp, *cp2, *cp3;