[PATCH net-next 2/2] mlx4/en_netdev: call notifiers when hw_enc_features change

[Davide Caratti]

ensure to call netdev_features_change() when the driver flips its
hw_enc_features bits.

Signed-off-by: Davide Caratti <dcara...@redhat.com>
---
 .../net/ethernet/mellanox/mlx4/en_netdev.c    | 39 ++++++++++++-------
 1 file changed, 26 insertions(+), 13 deletions(-)

diff --git a/drivers/net/ethernet/mellanox/mlx4/en_netdev.c 
b/drivers/net/ethernet/mellanox/mlx4/en_netdev.c
index 52500f744a0e..1b484dc6e1c2 100644
--- a/drivers/net/ethernet/mellanox/mlx4/en_netdev.c
+++ b/drivers/net/ethernet/mellanox/mlx4/en_netdev.c
@@ -2628,6 +2628,30 @@ static int mlx4_en_get_phys_port_id(struct net_device 
*dev,
        return 0;
 }
 
+#define MLX4_GSO_PARTIAL_FEATURES (NETIF_F_IP_CSUM | NETIF_F_IPV6_CSUM | \
+                                  NETIF_F_RXCSUM | \
+                                  NETIF_F_TSO | NETIF_F_TSO6 | \
+                                  NETIF_F_GSO_UDP_TUNNEL | \
+                                  NETIF_F_GSO_UDP_TUNNEL_CSUM | \
+                                  NETIF_F_GSO_PARTIAL)
+
+static void mlx4_set_vxlan_offloads(struct net_device *dev, bool enable)
+{
+       netdev_features_t hw_enc_features;
+
+       rtnl_lock();
+       hw_enc_features = dev->hw_enc_features;
+       if (enable)
+               dev->hw_enc_features |= MLX4_GSO_PARTIAL_FEATURES;
+       else
+               dev->hw_enc_features &= ~MLX4_GSO_PARTIAL_FEATURES;
+
+       if (hw_enc_features ^ dev->hw_enc_features)
+               netdev_features_change(dev);
+
+       rtnl_unlock();
+}
+
 static void mlx4_en_add_vxlan_offloads(struct work_struct *work)
 {
        int ret;
@@ -2647,12 +2671,7 @@ static void mlx4_en_add_vxlan_offloads(struct 
work_struct *work)
        }
 
        /* set offloads */
-       priv->dev->hw_enc_features |= NETIF_F_IP_CSUM | NETIF_F_IPV6_CSUM |
-                                     NETIF_F_RXCSUM |
-                                     NETIF_F_TSO | NETIF_F_TSO6 |
-                                     NETIF_F_GSO_UDP_TUNNEL |
-                                     NETIF_F_GSO_UDP_TUNNEL_CSUM |
-                                     NETIF_F_GSO_PARTIAL;
+       mlx4_set_vxlan_offloads(priv->dev, true);
 }
 
 static void mlx4_en_del_vxlan_offloads(struct work_struct *work)
@@ -2661,13 +2680,7 @@ static void mlx4_en_del_vxlan_offloads(struct 
work_struct *work)
        struct mlx4_en_priv *priv = container_of(work, struct mlx4_en_priv,
                                                 vxlan_del_task);
        /* unset offloads */
-       priv->dev->hw_enc_features &= ~(NETIF_F_IP_CSUM | NETIF_F_IPV6_CSUM |
-                                       NETIF_F_RXCSUM |
-                                       NETIF_F_TSO | NETIF_F_TSO6 |
-                                       NETIF_F_GSO_UDP_TUNNEL |
-                                       NETIF_F_GSO_UDP_TUNNEL_CSUM |
-                                       NETIF_F_GSO_PARTIAL);
-
+       mlx4_set_vxlan_offloads(priv->dev, false);
        ret = mlx4_SET_PORT_VXLAN(priv->mdev->dev, priv->port,
                                  VXLAN_STEER_BY_OUTER_MAC, 0);
        if (ret)
-- 
2.20.1