diff options
| author | Dave Airlie <airlied@redhat.com> | 2017-06-27 07:24:49 +1000 |
|---|---|---|
| committer | Dave Airlie <airlied@redhat.com> | 2017-06-27 08:28:30 +1000 |
| commit | 6d61e70ccc21606ffb8a0a03bd3aba24f659502b (patch) | |
| tree | 69f5bfb29d085cc42839445d34170bd3ee4f7408 /include/uapi | |
| parent | 338ffbf7cb5eee0ed4600650d03cd2d7cd1cac9d (diff) | |
| parent | c0bc126f97fb929b3ae02c1c62322645d70eb408 (diff) | |
| download | blackbird-obmc-linux-6d61e70ccc21606ffb8a0a03bd3aba24f659502b.tar.gz blackbird-obmc-linux-6d61e70ccc21606ffb8a0a03bd3aba24f659502b.zip | |
Backmerge tag 'v4.12-rc7' into drm-next
Linux 4.12-rc7
Needed at least rc6 for drm-misc-next-fixes, may as well go to rc7
Diffstat (limited to 'include/uapi')
| -rw-r--r-- | include/uapi/linux/ethtool.h | 6 | ||||
| -rw-r--r-- | include/uapi/linux/openvswitch.h | 1 |
2 files changed, 5 insertions, 2 deletions
diff --git a/include/uapi/linux/ethtool.h b/include/uapi/linux/ethtool.h index d179d7767f51..7d4a594d5d58 100644 --- a/include/uapi/linux/ethtool.h +++ b/include/uapi/linux/ethtool.h @@ -1486,8 +1486,10 @@ enum ethtool_link_mode_bit_indices { * it was forced up into this mode or autonegotiated. */ -/* The forced speed, in units of 1Mb. All values 0 to INT_MAX are legal. */ -/* Update drivers/net/phy/phy.c:phy_speed_to_str() when adding new values */ +/* The forced speed, in units of 1Mb. All values 0 to INT_MAX are legal. + * Update drivers/net/phy/phy.c:phy_speed_to_str() and + * drivers/net/bonding/bond_3ad.c:__get_link_speed() when adding new values. + */ #define SPEED_10 10 #define SPEED_100 100 #define SPEED_1000 1000 diff --git a/include/uapi/linux/openvswitch.h b/include/uapi/linux/openvswitch.h index 61b7d36dfe34..156ee4cab82e 100644 --- a/include/uapi/linux/openvswitch.h +++ b/include/uapi/linux/openvswitch.h @@ -343,6 +343,7 @@ enum ovs_key_attr { #define OVS_KEY_ATTR_MAX (__OVS_KEY_ATTR_MAX - 1) enum ovs_tunnel_key_attr { + /* OVS_TUNNEL_KEY_ATTR_NONE, standard nl API requires this attribute! */ OVS_TUNNEL_KEY_ATTR_ID, /* be64 Tunnel ID */ OVS_TUNNEL_KEY_ATTR_IPV4_SRC, /* be32 src IP address. */ OVS_TUNNEL_KEY_ATTR_IPV4_DST, /* be32 dst IP address. */ |
