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
1ifeq ($(wildcard $(srctree)/arch/$(SRCARCH)/include/uapi/asm/a.out.h),)2ifeq ($(wildcard $(srctree)/arch/$(SRCARCH)/include/uapi/asm/a.out.h),)
2no-export-headers += a.out.h3no-export-headers += a.out.h
3endif4endif
include/uapi/linux/bpf.h+10−2
@@ -192,6 +192,8 @@ enum bpf_attach_type { · 191 unmodified lines
192 BPF_LIRC_MODE2,192 BPF_LIRC_MODE2,
193 BPF_FLOW_DISSECTOR,193 BPF_FLOW_DISSECTOR,
194 BPF_CGROUP_SYSCTL,194 BPF_CGROUP_SYSCTL,
195 BPF_CGROUP_UDP4_RECVMSG,
196 BPF_CGROUP_UDP6_RECVMSG,
195 __MAX_BPF_ATTACH_TYPE197 __MAX_BPF_ATTACH_TYPE
196};198};
197 199
@@ -3083,6 +3085,10 @@ struct bpf_sock_tuple { · 2885 unmodified lines
3083 };3085 };
3084};3086};
3085 3087
3088struct bpf_xdp_sock {
3089 __u32 queue_id;
3090};
3091
3086#define XDP_PACKET_HEADROOM 2563092#define XDP_PACKET_HEADROOM 256
3087 3093
3088/* User return codes for XDP prog type.3094/* User return codes for XDP prog type.
@@ -3243,6 +3249,7 @@ struct bpf_sock_addr { · 154 unmodified lines
3243 __u32 msg_src_ip6[4]; /* Allows 1,2,4-byte read an 4-byte write.3249 __u32 msg_src_ip6[4]; /* Allows 1,2,4-byte read an 4-byte write.
3244 * Stored in network byte order.3250 * Stored in network byte order.
3245 */3251 */
3252 __bpf_md_ptr(struct bpf_sock *, sk);
3246};3253};
3247 3254
3248/* User bpf_sock_ops struct to access socket values and specify request ops3255/* User bpf_sock_ops struct to access socket values and specify request ops
@@ -3294,6 +3301,7 @@ struct bpf_sock_ops { · 45 unmodified lines
3294 __u32 sk_txhash;3301 __u32 sk_txhash;
3295 __u64 bytes_received;3302 __u64 bytes_received;
3296 __u64 bytes_acked;3303 __u64 bytes_acked;
3304 __bpf_md_ptr(struct bpf_sock *, sk);
3297};3305};
3298 3306
3299/* Definitions for bpf_sock_ops_cb_flags */3307/* Definitions for bpf_sock_ops_cb_flags */
@@ -3409,8 +3417,8 @@ struct bpf_raw_tracepoint_args { · 109 unmodified lines
3409/* DIRECT: Skip the FIB rules and go to FIB table associated with device3417/* DIRECT: Skip the FIB rules and go to FIB table associated with device
3410 * OUTPUT: Do lookup from egress perspective; default is ingress3418 * OUTPUT: Do lookup from egress perspective; default is ingress
3411 */3419 */
3412#define BPF_FIB_LOOKUP_DIRECT BIT(0)3420#define BPF_FIB_LOOKUP_DIRECT (1U << 0)
3413#define BPF_FIB_LOOKUP_OUTPUT BIT(1)3421#define BPF_FIB_LOOKUP_OUTPUT (1U << 1)
3414 3422
3415enum {3423enum {
3416 BPF_FIB_LKUP_RET_SUCCESS, /* lookup successful */3424 BPF_FIB_LKUP_RET_SUCCESS, /* lookup successful */
include/uapi/linux/fuse.h+6−1
@@ -130,6 +130,9 @@ · 129 unmodified lines
130 * 7.30130 * 7.30
131 * - add FUSE_EXPLICIT_INVAL_DATA131 * - add FUSE_EXPLICIT_INVAL_DATA
132 * - add FUSE_IOCTL_COMPAT_X32132 * - add FUSE_IOCTL_COMPAT_X32
133 *
134 * 7.31
135 * - add FUSE_WRITE_KILL_PRIV flag
133 */136 */
134 137
135#ifndef _LINUX_FUSE_H138#ifndef _LINUX_FUSE_H
@@ -165,7 +168,7 @@ · 29 unmodified lines
165#define FUSE_KERNEL_VERSION 7168#define FUSE_KERNEL_VERSION 7
166 169
167/** Minor version number of this interface */170/** Minor version number of this interface */
168#define FUSE_KERNEL_MINOR_VERSION 30171#define FUSE_KERNEL_MINOR_VERSION 31
169 172
170/** The node ID of the root inode */173/** The node ID of the root inode */
171#define FUSE_ROOT_ID 1174#define FUSE_ROOT_ID 1
@@ -327,9 +330,11 @@ struct fuse_file_lock { · 155 unmodified lines
327 *330 *
328 * FUSE_WRITE_CACHE: delayed write from page cache, file handle is guessed331 * FUSE_WRITE_CACHE: delayed write from page cache, file handle is guessed
329 * FUSE_WRITE_LOCKOWNER: lock_owner field is valid332 * FUSE_WRITE_LOCKOWNER: lock_owner field is valid
333 * FUSE_WRITE_KILL_PRIV: kill suid and sgid bits
330 */334 */
331#define FUSE_WRITE_CACHE (1 << 0)335#define FUSE_WRITE_CACHE (1 << 0)
332#define FUSE_WRITE_LOCKOWNER (1 << 1)336#define FUSE_WRITE_LOCKOWNER (1 << 1)
337#define FUSE_WRITE_KILL_PRIV (1 << 2)
333 338
334/**339/**
335 * Read flags340 * Read flags
include/uapi/linux/if_link.h+5−0
@@ -694,6 +694,7 @@ enum { · 693 unmodified lines
694 IFLA_VF_IB_NODE_GUID, /* VF Infiniband node GUID */694 IFLA_VF_IB_NODE_GUID, /* VF Infiniband node GUID */
695 IFLA_VF_IB_PORT_GUID, /* VF Infiniband port GUID */695 IFLA_VF_IB_PORT_GUID, /* VF Infiniband port GUID */
696 IFLA_VF_VLAN_LIST, /* nested list of vlans, option for QinQ */696 IFLA_VF_VLAN_LIST, /* nested list of vlans, option for QinQ */
697 IFLA_VF_BROADCAST, /* VF broadcast */
697 __IFLA_VF_MAX,698 __IFLA_VF_MAX,
698};699};
699 700
@@ -704,6 +705,10 @@ struct ifla_vf_mac { · 4 unmodified lines
704 __u8 mac[32]; /* MAX_ADDR_LEN */705 __u8 mac[32]; /* MAX_ADDR_LEN */
705};706};
706 707
708struct ifla_vf_broadcast {
709 __u8 broadcast[32];
710};
711
707struct ifla_vf_vlan {712struct ifla_vf_vlan {
708 __u32 vf;713 __u32 vf;
709 __u32 vlan; /* 0 - 4095, 0 disables VLAN filter */714 __u32 vlan; /* 0 - 4095, 0 disables VLAN filter */
include/uapi/linux/mii.h+2−0
@@ -121,6 +121,8 @@ · 120 unmodified lines
121#define EXPANSION_MFAULTS 0x0010 /* Multiple faults detected */121#define EXPANSION_MFAULTS 0x0010 /* Multiple faults detected */
122#define EXPANSION_RESV 0xffe0 /* Unused... */122#define EXPANSION_RESV 0xffe0 /* Unused... */
123 123
124#define ESTATUS_1000_XFULL 0x8000 /* Can do 1000BaseX Full */
125#define ESTATUS_1000_XHALF 0x4000 /* Can do 1000BaseX Half */
124#define ESTATUS_1000_TFULL 0x2000 /* Can do 1000BT Full */126#define ESTATUS_1000_TFULL 0x2000 /* Can do 1000BT Full */
125#define ESTATUS_1000_THALF 0x1000 /* Can do 1000BT Half */127#define ESTATUS_1000_THALF 0x1000 /* Can do 1000BT Half */
126 128
include/uapi/linux/nl80211.h+24−0
@@ -234,6 +234,15 @@ · 233 unmodified lines
234 * use in a FILS shared key connection with PMKSA caching.234 * use in a FILS shared key connection with PMKSA caching.
235 */235 */
236 236
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
237/**246/**
238 * enum nl80211_commands - supported nl80211 commands247 * enum nl80211_commands - supported nl80211 commands
239 *248 *
@@ -2341,6 +2350,12 @@ enum nl80211_commands { · 2101 unmodified lines
2341 * should be picking up the lowest tx power, either tx power per-interface2350 * should be picking up the lowest tx power, either tx power per-interface
2342 * or per-station.2351 * or per-station.
2343 *2352 *
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 *
2344 * @NUM_NL80211_ATTR: total number of nl80211_attrs available2359 * @NUM_NL80211_ATTR: total number of nl80211_attrs available
2345 * @NL80211_ATTR_MAX: highest attribute number currently defined2360 * @NL80211_ATTR_MAX: highest attribute number currently defined
2346 * @__NL80211_ATTR_AFTER_LAST: internal use2361 * @__NL80211_ATTR_AFTER_LAST: internal use
@@ -2794,6 +2809,10 @@ enum nl80211_attrs { · 447 unmodified lines
2794 NL80211_ATTR_STA_TX_POWER_SETTING,2809 NL80211_ATTR_STA_TX_POWER_SETTING,
2795 NL80211_ATTR_STA_TX_POWER,2810 NL80211_ATTR_STA_TX_POWER,
2796 2811
2812 NL80211_ATTR_SAE_PASSWORD,
2813
2814 NL80211_ATTR_TWT_RESPONDER,
2815
2797 /* add attributes here, update the policy in nl80211.c */2816 /* add attributes here, update the policy in nl80211.c */
2798 2817
2799 __NL80211_ATTR_AFTER_LAST,2818 __NL80211_ATTR_AFTER_LAST,
@@ -4406,6 +4425,7 @@ enum nl80211_mfp { · 1606 unmodified lines
4406enum nl80211_wpa_versions {4425enum nl80211_wpa_versions {
4407 NL80211_WPA_VERSION_1 = 1 << 0,4426 NL80211_WPA_VERSION_1 = 1 << 0,
4408 NL80211_WPA_VERSION_2 = 1 << 1,4427 NL80211_WPA_VERSION_2 = 1 << 1,
4428 NL80211_WPA_VERSION_3 = 1 << 2,
4409};4429};
4410 4430
4411/**4431/**
@@ -5422,6 +5442,9 @@ enum nl80211_feature_flags { · 1010 unmodified lines
5422 * @NL80211_EXT_FEATURE_STA_TX_PWR: This driver supports controlling tx power5442 * @NL80211_EXT_FEATURE_STA_TX_PWR: This driver supports controlling tx power
5423 * to a station.5443 * to a station.
5424 *5444 *
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 *
5425 * @NUM_NL80211_EXT_FEATURES: number of extended features.5448 * @NUM_NL80211_EXT_FEATURES: number of extended features.
5426 * @MAX_NL80211_EXT_FEATURES: highest extended feature index.5449 * @MAX_NL80211_EXT_FEATURES: highest extended feature index.
5427 */5450 */
@@ -5466,6 +5489,7 @@ enum nl80211_ext_feature_index { · 38 unmodified lines
5466 NL80211_EXT_FEATURE_SCHED_SCAN_BAND_SPECIFIC_RSSI_THOLD,5489 NL80211_EXT_FEATURE_SCHED_SCAN_BAND_SPECIFIC_RSSI_THOLD,
5467 NL80211_EXT_FEATURE_EXT_KEY_ID,5490 NL80211_EXT_FEATURE_EXT_KEY_ID,
5468 NL80211_EXT_FEATURE_STA_TX_PWR,5491 NL80211_EXT_FEATURE_STA_TX_PWR,
5492 NL80211_EXT_FEATURE_SAE_OFFLOAD,
5469 5493
5470 /* add new features before the definition below */5494 /* add new features before the definition below */
5471 NUM_NL80211_EXT_FEATURES,5495 NUM_NL80211_EXT_FEATURES,
include/uapi/linux/pkt_cls.h+1−1
@@ -295,7 +295,7 @@ enum { · 294 unmodified lines
295 TCA_FW_UNSPEC,295 TCA_FW_UNSPEC,
296 TCA_FW_CLASSID,296 TCA_FW_CLASSID,
297 TCA_FW_POLICE,297 TCA_FW_POLICE,
298 TCA_FW_INDEV, /* used by CONFIG_NET_CLS_IND */298 TCA_FW_INDEV,
299 TCA_FW_ACT, /* used by CONFIG_NET_CLS_ACT */299 TCA_FW_ACT, /* used by CONFIG_NET_CLS_ACT */
300 TCA_FW_MASK,300 TCA_FW_MASK,
301 __TCA_FW_MAX301 __TCA_FW_MAX
include/uapi/linux/psp-sev.h+1−4
@@ -1,3 +1,4 @@
1/* SPDX-License-Identifier: GPL-2.0-only */
1/*2/*
2 * Userspace interface for AMD Secure Encrypted Virtualization (SEV)3 * Userspace interface for AMD Secure Encrypted Virtualization (SEV)
3 * platform management commands.4 * platform management commands.
@@ -7,10 +8,6 @@ · 3 unmodified lines
7 * Author: Brijesh Singh <brijesh.singh@amd.com>8 * Author: Brijesh Singh <brijesh.singh@amd.com>
8 *9 *
9 * SEV API specification is available at: https://developer.amd.com/sev/10 * 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.
14 */11 */
15 12
16#ifndef __PSP_SEV_USER_H__13#ifndef __PSP_SEV_USER_H__
include/uapi/linux/snmp.h+1−0
@@ -283,6 +283,7 @@ enum · 282 unmodified lines
283 LINUX_MIB_TCPACKCOMPRESSED, /* TCPAckCompressed */283 LINUX_MIB_TCPACKCOMPRESSED, /* TCPAckCompressed */
284 LINUX_MIB_TCPZEROWINDOWDROP, /* TCPZeroWindowDrop */284 LINUX_MIB_TCPZEROWINDOWDROP, /* TCPZeroWindowDrop */
285 LINUX_MIB_TCPRCVQDROP, /* TCPRcvQDrop */285 LINUX_MIB_TCPRCVQDROP, /* TCPRcvQDrop */
286 LINUX_MIB_TCPWQUEUETOOBIG, /* TCPWqueueTooBig */
286 LINUX_MIB_TCPFASTOPENPASSIVEALTKEY, /* TCPFastOpenPassiveAltKey */287 LINUX_MIB_TCPFASTOPENPASSIVEALTKEY, /* TCPFastOpenPassiveAltKey */
287 __LINUX_MIB_MAX288 __LINUX_MIB_MAX
288};289};
include/uapi/linux/tc_act/tc_ctinfo.h+0−5
@@ -26,9 +26,4 @@ enum { · 25 unmodified lines
26 26
27#define TCA_CTINFO_MAX (__TCA_CTINFO_MAX - 1)27#define TCA_CTINFO_MAX (__TCA_CTINFO_MAX - 1)
28 28
29enum {
30 CTINFO_MODE_DSCP = BIT(0),
31 CTINFO_MODE_CPMARK = BIT(1)
32};
33
34#endif29#endif
include/uapi/linux/tcp.h+3−0
@@ -127,6 +127,9 @@ enum { · 126 unmodified lines
127 127
128#define TCP_CM_INQ TCP_INQ128#define TCP_CM_INQ TCP_INQ
129 129
130#define TCP_TX_DELAY 37 /* delay outgoing packets by XX usec */
131
132
130#define TCP_REPAIR_ON 1133#define TCP_REPAIR_ON 1
131#define TCP_REPAIR_OFF 0134#define TCP_REPAIR_OFF 0
132#define TCP_REPAIR_OFF_NO_WP -1 /* Turn off without window probes */135#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 */
1/*2/*
2 * User API methods for ACPI-WMI mapping driver3 * User API methods for ACPI-WMI mapping driver
3 *4 *
4 * Copyright (C) 2017 Dell, Inc.5 * 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.
9 */6 */
10#ifndef _UAPI_LINUX_WMI_H7#ifndef _UAPI_LINUX_WMI_H
11#define _UAPI_LINUX_WMI_H8#define _UAPI_LINUX_WMI_H