diff options
| author | David S. Miller <davem@davemloft.net> | 2017-04-24 20:11:10 +0200 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2017-04-24 20:11:10 +0200 |
| commit | bc95cd8e8b2fc779b96ed4d7a2608c6a0e8dc240 (patch) | |
| tree | 2dd8dd342b1cbba92a33930de0c1e261d65d5ee8 /include/net | |
| parent | net: add rcu locking when changing early demux (diff) | |
| parent | mlx5: fix warning about missing prototype (diff) | |
| download | linux-bc95cd8e8b2fc779b96ed4d7a2608c6a0e8dc240.tar.xz linux-bc95cd8e8b2fc779b96ed4d7a2608c6a0e8dc240.zip | |
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.
====================
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'include/net')
| -rw-r--r-- | include/net/devlink.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/include/net/devlink.h b/include/net/devlink.h index 24de13f8c94f..ed7687bbf5d0 100644 --- a/include/net/devlink.h +++ b/include/net/devlink.h @@ -268,6 +268,8 @@ struct devlink_ops { int (*eswitch_mode_set)(struct devlink *devlink, u16 mode); int (*eswitch_inline_mode_get)(struct devlink *devlink, u8 *p_inline_mode); int (*eswitch_inline_mode_set)(struct devlink *devlink, u8 inline_mode); + int (*eswitch_encap_mode_get)(struct devlink *devlink, u8 *p_encap_mode); + int (*eswitch_encap_mode_set)(struct devlink *devlink, u8 encap_mode); }; static inline void *devlink_priv(struct devlink *devlink) |