History

Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next

Resolve conflict between d2912cb15bdd ("treewide: Replace GPLv2 boilerplate/reference with SPDX - rule 500") removing the GPL disclaimer and fe03d4745675 ("Update my email address") which updates Jozsef Kadlecsik's email.

Pablo Neira Ayuso committed 7 years ago

Commit 1c5ba672 parents dbb5281 045df3717761 files · +51310 −133671Browse files

Showing the changes to include/uapi/linux (12 of 17761 files). Show all

Unified · Split

12 files
  1. include/uapi/linux/Kbuild +1 −0
  2. include/uapi/linux/bpf.h +10 −2
  3. include/uapi/linux/fuse.h +6 −1
  4. include/uapi/linux/if_link.h +5 −0
  5. include/uapi/linux/mii.h +2 −0
  6. include/uapi/linux/nl80211.h +24 −0
  7. include/uapi/linux/pkt_cls.h +1 −1
  8. include/uapi/linux/psp-sev.h +1 −4
  9. include/uapi/linux/snmp.h +1 −0
  10. include/uapi/linux/tc_act/tc_ctinfo.h +0 −5
  11. include/uapi/linux/tcp.h +3 −0
  12. include/uapi/linux/wmi.h +1 −4
include/uapi/linux/Kbuild+1−0
@@ -1,3 +1,4 @@
1+# SPDX-License-Identifier: GPL-2.0
12 ifeq ($(wildcard $(srctree)/arch/$(SRCARCH)/include/uapi/asm/a.out.h),)
23 no-export-headers += a.out.h
34 endif
include/uapi/linux/bpf.h+10−2
@@ -192,6 +192,8 @@ enum bpf_attach_type { · 191 unmodified lines
192192 BPF_LIRC_MODE2,
193193 BPF_FLOW_DISSECTOR,
194194 BPF_CGROUP_SYSCTL,
195+ BPF_CGROUP_UDP4_RECVMSG,
196+ BPF_CGROUP_UDP6_RECVMSG,
195197 __MAX_BPF_ATTACH_TYPE
196198 };
197199
@@ -3083,6 +3085,10 @@ struct bpf_sock_tuple { · 2885 unmodified lines
30833085 };
30843086 };
30853087
3088+struct bpf_xdp_sock {
3089+ __u32 queue_id;
3090+};
3091+
30863092 #define XDP_PACKET_HEADROOM 256
30873093
30883094 /* User return codes for XDP prog type.
@@ -3243,6 +3249,7 @@ struct bpf_sock_addr { · 154 unmodified lines
32433249 __u32 msg_src_ip6[4]; /* Allows 1,2,4-byte read an 4-byte write.
32443250 * Stored in network byte order.
32453251 */
3252+ __bpf_md_ptr(struct bpf_sock *, sk);
32463253 };
32473254
32483255 /* User bpf_sock_ops struct to access socket values and specify request ops
@@ -3294,6 +3301,7 @@ struct bpf_sock_ops { · 45 unmodified lines
32943301 __u32 sk_txhash;
32953302 __u64 bytes_received;
32963303 __u64 bytes_acked;
3304+ __bpf_md_ptr(struct bpf_sock *, sk);
32973305 };
32983306
32993307 /* Definitions for bpf_sock_ops_cb_flags */
@@ -3409,8 +3417,8 @@ struct bpf_raw_tracepoint_args { · 109 unmodified lines
34093417 /* DIRECT: Skip the FIB rules and go to FIB table associated with device
34103418 * OUTPUT: Do lookup from egress perspective; default is ingress
34113419 */
3412−#define BPF_FIB_LOOKUP_DIRECT BIT(0)
3413−#define BPF_FIB_LOOKUP_OUTPUT BIT(1)
3420+#define BPF_FIB_LOOKUP_DIRECT (1U << 0)
3421+#define BPF_FIB_LOOKUP_OUTPUT (1U << 1)
34143422
34153423 enum {
34163424 BPF_FIB_LKUP_RET_SUCCESS, /* lookup successful */
include/uapi/linux/fuse.h+6−1
@@ -130,6 +130,9 @@ · 129 unmodified lines
130130 * 7.30
131131 * - add FUSE_EXPLICIT_INVAL_DATA
132132 * - add FUSE_IOCTL_COMPAT_X32
133+ *
134+ * 7.31
135+ * - add FUSE_WRITE_KILL_PRIV flag
133136 */
134137
135138 #ifndef _LINUX_FUSE_H
@@ -165,7 +168,7 @@ · 29 unmodified lines
165168 #define FUSE_KERNEL_VERSION 7
166169
167170 /** Minor version number of this interface */
168−#define FUSE_KERNEL_MINOR_VERSION 30
171+#define FUSE_KERNEL_MINOR_VERSION 31
169172
170173 /** The node ID of the root inode */
171174 #define FUSE_ROOT_ID 1
@@ -327,9 +330,11 @@ struct fuse_file_lock { · 155 unmodified lines
327330 *
328331 * FUSE_WRITE_CACHE: delayed write from page cache, file handle is guessed
329332 * FUSE_WRITE_LOCKOWNER: lock_owner field is valid
333+ * FUSE_WRITE_KILL_PRIV: kill suid and sgid bits
330334 */
331335 #define FUSE_WRITE_CACHE (1 << 0)
332336 #define FUSE_WRITE_LOCKOWNER (1 << 1)
337+#define FUSE_WRITE_KILL_PRIV (1 << 2)
333338
334339 /**
335340 * Read flags
include/uapi/linux/if_link.h+5−0
@@ -694,6 +694,7 @@ enum { · 693 unmodified lines
694694 IFLA_VF_IB_NODE_GUID, /* VF Infiniband node GUID */
695695 IFLA_VF_IB_PORT_GUID, /* VF Infiniband port GUID */
696696 IFLA_VF_VLAN_LIST, /* nested list of vlans, option for QinQ */
697+ IFLA_VF_BROADCAST, /* VF broadcast */
697698 __IFLA_VF_MAX,
698699 };
699700
@@ -704,6 +705,10 @@ struct ifla_vf_mac { · 4 unmodified lines
704705 __u8 mac[32]; /* MAX_ADDR_LEN */
705706 };
706707
708+struct ifla_vf_broadcast {
709+ __u8 broadcast[32];
710+};
711+
707712 struct ifla_vf_vlan {
708713 __u32 vf;
709714 __u32 vlan; /* 0 - 4095, 0 disables VLAN filter */
include/uapi/linux/mii.h+2−0
@@ -121,6 +121,8 @@ · 120 unmodified lines
121121 #define EXPANSION_MFAULTS 0x0010 /* Multiple faults detected */
122122 #define EXPANSION_RESV 0xffe0 /* Unused... */
123123
124+#define ESTATUS_1000_XFULL 0x8000 /* Can do 1000BaseX Full */
125+#define ESTATUS_1000_XHALF 0x4000 /* Can do 1000BaseX Half */
124126 #define ESTATUS_1000_TFULL 0x2000 /* Can do 1000BT Full */
125127 #define ESTATUS_1000_THALF 0x1000 /* Can do 1000BT Half */
126128
include/uapi/linux/nl80211.h+24−0
@@ -234,6 +234,15 @@ · 233 unmodified lines
234234 * use in a FILS shared key connection with PMKSA caching.
235235 */
236236
237+/**
238+ * DOC: SAE authentication offload
239+ *
240+ * By setting @NL80211_EXT_FEATURE_SAE_OFFLOAD flag drivers can indicate they
241+ * support offloading SAE authentication for WPA3-Personal networks. In
242+ * %NL80211_CMD_CONNECT the password for SAE should be specified using
243+ * %NL80211_ATTR_SAE_PASSWORD.
244+ */
245+
237246 /**
238247 * enum nl80211_commands - supported nl80211 commands
239248 *
@@ -2341,6 +2350,12 @@ enum nl80211_commands { · 2101 unmodified lines
23412350 * should be picking up the lowest tx power, either tx power per-interface
23422351 * or per-station.
23432352 *
2353+ * @NL80211_ATTR_SAE_PASSWORD: attribute for passing SAE password material. It
2354+ * is used with %NL80211_CMD_CONNECT to provide password for offloading
2355+ * SAE authentication for WPA3-Personal networks.
2356+ *
2357+ * @NL80211_ATTR_TWT_RESPONDER: Enable target wait time responder support.
2358+ *
23442359 * @NUM_NL80211_ATTR: total number of nl80211_attrs available
23452360 * @NL80211_ATTR_MAX: highest attribute number currently defined
23462361 * @__NL80211_ATTR_AFTER_LAST: internal use
@@ -2794,6 +2809,10 @@ enum nl80211_attrs { · 447 unmodified lines
27942809 NL80211_ATTR_STA_TX_POWER_SETTING,
27952810 NL80211_ATTR_STA_TX_POWER,
27962811
2812+ NL80211_ATTR_SAE_PASSWORD,
2813+
2814+ NL80211_ATTR_TWT_RESPONDER,
2815+
27972816 /* add attributes here, update the policy in nl80211.c */
27982817
27992818 __NL80211_ATTR_AFTER_LAST,
@@ -4406,6 +4425,7 @@ enum nl80211_mfp { · 1606 unmodified lines
44064425 enum nl80211_wpa_versions {
44074426 NL80211_WPA_VERSION_1 = 1 << 0,
44084427 NL80211_WPA_VERSION_2 = 1 << 1,
4428+ NL80211_WPA_VERSION_3 = 1 << 2,
44094429 };
44104430
44114431 /**
@@ -5422,6 +5442,9 @@ enum nl80211_feature_flags { · 1010 unmodified lines
54225442 * @NL80211_EXT_FEATURE_STA_TX_PWR: This driver supports controlling tx power
54235443 * to a station.
54245444 *
5445+ * @NL80211_EXT_FEATURE_SAE_OFFLOAD: Device wants to do SAE authentication in
5446+ * station mode (SAE password is passed as part of the connect command).
5447+ *
54255448 * @NUM_NL80211_EXT_FEATURES: number of extended features.
54265449 * @MAX_NL80211_EXT_FEATURES: highest extended feature index.
54275450 */
@@ -5466,6 +5489,7 @@ enum nl80211_ext_feature_index { · 38 unmodified lines
54665489 NL80211_EXT_FEATURE_SCHED_SCAN_BAND_SPECIFIC_RSSI_THOLD,
54675490 NL80211_EXT_FEATURE_EXT_KEY_ID,
54685491 NL80211_EXT_FEATURE_STA_TX_PWR,
5492+ NL80211_EXT_FEATURE_SAE_OFFLOAD,
54695493
54705494 /* add new features before the definition below */
54715495 NUM_NL80211_EXT_FEATURES,
include/uapi/linux/pkt_cls.h+1−1
@@ -295,7 +295,7 @@ enum { · 294 unmodified lines
295295 TCA_FW_UNSPEC,
296296 TCA_FW_CLASSID,
297297 TCA_FW_POLICE,
298− TCA_FW_INDEV, /* used by CONFIG_NET_CLS_IND */
298+ TCA_FW_INDEV,
299299 TCA_FW_ACT, /* used by CONFIG_NET_CLS_ACT */
300300 TCA_FW_MASK,
301301 __TCA_FW_MAX
include/uapi/linux/psp-sev.h+1−4
@@ -1,3 +1,4 @@
1+/* SPDX-License-Identifier: GPL-2.0-only */
12 /*
23 * Userspace interface for AMD Secure Encrypted Virtualization (SEV)
34 * platform management commands.
@@ -7,10 +8,6 @@ · 3 unmodified lines
78 * Author: Brijesh Singh <brijesh.singh@amd.com>
89 *
910 * SEV API specification is available at: https://developer.amd.com/sev/
10− *
11− * This program is free software; you can redistribute it and/or modify
12− * it under the terms of the GNU General Public License version 2 as
13− * published by the Free Software Foundation.
1411 */
1512
1613 #ifndef __PSP_SEV_USER_H__
include/uapi/linux/snmp.h+1−0
@@ -283,6 +283,7 @@ enum · 282 unmodified lines
283283 LINUX_MIB_TCPACKCOMPRESSED, /* TCPAckCompressed */
284284 LINUX_MIB_TCPZEROWINDOWDROP, /* TCPZeroWindowDrop */
285285 LINUX_MIB_TCPRCVQDROP, /* TCPRcvQDrop */
286+ LINUX_MIB_TCPWQUEUETOOBIG, /* TCPWqueueTooBig */
286287 LINUX_MIB_TCPFASTOPENPASSIVEALTKEY, /* TCPFastOpenPassiveAltKey */
287288 __LINUX_MIB_MAX
288289 };
include/uapi/linux/tc_act/tc_ctinfo.h+0−5
@@ -26,9 +26,4 @@ enum { · 25 unmodified lines
2626
2727 #define TCA_CTINFO_MAX (__TCA_CTINFO_MAX - 1)
2828
29−enum {
30− CTINFO_MODE_DSCP = BIT(0),
31− CTINFO_MODE_CPMARK = BIT(1)
32−};
33−
3429 #endif
include/uapi/linux/tcp.h+3−0
@@ -127,6 +127,9 @@ enum { · 126 unmodified lines
127127
128128 #define TCP_CM_INQ TCP_INQ
129129
130+#define TCP_TX_DELAY 37 /* delay outgoing packets by XX usec */
131+
132+
130133 #define TCP_REPAIR_ON 1
131134 #define TCP_REPAIR_OFF 0
132135 #define TCP_REPAIR_OFF_NO_WP -1 /* Turn off without window probes */
include/uapi/linux/wmi.h+1−4
@@ -1,11 +1,8 @@
1+/* SPDX-License-Identifier: GPL-2.0-only */
12 /*
23 * User API methods for ACPI-WMI mapping driver
34 *
45 * Copyright (C) 2017 Dell, Inc.
5− *
6− * This program is free software; you can redistribute it and/or modify
7− * it under the terms of the GNU General Public License version 2 as
8− * published by the Free Software Foundation.
96 */
107 #ifndef _UAPI_LINUX_WMI_H
118 #define _UAPI_LINUX_WMI_H