diff options
| author | David Ahern <dsahern@gmail.com> | 2019-12-17 16:25:26 +0000 |
|---|---|---|
| committer | David Ahern <dsahern@gmail.com> | 2019-12-17 16:25:26 +0000 |
| commit | 974f889c2d0f72adfbe3428afd58884e376d3750 (patch) | |
| tree | 9185066eb382631c4d6600115003e910b66dc5b2 | |
| parent | 0486388a877aa579fb1446ec593a2b63c9ba3df6 (diff) | |
| download | iproute2-974f889c2d0f72adfbe3428afd58884e376d3750.tar.gz | |
Update kernel headers
Update kernel headers to commit:
6f6dded1385c ("Merge branch 'WireGuard-CI-and-housekeeping'")
Signed-off-by: David Ahern <dsahern@gmail.com>
| -rw-r--r-- | include/uapi/linux/if_bonding.h | 10 | ||||
| -rw-r--r-- | include/uapi/linux/if_bridge.h | 10 | ||||
| -rw-r--r-- | include/uapi/linux/if_link.h | 1 |
3 files changed, 21 insertions, 0 deletions
diff --git a/include/uapi/linux/if_bonding.h b/include/uapi/linux/if_bonding.h index 790585f0e..6829213a5 100644 --- a/include/uapi/linux/if_bonding.h +++ b/include/uapi/linux/if_bonding.h @@ -95,6 +95,16 @@ #define BOND_XMIT_POLICY_ENCAP23 3 /* encapsulated layer 2+3 */ #define BOND_XMIT_POLICY_ENCAP34 4 /* encapsulated layer 3+4 */ +/* 802.3ad port state definitions (43.4.2.2 in the 802.3ad standard) */ +#define AD_STATE_LACP_ACTIVITY 0x1 +#define AD_STATE_LACP_TIMEOUT 0x2 +#define AD_STATE_AGGREGATION 0x4 +#define AD_STATE_SYNCHRONIZATION 0x8 +#define AD_STATE_COLLECTING 0x10 +#define AD_STATE_DISTRIBUTING 0x20 +#define AD_STATE_DEFAULTED 0x40 +#define AD_STATE_EXPIRED 0x80 + typedef struct ifbond { __s32 bond_mode; __s32 num_slaves; diff --git a/include/uapi/linux/if_bridge.h b/include/uapi/linux/if_bridge.h index 31fc51bde..9fefc7f30 100644 --- a/include/uapi/linux/if_bridge.h +++ b/include/uapi/linux/if_bridge.h @@ -156,6 +156,15 @@ struct bridge_vlan_xstats { __u32 pad2; }; +struct bridge_stp_xstats { + __u64 transition_blk; + __u64 transition_fwd; + __u64 rx_bpdu; + __u64 tx_bpdu; + __u64 rx_tcn; + __u64 tx_tcn; +}; + /* Bridge multicast database attributes * [MDBA_MDB] = { * [MDBA_MDB_ENTRY] = { @@ -262,6 +271,7 @@ enum { BRIDGE_XSTATS_VLAN, BRIDGE_XSTATS_MCAST, BRIDGE_XSTATS_PAD, + BRIDGE_XSTATS_STP, __BRIDGE_XSTATS_MAX }; #define BRIDGE_XSTATS_MAX (__BRIDGE_XSTATS_MAX - 1) diff --git a/include/uapi/linux/if_link.h b/include/uapi/linux/if_link.h index 1c49f4364..29eac87e0 100644 --- a/include/uapi/linux/if_link.h +++ b/include/uapi/linux/if_link.h @@ -169,6 +169,7 @@ enum { IFLA_MAX_MTU, IFLA_PROP_LIST, IFLA_ALT_IFNAME, /* Alternative ifname */ + IFLA_PERM_ADDRESS, __IFLA_MAX }; |