History

Merge tag 'mlx5-updates-2017-04-22' of git://git.kernel.org/pub/scm/linux/kernel/git/saeed/linux

Saeed Mahameed says: ==================== mlx5-updates-2017-04-22 Sparse and compiler warnings fixes from Stephen Hemminger. From Roi Dayan and Or Gerlitz, Add devlink and mlx5 support for controlling E-Switch encapsulation mode, this knob will enable HW support for applying encapsulation/decapsulation to VF traffic as part of SRIOV e-switch offloading. ====================

David S. Miller committed 9 years ago

Commit bc95cd82 parents 58c4c6a 8bf319810 files · +167 −36Browse files

Showing the changes to include/uapi/linux (1 of 10 files). Show all

Unified · Split

include/uapi/linux/devlink.h+7−0
@@ -119,6 +119,11 @@ enum devlink_eswitch_inline_mode { · 118 unmodified lines
119 DEVLINK_ESWITCH_INLINE_MODE_TRANSPORT,119 DEVLINK_ESWITCH_INLINE_MODE_TRANSPORT,
120};120};
121 121
122enum devlink_eswitch_encap_mode {
123 DEVLINK_ESWITCH_ENCAP_MODE_NONE,
124 DEVLINK_ESWITCH_ENCAP_MODE_BASIC,
125};
126
122enum devlink_attr {127enum devlink_attr {
123 /* don't change the order or add anything between, this is ABI! */128 /* don't change the order or add anything between, this is ABI! */
124 DEVLINK_ATTR_UNSPEC,129 DEVLINK_ATTR_UNSPEC,
@@ -195,6 +200,8 @@ enum devlink_attr { · 70 unmodified lines
195 200
196 DEVLINK_ATTR_PAD,201 DEVLINK_ATTR_PAD,
197 202
203 DEVLINK_ATTR_ESWITCH_ENCAP_MODE, /* u8 */
204
198 /* add new attributes above here, update the policy in devlink.c */205 /* add new attributes above here, update the policy in devlink.c */
199 206
200 __DEVLINK_ATTR_MAX,207 __DEVLINK_ATTR_MAX,