diff options
| author | David S. Miller | 2018-05-18 19:00:08 +0200 |
|---|---|---|
| committer | David S. Miller | 2018-05-18 19:00:08 +0200 |
| commit | 3888ea4e2f1fb2f61e5418adf4b8332107ac0c8f (patch) | |
| tree | 93c4bd644e25a6e3c531ecba1f9c4138525afeb4 /drivers/net/ethernet/mellanox/mlx5/core/eswitch.h | |
| parent | Merge branch 'tcp-implement-SACK-compression' (diff) | |
| parent | net/mlx5e: Explicitly set source e-switch in offloaded TC rules (diff) | |
| download | kernel-qcow2-linux-3888ea4e2f1fb2f61e5418adf4b8332107ac0c8f.tar.gz kernel-qcow2-linux-3888ea4e2f1fb2f61e5418adf4b8332107ac0c8f.tar.xz kernel-qcow2-linux-3888ea4e2f1fb2f61e5418adf4b8332107ac0c8f.zip | |
Merge tag 'mlx5-updates-2018-05-17' of git://git.kernel.org/pub/scm/linux/kernel/git/mellanox/linux
Saeed Mahameed says:
====================
mlx5-updates-2018-05-17
mlx5 core dirver updates for both net-next and rdma-next branches.
From Christophe JAILLET, first three patche to use kvfree where needed.
From: Or Gerlitz <ogerlitz@mellanox.com>
Next six patches from Roi and Co adds support for merged
sriov e-switch which comes to serve cases where both PFs, VFs set
on them and both uplinks are to be used in single v-switch SW model.
When merged e-switch is supported, the per-port e-switch is logically
merged into one e-switch that spans both physical ports and all the VFs.
This model allows to offload TC eswitch rules between VFs belonging
to different PFs (and hence have different eswitch affinity), it also
sets the some of the foundations needed for uplink LAG support.
====================
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/ethernet/mellanox/mlx5/core/eswitch.h')
| -rw-r--r-- | drivers/net/ethernet/mellanox/mlx5/core/eswitch.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/net/ethernet/mellanox/mlx5/core/eswitch.h b/drivers/net/ethernet/mellanox/mlx5/core/eswitch.h index edf47a4d549e..f47a14e31b7d 100644 --- a/drivers/net/ethernet/mellanox/mlx5/core/eswitch.h +++ b/drivers/net/ethernet/mellanox/mlx5/core/eswitch.h @@ -237,6 +237,8 @@ enum mlx5_flow_match_level { struct mlx5_esw_flow_attr { struct mlx5_eswitch_rep *in_rep; struct mlx5_eswitch_rep *out_rep; + struct mlx5_core_dev *out_mdev; + struct mlx5_core_dev *in_mdev; int action; __be16 vlan_proto; |