git.samba.org
/
sfrench
/
cifs-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge tag 'net-6.1-rc7' of git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net
[sfrench/cifs-2.6.git]
/
drivers
/
net
/
ethernet
/
mellanox
/
mlx5
/
core
/
en
/
tc_tun_encap.h
diff --git
a/drivers/net/ethernet/mellanox/mlx5/core/en/tc_tun_encap.h
b/drivers/net/ethernet/mellanox/mlx5/core/en/tc_tun_encap.h
index d542b8476491e081c1f70cecaca5798a42f20f28..8ad273dde40ee5b41ad1cdc4963ce8ad9d10fccb 100644
(file)
--- a/
drivers/net/ethernet/mellanox/mlx5/core/en/tc_tun_encap.h
+++ b/
drivers/net/ethernet/mellanox/mlx5/core/en/tc_tun_encap.h
@@
-17,8
+17,7
@@
int mlx5e_attach_encap(struct mlx5e_priv *priv,
struct net_device *mirred_dev,
int out_index,
struct netlink_ext_ack *extack,
- struct net_device **encap_dev,
- bool *encap_valid);
+ struct net_device **encap_dev);
int mlx5e_attach_decap(struct mlx5e_priv *priv,
struct mlx5e_tc_flow *flow,