linux: update headers from current kernel master

diff --git a/src/basic/linux/README b/src/basic/linux/README
index f849f34951281300e64c49974cc54c350e9e805c..2bb70fdaadb812a6ea231ab8b9428f7708722983 100644 (file)
--- a/src/basic/linux/README
+++ b/src/basic/linux/README
@@ -1,3 +1,6 @@
-The files in this directory are copied from kernel-5.0, and the following modifications are applied:
+The files in this directory are copied from current kernel master
+(b06ed1e7a2fa9b636f368a9e97c3c8877623f8b2) or WireGuard master
+(8416093498ac2c754536dad4757c5d86c9ba8809), and the following
+modifications are applied:
 - btrfs.h: drop '__user' attributes
 - if.h: drop '#include <linux/compiler.h>' and '__user' attributes

diff --git a/src/basic/linux/btrfs.h b/src/basic/linux/btrfs.h
index f477008fef0876827c0fa35670bf6e2cc49b527f..b960b45d674290fdb32a2ce6ff0a46afcad973d0 100644 (file)
--- a/src/basic/linux/btrfs.h
+++ b/src/basic/linux/btrfs.h
@@ -135,7 +135,7 @@ struct btrfs_scrub_progress {
        __u64 tree_bytes_scrubbed;      /* # of tree bytes scrubbed */
        __u64 read_errors;              /* # of read errors encountered (EIO) */
        __u64 csum_errors;              /* # of failed csum checks */
-       __u64 verify_errors;            /* # of occurrences, where the metadata
+       __u64 verify_errors;            /* # of occurences, where the metadata
                                         * of a tree block did not match the
                                         * expected values, like generation or
                                         * logical */
@@ -155,7 +155,7 @@ struct btrfs_scrub_progress {
        __u64 last_physical;            /* last physical address scrubbed. In
                                         * case a scrub was aborted, this can
                                         * be used to restart the scrub */
-       __u64 unverified_errors;        /* # of occurrences where a read for a
+       __u64 unverified_errors;        /* # of occurences where a read for a
                                         * full (64k) bio failed, but the re-
                                         * check succeeded for each 4k piece.
                                         * Intermittent error. */
@@ -837,6 +837,8 @@ enum btrfs_err_code {
                                   struct btrfs_ioctl_vol_args)
 #define BTRFS_IOC_SCAN_DEV _IOW(BTRFS_IOCTL_MAGIC, 4, \
                                   struct btrfs_ioctl_vol_args)
+#define BTRFS_IOC_FORGET_DEV _IOW(BTRFS_IOCTL_MAGIC, 5, \
+                                  struct btrfs_ioctl_vol_args)
 /* trans start and trans end are dangerous, and only for
  * use by applications that know how to avoid the
  * resulting deadlocks

diff --git a/src/basic/linux/btrfs_tree.h b/src/basic/linux/btrfs_tree.h
index 0d933ba3a12ef3206b764785fb18af3ce7cfb038..421239b98db2c79e9a9e3fe57c5013716af43603 100644 (file)
--- a/src/basic/linux/btrfs_tree.h
+++ b/src/basic/linux/btrfs_tree.h
@@ -54,7 +54,7 @@
 /* for storing balance parameters in the root tree */
 #define BTRFS_BALANCE_OBJECTID -4ULL
 
-/* orphan objectid for tracking unlinked/truncated files */
+/* orhpan objectid for tracking unlinked/truncated files */
 #define BTRFS_ORPHAN_OBJECTID -5ULL
 
 /* does write ahead logging to speed up fsyncs */
@@ -270,7 +270,7 @@
 #define BTRFS_PERSISTENT_ITEM_KEY      249
 
 /*
- * Persistently stores the device replace state in the device tree.
+ * Persistantly stores the device replace state in the device tree.
  * The key is built like this: (0, BTRFS_DEV_REPLACE_KEY, 0).
  */
 #define BTRFS_DEV_REPLACE_KEY  250
@@ -307,6 +307,8 @@
  *
  * Used by:
  * struct btrfs_dir_item.type
+ *
+ * Values 0..7 must match common file type values in fs_types.h.
  */
 #define BTRFS_FT_UNKNOWN       0
 #define BTRFS_FT_REG_FILE      1

diff --git a/src/basic/linux/fou.h b/src/basic/linux/fou.h
index f2ea833a2812561d7b10517a39e695589e8b236b..87c2c9f0880304e20202350ea164b9293e085d50 100644 (file)
--- a/src/basic/linux/fou.h
+++ b/src/basic/linux/fou.h
@@ -16,6 +16,12 @@ enum {
        FOU_ATTR_IPPROTO,                       /* u8 */
        FOU_ATTR_TYPE,                          /* u8 */
        FOU_ATTR_REMCSUM_NOPARTIAL,             /* flag */
+       FOU_ATTR_LOCAL_V4,                      /* u32 */
+       FOU_ATTR_LOCAL_V6,                      /* in6_addr */
+       FOU_ATTR_PEER_V4,                       /* u32 */
+       FOU_ATTR_PEER_V6,                       /* in6_addr */
+       FOU_ATTR_PEER_PORT,                     /* u16 */
+       FOU_ATTR_IFINDEX,                       /* s32 */
 
        __FOU_ATTR_MAX,
 };

diff --git a/src/basic/linux/if.h b/src/basic/linux/if.h
index cbabdde8f9da5163391c53d59c4ef67c16f42727..4c6f030afc14e71048aa73da2b6f99c9388d6d47 100644 (file)
--- a/src/basic/linux/if.h
+++ b/src/basic/linux/if.h
@@ -179,7 +179,7 @@ enum {
 };
 
 /*
- *     Device mapping structure. I'd just gone off and designed a
+ *     Device mapping structure. I'd just gone off and designed a 
  *     beautiful scheme using only loadable modules with arguments
  *     for driver options and along come the PCMCIA people 8)
  *
@@ -193,7 +193,7 @@ enum {
 struct ifmap {
        unsigned long mem_start;
        unsigned long mem_end;
-       unsigned short base_addr;
+       unsigned short base_addr; 
        unsigned char irq;
        unsigned char dma;
        unsigned char port;
@@ -233,7 +233,7 @@ struct ifreq {
        {
                char    ifrn_name[IFNAMSIZ];            /* if name, e.g. "en0" */
        } ifr_ifrn;
-
+       
        union {
                struct  sockaddr ifru_addr;
                struct  sockaddr ifru_dstaddr;

diff --git a/src/basic/linux/if_bonding.h b/src/basic/linux/if_bonding.h
index 61a1bf6e865e8b41aa1f5bd8ce188f513f58e143..790585f0e61b5b252a03bd558694dc4c8921246b 100644 (file)
--- a/src/basic/linux/if_bonding.h
+++ b/src/basic/linux/if_bonding.h
@@ -117,6 +117,30 @@ struct ad_info {
        __u8 partner_system[ETH_ALEN];
 };
 
+/* Embedded inside LINK_XSTATS_TYPE_BOND */
+enum {
+       BOND_XSTATS_UNSPEC,
+       BOND_XSTATS_3AD,
+       __BOND_XSTATS_MAX
+};
+#define BOND_XSTATS_MAX (__BOND_XSTATS_MAX - 1)
+
+/* Embedded inside BOND_XSTATS_3AD */
+enum {
+       BOND_3AD_STAT_LACPDU_RX,
+       BOND_3AD_STAT_LACPDU_TX,
+       BOND_3AD_STAT_LACPDU_UNKNOWN_RX,
+       BOND_3AD_STAT_LACPDU_ILLEGAL_RX,
+       BOND_3AD_STAT_MARKER_RX,
+       BOND_3AD_STAT_MARKER_TX,
+       BOND_3AD_STAT_MARKER_RESP_RX,
+       BOND_3AD_STAT_MARKER_RESP_TX,
+       BOND_3AD_STAT_MARKER_UNKNOWN_RX,
+       BOND_3AD_STAT_PAD,
+       __BOND_3AD_STAT_MAX
+};
+#define BOND_3AD_STAT_MAX (__BOND_3AD_STAT_MAX - 1)
+
 #endif /* _LINUX_IF_BONDING_H */
 
 /*

diff --git a/src/basic/linux/if_ether.h b/src/basic/linux/if_ether.h
index 3a45b4ad71a3083a16085d69e2891e31dddcdaa8..3158ba672b72ba24b97a5e7f341389c629202c11 100644 (file)
--- a/src/basic/linux/if_ether.h
+++ b/src/basic/linux/if_ether.h
@@ -109,6 +109,7 @@
 #define ETH_P_QINQ2    0x9200          /* deprecated QinQ VLAN [ NOT AN OFFICIALLY REGISTERED ID ] */
 #define ETH_P_QINQ3    0x9300          /* deprecated QinQ VLAN [ NOT AN OFFICIALLY REGISTERED ID ] */
 #define ETH_P_EDSA     0xDADA          /* Ethertype DSA [ NOT AN OFFICIALLY REGISTERED ID ] */
+#define ETH_P_DSA_8021Q        0xDADB          /* Fake VLAN Header for DSA [ NOT AN OFFICIALLY REGISTERED ID ] */
 #define ETH_P_IFE      0xED3E          /* ForCES inter-FE LFB type */
 #define ETH_P_AF_IUCV   0xFBFB         /* IBM af_iucv [ NOT AN OFFICIALLY REGISTERED ID ] */
 

diff --git a/src/basic/linux/if_link.h b/src/basic/linux/if_link.h
index d6533828123a6728958d2127ab81c2b5fa30f07f..5b225ff63b483145878e977cf0a1be7d1fe53cd9 100644 (file)
--- a/src/basic/linux/if_link.h
+++ b/src/basic/linux/if_link.h
@@ -925,6 +925,7 @@ enum {
 enum {
        LINK_XSTATS_TYPE_UNSPEC,
        LINK_XSTATS_TYPE_BRIDGE,
+       LINK_XSTATS_TYPE_BOND,
        __LINK_XSTATS_TYPE_MAX
 };
 #define LINK_XSTATS_TYPE_MAX (__LINK_XSTATS_TYPE_MAX - 1)

diff --git a/src/basic/linux/if_tun.h b/src/basic/linux/if_tun.h
index 23a6753b37df3a0a241c2986aa932301bef02b1f..454ae31b93c7a4b4aeedddf7ceb5274377b39a58 100644 (file)
--- a/src/basic/linux/if_tun.h
+++ b/src/basic/linux/if_tun.h
@@ -60,6 +60,7 @@
 #define TUNSETSTEERINGEBPF _IOR('T', 224, int)
 #define TUNSETFILTEREBPF _IOR('T', 225, int)
 #define TUNSETCARRIER _IOW('T', 226, int)
+#define TUNGETDEVNETNS _IO('T', 227)
 
 /* TUNSETIFF ifr flags */
 #define IFF_TUN                0x0001

diff --git a/src/basic/linux/in.h b/src/basic/linux/in.h
index a55cb8b10165abcf8a07d8228b590bbc1d8a0c08..e7ad9d350a283d81e89696e1bc42438030accc90 100644 (file)
--- a/src/basic/linux/in.h
+++ b/src/basic/linux/in.h
@@ -292,10 +292,11 @@ struct sockaddr_in {
 #define        IN_LOOPBACK(a)          ((((long int) (a)) & 0xff000000) == 0x7f000000)
 
 /* Defines for Multicast INADDR */
-#define INADDR_UNSPEC_GROUP    0xe0000000U     /* 224.0.0.0   */
-#define INADDR_ALLHOSTS_GROUP  0xe0000001U     /* 224.0.0.1   */
-#define INADDR_ALLRTRS_GROUP    0xe0000002U    /* 224.0.0.2 */
-#define INADDR_MAX_LOCAL_GROUP  0xe00000ffU    /* 224.0.0.255 */
+#define INADDR_UNSPEC_GROUP            0xe0000000U     /* 224.0.0.0   */
+#define INADDR_ALLHOSTS_GROUP          0xe0000001U     /* 224.0.0.1   */
+#define INADDR_ALLRTRS_GROUP           0xe0000002U     /* 224.0.0.2 */
+#define INADDR_ALLSNOOPERS_GROUP       0xe000006aU     /* 224.0.0.106 */
+#define INADDR_MAX_LOCAL_GROUP         0xe00000ffU     /* 224.0.0.255 */
 #endif
 
 /* <asm/byteorder.h> contains the htonl type stuff.. */

diff --git a/src/basic/linux/in6.h b/src/basic/linux/in6.h
index 9fa75591c5662d5b84d08d35dbe595bc052062b5..9f2273a0835642b243a7c10903ac24b79ecb9f99 100644 (file)
--- a/src/basic/linux/in6.h
+++ b/src/basic/linux/in6.h
@@ -178,13 +178,14 @@ struct in6_flowlabel_req {
 #define IPV6_JOIN_ANYCAST      27
 #define IPV6_LEAVE_ANYCAST     28
 #define IPV6_MULTICAST_ALL     29
+#define IPV6_ROUTER_ALERT_ISOLATE      30
 
 /* IPV6_MTU_DISCOVER values */
 #define IPV6_PMTUDISC_DONT             0
 #define IPV6_PMTUDISC_WANT             1
 #define IPV6_PMTUDISC_DO               2
 #define IPV6_PMTUDISC_PROBE            3
-/* same as IPV6_PMTUDISC_PROBE, provided for symmetry with IPv4
+/* same as IPV6_PMTUDISC_PROBE, provided for symetry with IPv4
  * also see comments on IP_PMTUDISC_INTERFACE
  */
 #define IPV6_PMTUDISC_INTERFACE                4

diff --git a/src/basic/linux/update.sh b/src/basic/linux/update.sh
new file mode 100755 (executable)
index 0000000..b232070
--- /dev/null
+++ b/src/basic/linux/update.sh
@@ -0,0 +1,13 @@
+#!/bin/bash
+
+set -eu
+
+for i in *.h */*.h; do
+    if [[ $i == 'wireguard.h' ]]; then
+        curl https://raw.githubusercontent.com/WireGuard/WireGuard/master/src/uapi/$i -o $i
+    else
+        curl https://raw.githubusercontent.com/torvalds/linux/master/include/uapi/linux/$i -o $i
+    fi
+
+    sed -i -e 's/__user //g' -e '/^#include <linux\/compiler.h>/ d' $i
+done