diff options
| author | Maxime Ripard | 2019-02-19 11:17:05 +0100 |
|---|---|---|
| committer | Maxime Ripard | 2019-02-19 11:17:05 +0100 |
| commit | ae6ba10d5090fc7e9095eaef3dcf06ba016725a6 (patch) | |
| tree | e631eaa2df52712783acc4d757841da4890c4143 /drivers/net/ethernet/mellanox/mlx5/core/en_rep.h | |
| parent | drm: Remove set but not used variable 'gem' (diff) | |
| parent | Merge v5.0-rc7 into drm-next (diff) | |
| download | kernel-qcow2-linux-ae6ba10d5090fc7e9095eaef3dcf06ba016725a6.tar.gz kernel-qcow2-linux-ae6ba10d5090fc7e9095eaef3dcf06ba016725a6.tar.xz kernel-qcow2-linux-ae6ba10d5090fc7e9095eaef3dcf06ba016725a6.zip | |
Merge drm/drm-next into drm-misc-next
Backmerge drm-next to bring in -rc7
Signed-off-by: Maxime Ripard <maxime.ripard@bootlin.com>
Diffstat (limited to 'drivers/net/ethernet/mellanox/mlx5/core/en_rep.h')
| -rw-r--r-- | drivers/net/ethernet/mellanox/mlx5/core/en_rep.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/net/ethernet/mellanox/mlx5/core/en_rep.h b/drivers/net/ethernet/mellanox/mlx5/core/en_rep.h index edd722824697..36eafc877e6b 100644 --- a/drivers/net/ethernet/mellanox/mlx5/core/en_rep.h +++ b/drivers/net/ethernet/mellanox/mlx5/core/en_rep.h @@ -148,6 +148,7 @@ struct mlx5e_encap_entry { unsigned char h_dest[ETH_ALEN]; /* destination eth addr */ struct net_device *out_dev; + struct net_device *route_dev; int tunnel_type; int tunnel_hlen; int reformat_type; |