net/mlx5: Remove redundant NULL initializations

Neighbour initializations to NULL are not necessary as the pointers are
not used if an error is returned, and if success returned, pointers are
initialized.

Signed-off-by: Eli Cohen <eli@mellanox.com>
Reviewed-by: Vlad Buslov <vladbu@mellanox.com>
Reviewed-by: Roi Dayan <roid@mellanox.com>
Signed-off-by: Saeed Mahameed <saeedm@mellanox.com>

diff --git a/drivers/net/ethernet/mellanox/mlx5/core/en/tc_tun.c b/drivers/net/ethernet/mellanox/mlx5/core/en/tc_tun.c
index 13af72556987ffe6ffd5dbf2a32d240a1a545cc0..4f78efeb6ee818dc36f552c6055591143999f8f8 100644 (file)
--- a/drivers/net/ethernet/mellanox/mlx5/core/en/tc_tun.c
+++ b/drivers/net/ethernet/mellanox/mlx5/core/en/tc_tun.c
@@ -77,8 +77,8 @@ static int mlx5e_route_lookup_ipv4(struct mlx5e_priv *priv,
                                   struct neighbour **out_n,
                                   u8 *out_ttl)
 {
+       struct neighbour *n;
        struct rtable *rt;
-       struct neighbour *n = NULL;
 
 #if IS_ENABLED(CONFIG_INET)
        struct mlx5_core_dev *mdev = priv->mdev;
@@ -138,8 +138,8 @@ static int mlx5e_route_lookup_ipv6(struct mlx5e_priv *priv,
                                   struct neighbour **out_n,
                                   u8 *out_ttl)
 {
-       struct neighbour *n = NULL;
        struct dst_entry *dst;
+       struct neighbour *n;
 
 #if IS_ENABLED(CONFIG_INET) && IS_ENABLED(CONFIG_IPV6)
        int ret;
@@ -212,8 +212,8 @@ int mlx5e_tc_tun_create_header_ipv4(struct mlx5e_priv *priv,
        int max_encap_size = MLX5_CAP_ESW(priv->mdev, max_encap_header_size);
        const struct ip_tunnel_key *tun_key = &e->tun_info->key;
        struct net_device *out_dev, *route_dev;
-       struct neighbour *n = NULL;
        struct flowi4 fl4 = {};
+       struct neighbour *n;
        int ipv4_encap_size;
        char *encap_header;
        u8 nud_state, ttl;
@@ -328,9 +328,9 @@ int mlx5e_tc_tun_create_header_ipv6(struct mlx5e_priv *priv,
        int max_encap_size = MLX5_CAP_ESW(priv->mdev, max_encap_header_size);
        const struct ip_tunnel_key *tun_key = &e->tun_info->key;
        struct net_device *out_dev, *route_dev;
-       struct neighbour *n = NULL;
        struct flowi6 fl6 = {};
        struct ipv6hdr *ip6h;
+       struct neighbour *n;
        int ipv6_encap_size;
        char *encap_header;
        u8 nud_state, ttl;