diff options
| author | Chris Mi | 2019-05-16 11:36:43 +0200 |
|---|---|---|
| committer | Saeed Mahameed | 2019-06-07 23:40:37 +0200 |
| commit | d3cbd4254df881777e2efb68ee10ede0d9dc0647 (patch) | |
| tree | 0f09cc03e38bb23d0cb542eb17d7acdcd0b2b52a /drivers/net/ethernet/mellanox/mlx5/core/en_main.c | |
| parent | net/mlx5: Avoid reloading already removed devices (diff) | |
| download | kernel-qcow2-linux-d3cbd4254df881777e2efb68ee10ede0d9dc0647.tar.gz kernel-qcow2-linux-d3cbd4254df881777e2efb68ee10ede0d9dc0647.tar.xz kernel-qcow2-linux-d3cbd4254df881777e2efb68ee10ede0d9dc0647.zip | |
net/mlx5e: Add ndo_set_feature for uplink representor
After we have a dedicated uplink representor, the new netdev ops
doesn't support ndo_set_feature. Because of that, we can't change
some features, eg. rxvlan. Now add it back.
In this patch, I also do a cleanup for the features flag handling,
eg. remove duplicate NETIF_F_HW_TC flag setting.
Fixes: aec002f6f82c ("net/mlx5e: Uninstantiate esw manager vport netdev on switchdev mode")
Signed-off-by: Chris Mi <chrism@mellanox.com>
Reviewed-by: Roi Dayan <roid@mellanox.com>
Reviewed-by: Vlad Buslov <vladbu@mellanox.com>
Signed-off-by: Saeed Mahameed <saeedm@mellanox.com>
Diffstat (limited to 'drivers/net/ethernet/mellanox/mlx5/core/en_main.c')
| -rw-r--r-- | drivers/net/ethernet/mellanox/mlx5/core/en_main.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/drivers/net/ethernet/mellanox/mlx5/core/en_main.c b/drivers/net/ethernet/mellanox/mlx5/core/en_main.c index c65cefd84eda..cd490ae330d8 100644 --- a/drivers/net/ethernet/mellanox/mlx5/core/en_main.c +++ b/drivers/net/ethernet/mellanox/mlx5/core/en_main.c @@ -3635,8 +3635,7 @@ static int mlx5e_handle_feature(struct net_device *netdev, return 0; } -static int mlx5e_set_features(struct net_device *netdev, - netdev_features_t features) +int mlx5e_set_features(struct net_device *netdev, netdev_features_t features) { netdev_features_t oper_features = netdev->features; int err = 0; |