Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
I
iproute2
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Kirill Smelkov
iproute2
Commits
b7e0091a
Commit
b7e0091a
authored
Mar 21, 2016
by
Stephen Hemminger
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
update kernel headers to 4.6 (pre rc1)
parent
acd1e437
Changes
7
Show whitespace changes
Inline
Side-by-side
Showing
7 changed files
with
58 additions
and
1 deletion
+58
-1
include/linux/bpf.h
include/linux/bpf.h
+20
-0
include/linux/if.h
include/linux/if.h
+1
-1
include/linux/if_ether.h
include/linux/if_ether.h
+1
-0
include/linux/if_link.h
include/linux/if_link.h
+31
-0
include/linux/netconf.h
include/linux/netconf.h
+1
-0
include/linux/pkt_cls.h
include/linux/pkt_cls.h
+2
-0
include/linux/tcp.h
include/linux/tcp.h
+2
-0
No files found.
include/linux/bpf.h
View file @
b7e0091a
...
...
@@ -101,12 +101,15 @@ enum bpf_prog_type {
#define BPF_NOEXIST 1
/* create new element if it didn't exist */
#define BPF_EXIST 2
/* update existing element */
#define BPF_F_NO_PREALLOC (1U << 0)
union
bpf_attr
{
struct
{
/* anonymous struct used by BPF_MAP_CREATE command */
__u32
map_type
;
/* one of enum bpf_map_type */
__u32
key_size
;
/* size of key in bytes */
__u32
value_size
;
/* size of value in bytes */
__u32
max_entries
;
/* max number of entries in a map */
__u32
map_flags
;
/* prealloc or not */
};
struct
{
/* anonymous struct used by BPF_MAP_*_ELEM commands */
...
...
@@ -298,6 +301,17 @@ enum bpf_func_id {
* Return: csum result
*/
BPF_FUNC_csum_diff
,
/**
* bpf_skb_[gs]et_tunnel_opt(skb, opt, size)
* retrieve or populate tunnel options metadata
* @skb: pointer to skb
* @opt: pointer to raw tunnel option data
* @size: size of @opt
* Return: 0 on success for set, option size for get
*/
BPF_FUNC_skb_get_tunnel_opt
,
BPF_FUNC_skb_set_tunnel_opt
,
__BPF_FUNC_MAX_ID
,
};
...
...
@@ -305,6 +319,7 @@ enum bpf_func_id {
/* BPF_FUNC_skb_store_bytes flags. */
#define BPF_F_RECOMPUTE_CSUM (1ULL << 0)
#define BPF_F_INVALIDATE_HASH (1ULL << 1)
/* BPF_FUNC_l3_csum_replace and BPF_FUNC_l4_csum_replace flags.
* First 4 bits are for passing the header field size.
...
...
@@ -327,6 +342,10 @@ enum bpf_func_id {
#define BPF_F_FAST_STACK_CMP (1ULL << 9)
#define BPF_F_REUSE_STACKID (1ULL << 10)
/* BPF_FUNC_skb_set_tunnel_key flags. */
#define BPF_F_ZERO_CSUM_TX (1ULL << 1)
#define BPF_F_DONT_FRAGMENT (1ULL << 2)
/* user accessible mirror of in-kernel sk_buff.
* new fields can only be added to the end of this structure
*/
...
...
@@ -356,6 +375,7 @@ struct bpf_tunnel_key {
};
__u8
tunnel_tos
;
__u8
tunnel_ttl
;
__u32
tunnel_label
;
};
#endif
/* __LINUX_BPF_H__ */
include/linux/if.h
View file @
b7e0091a
...
...
@@ -37,7 +37,7 @@
* are shared for all types of net_devices. The sysfs entries are available
* via /sys/class/net/<dev>/flags. Flags which can be toggled through sysfs
* are annotated below, note that only a few flags can be toggled and some
* other flags are always
always
preserved from the original net_device flags
* other flags are always preserved from the original net_device flags
* even if you try to set them via sysfs. Flags which are always preserved
* are kept under the flag grouping @IFF_VOLATILE. Flags which are __volatile__
* are annotated below as such.
...
...
include/linux/if_ether.h
View file @
b7e0091a
...
...
@@ -83,6 +83,7 @@
#define ETH_P_8021AD 0x88A8
/* 802.1ad Service VLAN */
#define ETH_P_802_EX1 0x88B5
/* 802.1 Local Experimental 1. */
#define ETH_P_TIPC 0x88CA
/* TIPC */
#define ETH_P_MACSEC 0x88E5
/* 802.1ae MACsec */
#define ETH_P_8021AH 0x88E7
/* 802.1ah Backbone Service Tag */
#define ETH_P_MVRP 0x88F5
/* 802.1Q MVRP */
#define ETH_P_1588 0x88F7
/* IEEE 1588 Timesync */
...
...
include/linux/if_link.h
View file @
b7e0091a
...
...
@@ -411,6 +411,35 @@ enum {
#define IFLA_VRF_PORT_MAX (__IFLA_VRF_PORT_MAX - 1)
/* MACSEC section */
enum
{
IFLA_MACSEC_UNSPEC
,
IFLA_MACSEC_SCI
,
IFLA_MACSEC_PORT
,
IFLA_MACSEC_ICV_LEN
,
IFLA_MACSEC_CIPHER_SUITE
,
IFLA_MACSEC_WINDOW
,
IFLA_MACSEC_ENCODING_SA
,
IFLA_MACSEC_ENCRYPT
,
IFLA_MACSEC_PROTECT
,
IFLA_MACSEC_INC_SCI
,
IFLA_MACSEC_ES
,
IFLA_MACSEC_SCB
,
IFLA_MACSEC_REPLAY_PROTECT
,
IFLA_MACSEC_VALIDATION
,
__IFLA_MACSEC_MAX
,
};
#define IFLA_MACSEC_MAX (__IFLA_MACSEC_MAX - 1)
enum
macsec_validation_type
{
MACSEC_VALIDATE_DISABLED
=
0
,
MACSEC_VALIDATE_CHECK
=
1
,
MACSEC_VALIDATE_STRICT
=
2
,
__MACSEC_VALIDATE_END
,
MACSEC_VALIDATE_MAX
=
__MACSEC_VALIDATE_END
-
1
,
};
/* IPVLAN section */
enum
{
IFLA_IPVLAN_UNSPEC
,
...
...
@@ -454,6 +483,7 @@ enum {
IFLA_VXLAN_GBP
,
IFLA_VXLAN_REMCSUM_NOPARTIAL
,
IFLA_VXLAN_COLLECT_METADATA
,
IFLA_VXLAN_LABEL
,
__IFLA_VXLAN_MAX
};
#define IFLA_VXLAN_MAX (__IFLA_VXLAN_MAX - 1)
...
...
@@ -476,6 +506,7 @@ enum {
IFLA_GENEVE_UDP_CSUM
,
IFLA_GENEVE_UDP_ZERO_CSUM6_TX
,
IFLA_GENEVE_UDP_ZERO_CSUM6_RX
,
IFLA_GENEVE_LABEL
,
__IFLA_GENEVE_MAX
};
#define IFLA_GENEVE_MAX (__IFLA_GENEVE_MAX - 1)
...
...
include/linux/netconf.h
View file @
b7e0091a
...
...
@@ -19,6 +19,7 @@ enum {
__NETCONFA_MAX
};
#define NETCONFA_MAX (__NETCONFA_MAX - 1)
#define NETCONFA_ALL -1
#define NETCONFA_IFINDEX_ALL -1
#define NETCONFA_IFINDEX_DEFAULT -2
...
...
include/linux/pkt_cls.h
View file @
b7e0091a
...
...
@@ -363,6 +363,8 @@ enum {
TCA_FLOWER_KEY_TCP_DST
,
/* be16 */
TCA_FLOWER_KEY_UDP_SRC
,
/* be16 */
TCA_FLOWER_KEY_UDP_DST
,
/* be16 */
TCA_FLOWER_FLAGS
,
__TCA_FLOWER_MAX
,
};
...
...
include/linux/tcp.h
View file @
b7e0091a
...
...
@@ -199,6 +199,8 @@ struct tcp_info {
__u32
tcpi_notsent_bytes
;
__u32
tcpi_min_rtt
;
__u32
tcpi_data_segs_in
;
/* RFC4898 tcpEStatsDataSegsIn */
__u32
tcpi_data_segs_out
;
/* RFC4898 tcpEStatsDataSegsOut */
};
/* for TCP_MD5SIG socket option */
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment