NetBSD 960317 merge

2 files changed, 21 insertions, 4 deletions

diff --git a/sys/netccitt/pk_extern.h b/sys/netccitt/pk_extern.h
index 3bea62343b3..42c13c6260e 100644
--- a/sys/netccitt/pk_extern.h
+++ b/sys/netccitt/pk_extern.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: pk_extern.h,v 1.1 1996/03/04 07:36:40 niklas Exp $	*/
+/*	$OpenBSD: pk_extern.h,v 1.2 1996/04/19 16:10:07 niklas Exp $	*/
 /*	$NetBSD: pk_extern.h,v 1.1 1996/02/13 22:05:17 christos Exp $	*/
 
 /*
@@ -64,7 +64,7 @@ void pk_call_accepted __P((struct pklcd *, struct mbuf *));
 void pk_parse_facilities __P((octet *, struct sockaddr_x25 *));
 
 /* pk_llcsubr.c */
-int cons_rtrequest __P((int, struct rtentry *, struct sockaddr *));
+void cons_rtrequest __P((int, struct rtentry *, struct sockaddr *));
 struct rtentry *npaidb_enter __P((struct sockaddr_dl *, struct sockaddr *,
 				  struct rtentry *, struct llc_linkcb *));
 struct rtentry *npaidb_enrich __P((short, caddr_t, struct sockaddr_dl *));
diff --git a/sys/netccitt/pk_llcsubr.c b/sys/netccitt/pk_llcsubr.c
index 3725de98737..8ff6bdb9cf8 100644
--- a/sys/netccitt/pk_llcsubr.c
+++ b/sys/netccitt/pk_llcsubr.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: pk_llcsubr.c,v 1.2 1996/03/04 07:36:42 niklas Exp $	*/
+/*	$OpenBSD: pk_llcsubr.c,v 1.3 1996/04/19 16:10:09 niklas Exp $	*/
 /*	$NetBSD: pk_llcsubr.c,v 1.4 1996/02/13 22:05:26 christos Exp $	*/
 
 /* 
@@ -126,8 +126,25 @@
 #define XIFA(rt) ((struct x25_ifaddr *)((rt)->rt_ifa))
 #define SA(s) ((struct sockaddr *)s)
 
-int
+static int cons_rtrequest_internal __P((int, struct rtentry *,
+    struct sockaddr *));
+
+/* 
+ * ifa_rtrequest currently does not check the error from the rtrequest call
+ * so we use a void version of the cons_rtrequest routine.
+ */
+void
 cons_rtrequest(cmd, rt, dst)
+        int             cmd;
+        struct rtentry *rt;
+        struct sockaddr *dst;
+{
+        cons_rtrequest_internal(cmd, rt, dst);
+}
+
+
+static int
+cons_rtrequest_internal(cmd, rt, dst)
 	int             cmd;
 	struct rtentry *rt;
 	struct sockaddr *dst;