Source-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[src/trunk]: src merge the bouyer-socketcan branch to HEAD.



details:   https://anonhg.NetBSD.org/src/rev/ab97ca44bf77
branches:  trunk
changeset: 824201:ab97ca44bf77
user:      bouyer <bouyer%NetBSD.org@localhost>
date:      Sat May 27 21:02:54 2017 +0000

description:
merge the bouyer-socketcan branch to HEAD.

CAN stands for Controller Area Network, a broadcast network used
in automation and automotive fields. For example, the NMEA2000 standard
developped for marine devices uses a CAN network as the link layer.

This is an implementation of the linux socketcan API:
https://www.kernel.org/doc/Documentation/networking/can.txt
you can also see can(4).

This adds a new socket family (AF_CAN) and protocol (PF_CAN),
as well as the canconfig(8) utility, used to set timing parameter of
CAN hardware. Also inclued is a driver for the CAN controller
found in the allwinner A20 SoC (I tested it with an Olimex lime2 board,
connected with PIC18-based CAN devices).

There is also the canloop(4) pseudo-device, which allows to use
the socketcan API without CAN hardware.

At this time the CANFD part of the linux socketcan API is not implemented.
Error frames are not implemented either. But I could get the cansend and
canreceive utilities from the canutils package to build and run with minimal
changes. tcpudmp(8) can also be used to record frames, which can be
decoded with etherreal.

diffstat:

 distrib/sets/lists/base/mi                    |     4 +-
 distrib/sets/lists/base/shl.mi                |     5 +-
 distrib/sets/lists/comp/mi                    |     6 +-
 distrib/sets/lists/comp/shl.mi                |     3 +-
 distrib/sets/lists/debug/mi                   |     6 +-
 distrib/sets/lists/debug/shl.mi               |     3 +-
 distrib/sets/lists/man/mi                     |    11 +-
 distrib/sets/lists/tests/mi                   |     7 +-
 etc/mtree/NetBSD.dist.base                    |     3 +-
 etc/mtree/NetBSD.dist.tests                   |     4 +-
 lib/libc/sys/socket.2                         |     5 +-
 sbin/Makefile                                 |     7 +-
 sbin/canconfig/Makefile                       |     6 +
 sbin/canconfig/canconfig.8                    |   128 +++
 sbin/canconfig/canconfig.c                    |   583 ++++++++++++++
 share/man/man4/Makefile                       |     4 +-
 share/man/man4/can.4                          |    96 ++
 share/man/man4/canloop.4                      |    53 +
 sys/Makefile                                  |     4 +-
 sys/arch/arm/allwinner/awin_can.c             |   627 +++++++++++++++
 sys/arch/arm/allwinner/awin_io.c              |     3 +-
 sys/arch/arm/allwinner/awin_reg.h             |   118 ++-
 sys/arch/arm/allwinner/files.awin             |     7 +-
 sys/conf/files                                |     4 +-
 sys/kern/uipc_socket.c                        |     5 +-
 sys/net/netisr.h                              |     8 +-
 sys/net/netisr_dispatch.h                     |     5 +-
 sys/netcan/Makefile                           |     8 +
 sys/netcan/can.c                              |  1013 +++++++++++++++++++++++++
 sys/netcan/can.h                              |   128 +++
 sys/netcan/can_link.h                         |    80 +
 sys/netcan/can_pcb.c                          |   380 +++++++++
 sys/netcan/can_pcb.h                          |   113 ++
 sys/netcan/can_proto.c                        |    76 +
 sys/netcan/can_var.h                          |    75 +
 sys/netcan/files.netcan                       |     8 +
 sys/netcan/if_canloop.c                       |   220 +++++
 sys/rump/include/opt/opt_rumpkernel.h         |     4 +-
 sys/rump/include/rump/rumpdefs.h              |     6 +-
 sys/rump/net/Makefile.rumpnetcomp             |     4 +-
 sys/rump/net/lib/libnetcan/Makefile           |    20 +
 sys/rump/net/lib/libnetcan/NETCAN.ioconf      |     7 +
 sys/rump/net/lib/libnetcan/netcan_component.c |    52 +
 sys/sys/mbuf.h                                |     3 +-
 sys/sys/socket.h                              |     6 +-
 tests/net/Makefile                            |     8 +-
 tests/net/can/Makefile                        |    21 +
 tests/net/can/h_canutils.c                    |   200 ++++
 tests/net/can/h_canutils.h                    |    37 +
 tests/net/can/t_can.c                         |   734 ++++++++++++++++++
 tests/net/can/t_canfilter.c                   |   464 +++++++++++
 51 files changed, 5343 insertions(+), 39 deletions(-)

diffs (truncated from 5976 to 300 lines):

diff -r 2434e2bc63e8 -r ab97ca44bf77 distrib/sets/lists/base/mi
--- a/distrib/sets/lists/base/mi        Sat May 27 20:26:44 2017 +0000
+++ b/distrib/sets/lists/base/mi        Sat May 27 21:02:54 2017 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: mi,v 1.1157 2017/05/21 15:28:37 riastradh Exp $
+# $NetBSD: mi,v 1.1158 2017/05/27 21:02:54 bouyer Exp $
 #
 # Note:        Don't delete entries from here - mark them as "obsolete" instead,
 #      unless otherwise stated below.
@@ -456,6 +456,7 @@
 ./sbin/blacklistctl                            base-sysutil-root
 ./sbin/blacklistd                              base-sysutil-root
 ./sbin/brconfig                                        base-netutil-root
+./sbin/canconfig                               base-netutil-root
 ./sbin/ccdconfig                               base-sysutil-root
 ./sbin/cgdconfig                               base-sysutil-root
 ./sbin/chown                                   base-sysutil-root
@@ -1179,6 +1180,7 @@
 ./usr/include/net80211                         base-c-usr
 ./usr/include/netatalk                         base-c-usr
 ./usr/include/netbt                            base-c-usr
+./usr/include/netcan                           base-c-usr
 ./usr/include/netccitt                         base-obsolete           obsolete
 ./usr/include/netinet                          base-c-usr
 ./usr/include/netinet6                         base-c-usr
diff -r 2434e2bc63e8 -r ab97ca44bf77 distrib/sets/lists/base/shl.mi
--- a/distrib/sets/lists/base/shl.mi    Sat May 27 20:26:44 2017 +0000
+++ b/distrib/sets/lists/base/shl.mi    Sat May 27 21:02:54 2017 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: shl.mi,v 1.816 2017/05/21 15:28:37 riastradh Exp $
+# $NetBSD: shl.mi,v 1.817 2017/05/27 21:02:54 bouyer Exp $
 #
 # Note:        Don't delete entries from here - mark them as "obsolete" instead,
 #      unless otherwise stated below.
@@ -718,6 +718,9 @@
 ./usr/lib/librumpnet_netbt.so                  base-rump-shlib         rump
 ./usr/lib/librumpnet_netbt.so.0                        base-rump-shlib         rump
 ./usr/lib/librumpnet_netbt.so.0.0              base-rump-shlib         rump
+./usr/lib/librumpnet_netcan.so                 base-rump-shlib         rump
+./usr/lib/librumpnet_netcan.so.0               base-rump-shlib         rump
+./usr/lib/librumpnet_netcan.so.0.0             base-rump-shlib         rump
 ./usr/lib/librumpnet_netinet.so                        base-rump-shlib         rump
 ./usr/lib/librumpnet_netinet.so.0              base-rump-shlib         rump
 ./usr/lib/librumpnet_netinet.so.0.0            base-rump-shlib         rump
diff -r 2434e2bc63e8 -r ab97ca44bf77 distrib/sets/lists/comp/mi
--- a/distrib/sets/lists/comp/mi        Sat May 27 20:26:44 2017 +0000
+++ b/distrib/sets/lists/comp/mi        Sat May 27 21:02:54 2017 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: mi,v 1.2137 2017/05/21 22:48:25 kamil Exp $
+#      $NetBSD: mi,v 1.2138 2017/05/27 21:02:54 bouyer Exp $
 #
 # Note: don't delete entries from here - mark them as "obsolete" instead.
 ./etc/mtree/set.comp                           comp-sys-root
@@ -2273,6 +2273,8 @@
 ./usr/include/netbt/l2cap.h                    comp-c-include
 ./usr/include/netbt/rfcomm.h                   comp-c-include
 ./usr/include/netbt/sco.h                      comp-c-include
+./usr/include/netcan/can.h                     comp-c-include
+./usr/include/netcan/can_link.h                        comp-c-include
 ./usr/include/netccitt/dll.h                   comp-obsolete           obsolete
 ./usr/include/netccitt/hd_var.h                        comp-obsolete           obsolete
 ./usr/include/netccitt/hdlc.h                  comp-obsolete           obsolete
@@ -3565,6 +3567,8 @@
 ./usr/lib/librumpnet_net_p.a                   comp-c-proflib          rump,profile
 ./usr/lib/librumpnet_netbt.a                   comp-c-lib              rump
 ./usr/lib/librumpnet_netbt_p.a                 comp-c-proflib          rump,profile
+./usr/lib/librumpnet_netcan.a                  comp-c-lib              rump
+./usr/lib/librumpnet_netcan_p.a                        comp-c-proflib          rump,profile
 ./usr/lib/librumpnet_netinet.a                 comp-c-lib              rump
 ./usr/lib/librumpnet_netinet6.a                        comp-c-lib              rump
 ./usr/lib/librumpnet_netinet6_p.a              comp-c-proflib          rump,profile
diff -r 2434e2bc63e8 -r ab97ca44bf77 distrib/sets/lists/comp/shl.mi
--- a/distrib/sets/lists/comp/shl.mi    Sat May 27 20:26:44 2017 +0000
+++ b/distrib/sets/lists/comp/shl.mi    Sat May 27 21:02:54 2017 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: shl.mi,v 1.305 2017/05/21 15:28:37 riastradh Exp $
+# $NetBSD: shl.mi,v 1.306 2017/05/27 21:02:54 bouyer Exp $
 #
 # Note: don't delete entries from here - mark them as "obsolete" instead.
 #
@@ -224,6 +224,7 @@
 ./usr/lib/librumpnet_net80211_pic.a            comp-c-piclib           picinstall,rump
 ./usr/lib/librumpnet_net_pic.a                 comp-c-piclib           picinstall,rump
 ./usr/lib/librumpnet_netbt_pic.a               comp-c-piclib           picinstall,rump
+./usr/lib/librumpnet_netcan_pic.a              comp-c-piclib           picinstall,rump
 ./usr/lib/librumpnet_netinet6_pic.a            comp-c-piclib           picinstall,rump
 ./usr/lib/librumpnet_netinet_pic.a             comp-c-piclib           picinstall,rump
 ./usr/lib/librumpnet_netipsec_pic.a            comp-c-piclib           picinstall,rump
diff -r 2434e2bc63e8 -r ab97ca44bf77 distrib/sets/lists/debug/mi
--- a/distrib/sets/lists/debug/mi       Sat May 27 20:26:44 2017 +0000
+++ b/distrib/sets/lists/debug/mi       Sat May 27 21:02:54 2017 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: mi,v 1.212 2017/05/26 11:16:18 martin Exp $
+# $NetBSD: mi,v 1.213 2017/05/27 21:02:55 bouyer Exp $
 ./etc/mtree/set.debug                           comp-sys-root
 ./usr/lib                                      comp-sys-usr            compatdir
 ./usr/lib/i18n/libBIG5_g.a                     comp-c-debuglib         debuglib,compatfile
@@ -216,6 +216,7 @@
 ./usr/lib/librumpnet_net80211_g.a              comp-c-debuglib         debuglib,rump
 ./usr/lib/librumpnet_net_g.a                   comp-c-debuglib         debuglib,rump
 ./usr/lib/librumpnet_netbt_g.a                 comp-c-debuglib         debuglib,rump
+./usr/lib/librumpnet_netcan_g.a                        comp-c-debuglib         debuglib,rump
 ./usr/lib/librumpnet_netinet6_g.a              comp-c-debuglib         debuglib,rump
 ./usr/lib/librumpnet_netinet_g.a               comp-c-debuglib         debuglib,rump
 ./usr/lib/librumpnet_netipsec_g.a              comp-c-debuglib         debuglib,rump
@@ -308,6 +309,7 @@
 ./usr/libdata/debug/sbin/blacklistctl.debug    comp-sysutil-debug      debug
 ./usr/libdata/debug/sbin/blacklistd.debug      comp-sysutil-debug      debug
 ./usr/libdata/debug/sbin/brconfig.debug                comp-netutil-debug      debug
+./usr/libdata/debug/sbin/canconfig.debug       comp-netutil-debug      debug
 ./usr/libdata/debug/sbin/ccdconfig.debug       comp-sysutil-debug      debug
 ./usr/libdata/debug/sbin/cgdconfig.debug       comp-sysutil-debug      debug
 ./usr/libdata/debug/sbin/chown.debug           comp-sysutil-debug      debug
@@ -2254,6 +2256,8 @@
 ./usr/libdata/debug/usr/tests/net/bpfjit/t_cop.debug           tests-net-debug         debug,atf,sljit,rump
 ./usr/libdata/debug/usr/tests/net/bpfjit/t_extmem.debug                tests-net-debug         debug,atf,sljit,rump
 ./usr/libdata/debug/usr/tests/net/bpfjit/t_mbuf.debug          tests-net-debug         debug,atf,sljit,rump
+./usr/libdata/debug/usr/tests/net/can/t_can.debug              tests-net-debug         debug,atf,rump
+./usr/libdata/debug/usr/tests/net/can/t_canfilter.debug                tests-net-debug         debug,atf,rump
 ./usr/libdata/debug/usr/tests/net/carp/t_basic.debug           tests-net-debug         debug,atf,rump,obsolete
 ./usr/libdata/debug/usr/tests/net/fdpass/fdpass32.debug                tests-net-debug         debug,atf,compattestfile
 ./usr/libdata/debug/usr/tests/net/fdpass/fdpass64.debug                tests-net-debug         debug,atf,compattestfile
diff -r 2434e2bc63e8 -r ab97ca44bf77 distrib/sets/lists/debug/shl.mi
--- a/distrib/sets/lists/debug/shl.mi   Sat May 27 20:26:44 2017 +0000
+++ b/distrib/sets/lists/debug/shl.mi   Sat May 27 21:02:54 2017 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: shl.mi,v 1.175 2017/05/21 15:28:37 riastradh Exp $
+# $NetBSD: shl.mi,v 1.176 2017/05/27 21:02:55 bouyer Exp $
 ./usr/lib/libbfd_g.a                                           comp-c-debuglib debuglib,compatfile,binutils
 ./usr/libdata/debug/lib                                                base-sys-usr    debug,dynamicroot,compatdir
 ./usr/libdata/debug/lib/libblacklist.so.0.0.debug              comp-sys-debug  debug,dynamicroot
@@ -246,6 +246,7 @@
 ./usr/libdata/debug/usr/lib/librumpnet_net.so.0.0.debug                comp-rump-debug debug,rump
 ./usr/libdata/debug/usr/lib/librumpnet_net80211.so.0.0.debug   comp-rump-debug debug,rump
 ./usr/libdata/debug/usr/lib/librumpnet_netbt.so.0.0.debug      comp-rump-debug debug,rump
+./usr/libdata/debug/usr/lib/librumpnet_netcan.so.0.0.debug     comp-rump-debug debug,rump
 ./usr/libdata/debug/usr/lib/librumpnet_netinet.so.0.0.debug    comp-rump-debug debug,rump
 ./usr/libdata/debug/usr/lib/librumpnet_netinet6.so.0.0.debug   comp-rump-debug debug,rump
 ./usr/libdata/debug/usr/lib/librumpnet_netipsec.so.0.0.debug   comp-rump-debug debug,rump
diff -r 2434e2bc63e8 -r ab97ca44bf77 distrib/sets/lists/man/mi
--- a/distrib/sets/lists/man/mi Sat May 27 20:26:44 2017 +0000
+++ b/distrib/sets/lists/man/mi Sat May 27 21:02:54 2017 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: mi,v 1.1556 2017/05/21 15:28:38 riastradh Exp $
+# $NetBSD: mi,v 1.1557 2017/05/27 21:02:55 bouyer Exp $
 #
 # Note: don't delete entries from here - mark them as "obsolete" instead.
 #
@@ -954,6 +954,8 @@
 ./usr/share/man/cat4/bwi.0                     man-sys-catman          .cat
 ./usr/share/man/cat4/ca.0                      man-obsolete            obsolete
 ./usr/share/man/cat4/cac.0                     man-sys-catman          .cat
+./usr/share/man/cat4/can.0                     man-sys-catman          .cat
+./usr/share/man/cat4/canloop.0                 man-sys-catman          .cat
 ./usr/share/man/cat4/cardbus.0                 man-sys-catman          .cat
 ./usr/share/man/cat4/cardslot.0                        man-sys-catman          .cat
 ./usr/share/man/cat4/carp.0                    man-sys-catman          .cat
@@ -2380,6 +2382,7 @@
 ./usr/share/man/cat8/bthcid.0                  man-sysutil-catman      .cat
 ./usr/share/man/cat8/btpand.0                  man-sysutil-catman      .cat
 ./usr/share/man/cat8/btuartd.0                 man-obsolete            obsolete
+./usr/share/man/cat8/canconfig.0               man-netutil-catman      .cat
 ./usr/share/man/cat8/catman.0                  man-man-catman          .cat
 ./usr/share/man/cat8/cats/MAKEDEV.0            man-obsolete            obsolete
 ./usr/share/man/cat8/cats/makedev.0            man-obsolete            obsolete
@@ -4066,6 +4069,8 @@
 ./usr/share/man/html4/btuart.html              man-sys-htmlman         html
 ./usr/share/man/html4/bwi.html                 man-sys-htmlman         html
 ./usr/share/man/html4/cac.html                 man-sys-htmlman         html
+./usr/share/man/html4/can.html                 man-sys-htmlman         html
+./usr/share/man/html4/canloop.html             man-sys-htmlman         html
 ./usr/share/man/html4/cardbus.html             man-sys-htmlman         html
 ./usr/share/man/html4/cardslot.html            man-sys-htmlman         html
 ./usr/share/man/html4/carp.html                        man-sys-htmlman         html
@@ -5358,6 +5363,7 @@
 ./usr/share/man/html8/btdevctl.html            man-sysutil-htmlman     html
 ./usr/share/man/html8/bthcid.html              man-sysutil-htmlman     html
 ./usr/share/man/html8/btpand.html              man-sysutil-htmlman     html
+./usr/share/man/html8/canconfig.html           man-netutil-htmlman     html
 ./usr/share/man/html8/catman.html              man-man-htmlman         html
 ./usr/share/man/html8/ccdconfig.html           man-sysutil-htmlman     html
 ./usr/share/man/html8/cgdconfig.html           man-sysutil-htmlman     html
@@ -6950,6 +6956,8 @@
 ./usr/share/man/man4/bwi.4                     man-sys-man             .man
 ./usr/share/man/man4/ca.4                      man-obsolete            obsolete
 ./usr/share/man/man4/cac.4                     man-sys-man             .man
+./usr/share/man/man4/can.4                     man-sys-man             .man
+./usr/share/man/man4/canloop.4                 man-sys-man             .man
 ./usr/share/man/man4/cardbus.4                 man-sys-man             .man
 ./usr/share/man/man4/cardslot.4                        man-sys-man             .man
 ./usr/share/man/man4/carp.4                    man-sys-man             .man
@@ -8375,6 +8383,7 @@
 ./usr/share/man/man8/bthcid.8                  man-sysutil-man         .man
 ./usr/share/man/man8/btpand.8                  man-sysutil-man         .man
 ./usr/share/man/man8/btuartd.8                 man-obsolete            obsolete
+./usr/share/man/man8/canconfig.8               man-netutil-man         .man
 ./usr/share/man/man8/catman.8                  man-man-man             .man
 ./usr/share/man/man8/cats/MAKEDEV.8            man-obsolete            obsolete
 ./usr/share/man/man8/cats/makedev.8            man-obsolete            obsolete
diff -r 2434e2bc63e8 -r ab97ca44bf77 distrib/sets/lists/tests/mi
--- a/distrib/sets/lists/tests/mi       Sat May 27 20:26:44 2017 +0000
+++ b/distrib/sets/lists/tests/mi       Sat May 27 21:02:54 2017 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: mi,v 1.748 2017/05/26 09:02:33 martin Exp $
+# $NetBSD: mi,v 1.749 2017/05/27 21:02:55 bouyer Exp $
 #
 # Note: don't delete entries from here - mark them as "obsolete" instead.
 #
@@ -155,6 +155,7 @@
 ./usr/libdata/debug/usr/tests/net/bpf                                  tests-net-debug         compattestfile,atf
 ./usr/libdata/debug/usr/tests/net/bpfilter                             tests-net-debug         compattestfile,atf
 ./usr/libdata/debug/usr/tests/net/bpfjit                               tests-net-debug         compattestfile,atf
+./usr/libdata/debug/usr/tests/net/can                                  tests-net-debug         compattestfile,atf
 ./usr/libdata/debug/usr/tests/net/carp                                 tests-net-debug         compattestfile,atf
 ./usr/libdata/debug/usr/tests/net/fdpass                               tests-net-debug         compattestfile,atf
 ./usr/libdata/debug/usr/tests/net/icmp                                 tests-net-debug         compattestfile,atf
@@ -3232,6 +3233,10 @@
 ./usr/tests/net/bpfjit/t_cop                   tests-net-tests         atf,rump,sljit
 ./usr/tests/net/bpfjit/t_extmem                        tests-net-tests         atf,rump,sljit
 ./usr/tests/net/bpfjit/t_mbuf                  tests-net-tests         atf,rump,sljit
+./usr/tests/net/can                            tests-net-tests         compattestfile,atf
+./usr/tests/net/can/Atffile                    tests-net-tests         atf,rump
+./usr/tests/net/can/t_can                      tests-net-tests         atf,rump
+./usr/tests/net/can/t_canfilter                        tests-net-tests         atf,rump
 ./usr/tests/net/carp                           tests-net-tests         compattestfile,atf
 ./usr/tests/net/carp/Atffile                   tests-net-tests         atf,rump
 ./usr/tests/net/carp/Kyuafile                  tests-net-tests         atf,rump,kyua
diff -r 2434e2bc63e8 -r ab97ca44bf77 etc/mtree/NetBSD.dist.base
--- a/etc/mtree/NetBSD.dist.base        Sat May 27 20:26:44 2017 +0000
+++ b/etc/mtree/NetBSD.dist.base        Sat May 27 21:02:54 2017 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: NetBSD.dist.base,v 1.159 2017/04/10 16:38:40 christos Exp $
+#      $NetBSD: NetBSD.dist.base,v 1.160 2017/05/27 21:02:55 bouyer Exp $
 #      @(#)4.4BSD.dist 8.1 (Berkeley) 6/13/93
 
 # Do not customize this file as it may be overwritten on upgrades.
@@ -209,6 +209,7 @@
 ./usr/include/net/agr
 ./usr/include/netatalk
 ./usr/include/netbt
+./usr/include/netcan
 ./usr/include/netinet
 ./usr/include/net80211
 ./usr/include/netinet6
diff -r 2434e2bc63e8 -r ab97ca44bf77 etc/mtree/NetBSD.dist.tests
--- a/etc/mtree/NetBSD.dist.tests       Sat May 27 20:26:44 2017 +0000
+++ b/etc/mtree/NetBSD.dist.tests       Sat May 27 21:02:54 2017 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: NetBSD.dist.tests,v 1.146 2017/05/14 00:07:07 kamil Exp $
+#      $NetBSD: NetBSD.dist.tests,v 1.147 2017/05/27 21:02:55 bouyer Exp $
 
 ./usr/libdata/debug/usr/tests
 ./usr/libdata/debug/usr/tests/atf
@@ -136,6 +136,7 @@
 ./usr/libdata/debug/usr/tests/net/bpf
 ./usr/libdata/debug/usr/tests/net/bpfilter
 ./usr/libdata/debug/usr/tests/net/bpfjit
+./usr/libdata/debug/usr/tests/net/can
 ./usr/libdata/debug/usr/tests/net/carp
 ./usr/libdata/debug/usr/tests/net/fdpass
 ./usr/libdata/debug/usr/tests/net/icmp
@@ -325,6 +326,7 @@
 ./usr/tests/net/bpf
 ./usr/tests/net/bpfilter
 ./usr/tests/net/bpfjit
+./usr/tests/net/can
 ./usr/tests/net/carp
 ./usr/tests/net/fdpass
 ./usr/tests/net/icmp
diff -r 2434e2bc63e8 -r ab97ca44bf77 lib/libc/sys/socket.2
--- a/lib/libc/sys/socket.2     Sat May 27 20:26:44 2017 +0000
+++ b/lib/libc/sys/socket.2     Sat May 27 21:02:54 2017 +0000
@@ -1,4 +1,4 @@
-.\"    $NetBSD: socket.2,v 1.41 2013/03/01 18:25:16 joerg Exp $
+.\"    $NetBSD: socket.2,v 1.42 2017/05/27 21:02:55 bouyer Exp $
 .\"
 .\" Copyright (c) 1983, 1991, 1993
 .\"    The Regents of the University of California.  All rights reserved.
@@ -29,7 +29,7 @@
 .\"
 .\"     @(#)socket.2   8.1 (Berkeley) 6/4/93
 .\"
-.Dd February 5, 2013
+.Dd April 27, 2017
 .Dt SOCKET 2
 .Os
 .Sh NAME
@@ -61,6 +61,7 @@
 PF_NS          Xerox Network Systems protocols
 PF_APPLETALK   AppleTalk protocols
 PF_BLUETOOTH   Bluetooth protocols
+PF_CAN         CAN bus protocols
 .Ed
 .Pp
 The socket has the indicated
diff -r 2434e2bc63e8 -r ab97ca44bf77 sbin/Makefile
--- a/sbin/Makefile     Sat May 27 20:26:44 2017 +0000
+++ b/sbin/Makefile     Sat May 27 21:02:54 2017 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile,v 1.129 2016/07/01 22:50:50 christos Exp $



Home | Main Index | Thread Index | Old Index