Module Name: src
Committed By: bouyer
Date: Tue May 30 13:30:51 UTC 2017
Modified Files:
src/sys/netcan: can.h can_pcb.c
Log Message:
Needs <sys/types.h> not <machine/int_types.h>
To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 src/sys/netcan/can.h src/sys/netcan/can_pcb.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/netcan/can.h
diff -u src/sys/netcan/can.h:1.2 src/sys/netcan/can.h:1.3
--- src/sys/netcan/can.h:1.2 Sat May 27 21:02:56 2017
+++ src/sys/netcan/can.h Tue May 30 13:30:51 2017
@@ -1,4 +1,4 @@
-/* $NetBSD: can.h,v 1.2 2017/05/27 21:02:56 bouyer Exp $ */
+/* $NetBSD: can.h,v 1.3 2017/05/30 13:30:51 bouyer Exp $ */
/*-
* Copyright (c) 2003, 2017 The NetBSD Foundation, Inc.
@@ -33,7 +33,7 @@
#define _NETCAN_CAN_H
#include <sys/featuretest.h>
-#include <machine/int_types.h>
+#include <sys/types.h>
/* Definitions compatible (as much as possible) with socketCAN */
Index: src/sys/netcan/can_pcb.c
diff -u src/sys/netcan/can_pcb.c:1.2 src/sys/netcan/can_pcb.c:1.3
--- src/sys/netcan/can_pcb.c:1.2 Sat May 27 21:02:56 2017
+++ src/sys/netcan/can_pcb.c Tue May 30 13:30:51 2017
@@ -1,4 +1,4 @@
-/* $NetBSD: can_pcb.c,v 1.2 2017/05/27 21:02:56 bouyer Exp $ */
+/* $NetBSD: can_pcb.c,v 1.3 2017/05/30 13:30:51 bouyer Exp $ */
/*-
* Copyright (c) 2003, 2017 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: can_pcb.c,v 1.2 2017/05/27 21:02:56 bouyer Exp $");
+__KERNEL_RCSID(0, "$NetBSD: can_pcb.c,v 1.3 2017/05/30 13:30:51 bouyer Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -223,7 +223,10 @@ can_setsockaddr(struct canpcb *canp, str
memset(scan, 0, sizeof (*scan));
scan->can_family = AF_CAN;
scan->can_len = sizeof(*scan);
- scan->can_ifindex = canp->canp_ifp->if_index;
+ if (canp->canp_ifp)
+ scan->can_ifindex = canp->canp_ifp->if_index;
+ else
+ scan->can_ifindex = 0;
mutex_exit(&canp->canp_mtx);
}
