[src/trunk]: src/sys/net sync with libcap-1.9.1

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

details:   https://anonhg.NetBSD.org/src/rev/59311e249e81
branches:  trunk
changeset: 459911:59311e249e81
user:      christos <christos%NetBSD.org@localhost>
date:      Tue Oct 01 16:02:55 2019 +0000

description:
sync with libcap-1.9.1

diffstat:

 sys/net/dlt.h |  63 ++++++++++++++++++++++++++++++++++++++++++++--------------
 1 files changed, 48 insertions(+), 15 deletions(-)

diffs (107 lines):

diff -r e4741bc4fc60 -r 59311e249e81 sys/net/dlt.h
--- a/sys/net/dlt.h     Tue Oct 01 16:02:11 2019 +0000
+++ b/sys/net/dlt.h     Tue Oct 01 16:02:55 2019 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: dlt.h,v 1.19 2018/09/03 14:58:04 christos Exp $        */
+/*     $NetBSD: dlt.h,v 1.20 2019/10/01 16:02:55 christos Exp $        */
 
 /*-
  * Copyright (c) 1990, 1991, 1992, 1993, 1994, 1995, 1996, 1997
@@ -252,7 +252,7 @@
  */
 
 /*
- * This is for Linux cooked sockets.
+ * Linux cooked sockets.
  */
 #define DLT_LINUX_SLL  113
 
@@ -775,11 +775,20 @@
 #define DLT_RAIF1              198
 
 /*
- * IPMB packet for IPMI, beginning with the I2C slave address, followed
- * by the netFn and LUN, etc..  Requested by Chanthy Toeung
- * <chanthy.toeung%ca.kontron.com@localhost>.
+ * IPMB packet for IPMI, beginning with a 2-byte header, followed by
+ * the I2C slave address, followed by the netFn and LUN, etc..
+ * Requested by Chanthy Toeung <chanthy.toeung%ca.kontron.com@localhost>.
+ *
+ * XXX - this used to be called DLT_IPMB, back when we got the
+ * impression from the email thread requesting it that the packet
+ * had no extra 2-byte header.  We've renamed it; if anybody used
+ * DLT_IPMB and assumed no 2-byte header, this will cause the compile
+ * to fail, at which point we'll have to figure out what to do about
+ * the two header types using the same DLT_/LINKTYPE_ value.  If that
+ * doesn't happen, we'll assume nobody used it and that the redefinition
+ * is safe.
  */
-#define DLT_IPMB               199
+#define DLT_IPMB_KONTRON       199
 
 /*
  * Juniper-private data link type, as per request from
@@ -811,15 +820,34 @@
 #define DLT_LAPD               203
 
 /*
- * Variants of various link-layer headers, with a one-byte direction
- * pseudo-header prepended - zero means "received by this host",
- * non-zero (any non-zero value) means "sent by this host" - as per
- * Will Barker <w.barker%zen.co.uk@localhost>.
+ * PPP, with a one-byte direction pseudo-header prepended - zero means
+ * "received by this host", non-zero (any non-zero value) means "sent by
+ * this host" - as per Will Barker <w.barker%zen.co.uk@localhost>.
+ */
+#define DLT_PPP_WITH_DIR       204     /* Don't confuse with DLT_PPP_WITH_DIRECTION */
+
+/*
+ * Cisco HDLC, with a one-byte direction pseudo-header prepended - zero
+ * means "received by this host", non-zero (any non-zero value) means
+ * "sent by this host" - as per Will Barker <w.barker%zen.co.uk@localhost>.
  */
-#define DLT_PPP_WITH_DIR       204     /* PPP - don't confuse with DLT_PPP_WITH_DIRECTION */
-#define DLT_C_HDLC_WITH_DIR    205     /* Cisco HDLC */
-#define DLT_FRELAY_WITH_DIR    206     /* Frame Relay */
-#define DLT_LAPB_WITH_DIR      207     /* LAPB */
+#define DLT_C_HDLC_WITH_DIR    205
+
+/*
+ * Frame Relay, with a one-byte direction pseudo-header prepended - zero
+ * means "received by this host" (DCE -> DTE), non-zero (any non-zero
+ * value) means "sent by this host" (DTE -> DCE) - as per Will Barker
+ * <w.barker%zen.co.uk@localhost>.
+ */
+#define DLT_FRELAY_WITH_DIR    206
+
+/*
+ * LAPB, with a one-byte direction pseudo-header prepended - zero means
+ * "received by this host" (DCE -> DTE), non-zero (any non-zero value)
+ * means "sent by this host" (DTE -> DCE)- as per Will Barker
+ * <w.barker%zen.co.uk@localhost>.
+ */
+#define DLT_LAPB_WITH_DIR      207
 
 /*
  * 208 is reserved for an as-yet-unspecified proprietary link-layer
@@ -1374,6 +1402,11 @@
 #define DLT_DISPLAYPORT_AUX    275
 
 /*
+ * Linux cooked sockets v2.
+ */
+#define DLT_LINUX_SLL2 276
+
+/*
  * In case the code that includes this file (directly or indirectly)
  * has also included OS files that happen to define DLT_MATCHING_MAX,
  * with a different value (perhaps because that OS hasn't picked up
@@ -1383,7 +1416,7 @@
 #ifdef DLT_MATCHING_MAX
 #undef DLT_MATCHING_MAX
 #endif
-#define DLT_MATCHING_MAX       275     /* highest value in the "matching" range */
+#define DLT_MATCHING_MAX       276     /* highest value in the "matching" range */
 
 /*
  * DLT and savefile link type values are split into a class and