Revert "UBUNTU: SAUCE: (no-up) net/mlx5: Avoid dereferencing uninitialized pointer"

BugLink: http://bugs.launchpad.net/bugs/1688499
This reverts commit 4bd7900ebaac4fd554f8b062954175a1de04686f to be
replaced by the 4.10.14 upstream change which contains a proper sha1
reference.

Signed-off-by: Stefan Bader <stefan.bader@canonical.com>
Signed-off-by: Thadeu Lima de Souza Cascardo <cascardo@canonical.com>

diff --git a/drivers/net/ethernet/mellanox/mlx5/core/lag.c b/drivers/net/ethernet/mellanox/mlx5/core/lag.c
index b5d5519542e87380b064de5578e327f0d55ba9cf..55957246c0e844826a5a7f18c42c4678fb6c5be5 100644 (file)
--- a/drivers/net/ethernet/mellanox/mlx5/core/lag.c
+++ b/drivers/net/ethernet/mellanox/mlx5/core/lag.c
@@ -294,7 +294,7 @@ static int mlx5_handle_changeupper_event(struct mlx5_lag *ldev,
                                         struct netdev_notifier_changeupper_info *info)
 {
        struct net_device *upper = info->upper_dev, *ndev_tmp;
-       struct netdev_lag_upper_info *lag_upper_info = NULL;
+       struct netdev_lag_upper_info *lag_upper_info;
        bool is_bonded;
        int bond_status = 0;
        int num_slaves = 0;
@@ -303,8 +303,7 @@ static int mlx5_handle_changeupper_event(struct mlx5_lag *ldev,
        if (!netif_is_lag_master(upper))
                return 0;
 
-       if (info->linking)
-               lag_upper_info = info->upper_info;
+       lag_upper_info = info->upper_info;
 
        /* The event may still be of interest if the slave does not belong to
         * us, but is enslaved to a master which has one or more of our netdevs