Update kernel headers

Update kernel headers to commit:
    5d869070569a ("net: phy: marvell: don't use empty switch default case")

Signed-off-by: David Ahern <dsahern@kernel.org>
This commit is contained in:
David Ahern 2021-04-22 05:09:39 +00:00
parent 44b563269e
commit 98040c2dc1
5 changed files with 32 additions and 6 deletions

View File

@ -957,6 +957,7 @@ enum bpf_attach_type {
BPF_XDP_CPUMAP, BPF_XDP_CPUMAP,
BPF_SK_LOOKUP, BPF_SK_LOOKUP,
BPF_XDP, BPF_XDP,
BPF_SK_SKB_VERDICT,
__MAX_BPF_ATTACH_TYPE __MAX_BPF_ATTACH_TYPE
}; };
@ -1117,6 +1118,10 @@ enum bpf_link_type {
* offset to another bpf function * offset to another bpf function
*/ */
#define BPF_PSEUDO_CALL 1 #define BPF_PSEUDO_CALL 1
/* when bpf_call->src_reg == BPF_PSEUDO_KFUNC_CALL,
* bpf_call->imm == btf_id of a BTF_KIND_FUNC in the running kernel
*/
#define BPF_PSEUDO_KFUNC_CALL 2
/* flags for BPF_MAP_UPDATE_ELEM command */ /* flags for BPF_MAP_UPDATE_ELEM command */
enum { enum {
@ -4573,7 +4578,7 @@ union bpf_attr {
* *
* long bpf_check_mtu(void *ctx, u32 ifindex, u32 *mtu_len, s32 len_diff, u64 flags) * long bpf_check_mtu(void *ctx, u32 ifindex, u32 *mtu_len, s32 len_diff, u64 flags)
* Description * Description
* Check ctx packet size against exceeding MTU of net device (based * Check packet size against exceeding MTU of net device (based
* on *ifindex*). This helper will likely be used in combination * on *ifindex*). This helper will likely be used in combination
* with helpers that adjust/change the packet size. * with helpers that adjust/change the packet size.
* *
@ -4590,6 +4595,14 @@ union bpf_attr {
* against the current net device. This is practical if this isn't * against the current net device. This is practical if this isn't
* used prior to redirect. * used prior to redirect.
* *
* On input *mtu_len* must be a valid pointer, else verifier will
* reject BPF program. If the value *mtu_len* is initialized to
* zero then the ctx packet size is use. When value *mtu_len* is
* provided as input this specify the L3 length that the MTU check
* is done against. Remember XDP and TC length operate at L2, but
* this value is L3 as this correlate to MTU and IP-header tot_len
* values which are L3 (similar behavior as bpf_fib_lookup).
*
* The Linux kernel route table can configure MTUs on a more * The Linux kernel route table can configure MTUs on a more
* specific per route level, which is not provided by this helper. * specific per route level, which is not provided by this helper.
* For route level MTU checks use the **bpf_fib_lookup**\ () * For route level MTU checks use the **bpf_fib_lookup**\ ()
@ -4614,11 +4627,9 @@ union bpf_attr {
* *
* On return *mtu_len* pointer contains the MTU value of the net * On return *mtu_len* pointer contains the MTU value of the net
* device. Remember the net device configured MTU is the L3 size, * device. Remember the net device configured MTU is the L3 size,
* which is returned here and XDP and TX length operate at L2. * which is returned here and XDP and TC length operate at L2.
* Helper take this into account for you, but remember when using * Helper take this into account for you, but remember when using
* MTU value in your BPF-code. On input *mtu_len* must be a valid * MTU value in your BPF-code.
* pointer and be initialized (to zero), else verifier will reject
* BPF program.
* *
* Return * Return
* * 0 on success, and populate MTU value in *mtu_len* pointer. * * 0 on success, and populate MTU value in *mtu_len* pointer.

View File

@ -113,7 +113,7 @@ struct can_frame {
*/ */
__u8 len; __u8 len;
__u8 can_dlc; /* deprecated */ __u8 can_dlc; /* deprecated */
}; } __attribute__((packed)); /* disable padding added in some ABIs */
__u8 __pad; /* padding */ __u8 __pad; /* padding */
__u8 __res0; /* reserved / padding */ __u8 __res0; /* reserved / padding */
__u8 len8_dlc; /* optional DLC for 8 byte payload length (9 .. 15) */ __u8 len8_dlc; /* optional DLC for 8 byte payload length (9 .. 15) */

View File

@ -140,6 +140,9 @@ struct icmp6hdr {
#define ICMPV6_UNK_OPTION 2 #define ICMPV6_UNK_OPTION 2
#define ICMPV6_HDR_INCOMP 3 #define ICMPV6_HDR_INCOMP 3
/* Codes for EXT_ECHO (PROBE) */
#define ICMPV6_EXT_ECHO_REQUEST 160
#define ICMPV6_EXT_ECHO_REPLY 161
/* /*
* constants for (set|get)sockopt * constants for (set|get)sockopt
*/ */

View File

@ -174,10 +174,21 @@ enum mptcp_event_attr {
MPTCP_ATTR_FLAGS, /* u16 */ MPTCP_ATTR_FLAGS, /* u16 */
MPTCP_ATTR_TIMEOUT, /* u32 */ MPTCP_ATTR_TIMEOUT, /* u32 */
MPTCP_ATTR_IF_IDX, /* s32 */ MPTCP_ATTR_IF_IDX, /* s32 */
MPTCP_ATTR_RESET_REASON,/* u32 */
MPTCP_ATTR_RESET_FLAGS, /* u32 */
__MPTCP_ATTR_AFTER_LAST __MPTCP_ATTR_AFTER_LAST
}; };
#define MPTCP_ATTR_MAX (__MPTCP_ATTR_AFTER_LAST - 1) #define MPTCP_ATTR_MAX (__MPTCP_ATTR_AFTER_LAST - 1)
/* MPTCP Reset reason codes, rfc8684 */
#define MPTCP_RST_EUNSPEC 0
#define MPTCP_RST_EMPTCP 1
#define MPTCP_RST_ERESOURCE 2
#define MPTCP_RST_EPROHIBIT 3
#define MPTCP_RST_EWQ2BIG 4
#define MPTCP_RST_EBADPERF 5
#define MPTCP_RST_EMIDDLEBOX 6
#endif /* _MPTCP_H */ #endif /* _MPTCP_H */

View File

@ -290,6 +290,7 @@ enum {
#define RTPROT_MROUTED 17 /* Multicast daemon */ #define RTPROT_MROUTED 17 /* Multicast daemon */
#define RTPROT_KEEPALIVED 18 /* Keepalived daemon */ #define RTPROT_KEEPALIVED 18 /* Keepalived daemon */
#define RTPROT_BABEL 42 /* Babel daemon */ #define RTPROT_BABEL 42 /* Babel daemon */
#define RTPROT_OPENR 99 /* Open Routing (Open/R) Routes */
#define RTPROT_BGP 186 /* BGP Routes */ #define RTPROT_BGP 186 /* BGP Routes */
#define RTPROT_ISIS 187 /* ISIS Routes */ #define RTPROT_ISIS 187 /* ISIS Routes */
#define RTPROT_OSPF 188 /* OSPF Routes */ #define RTPROT_OSPF 188 /* OSPF Routes */