vxlan_core: delete unnecessary condition

The previous check handled the "if (!nh)" condition so we know "nh"
is non-NULL here.  Delete the check and pull the code in one tab.

Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com>
Reviewed-by: Nikolay Aleksandrov <razor@blackwall.org>
Reviewed-by: Roopa Prabhu <roopa@nvidia.com>
Link: https://lore.kernel.org/r/20220307125735.GC16710@kili
Signed-off-by: Jakub Kicinski <kuba@kernel.org>

diff --git a/drivers/net/vxlan/vxlan_core.c b/drivers/net/vxlan/vxlan_core.c
index b3cbd37c4b939985c9dc24de859847e81f4f1e43..e440cdd4f710e5f6a8e583b1a5acea61ad44314a 100644 (file)
--- a/drivers/net/vxlan/vxlan_core.c
+++ b/drivers/net/vxlan/vxlan_core.c
@@ -811,37 +811,35 @@ static int vxlan_fdb_nh_update(struct vxlan_dev *vxlan, struct vxlan_fdb *fdb,
                goto err_inval;
        }
 
-       if (nh) {
-               if (!nexthop_get(nh)) {
-                       NL_SET_ERR_MSG(extack, "Nexthop has been deleted");
-                       nh = NULL;
-                       goto err_inval;
-               }
-               if (!nexthop_is_fdb(nh)) {
-                       NL_SET_ERR_MSG(extack, "Nexthop is not a fdb nexthop");
-                       goto err_inval;
-               }
+       if (!nexthop_get(nh)) {
+               NL_SET_ERR_MSG(extack, "Nexthop has been deleted");
+               nh = NULL;
+               goto err_inval;
+       }
+       if (!nexthop_is_fdb(nh)) {
+               NL_SET_ERR_MSG(extack, "Nexthop is not a fdb nexthop");
+               goto err_inval;
+       }
 
-               if (!nexthop_is_multipath(nh)) {
-                       NL_SET_ERR_MSG(extack, "Nexthop is not a multipath group");
+       if (!nexthop_is_multipath(nh)) {
+               NL_SET_ERR_MSG(extack, "Nexthop is not a multipath group");
+               goto err_inval;
+       }
+
+       /* check nexthop group family */
+       switch (vxlan->default_dst.remote_ip.sa.sa_family) {
+       case AF_INET:
+               if (!nexthop_has_v4(nh)) {
+                       err = -EAFNOSUPPORT;
+                       NL_SET_ERR_MSG(extack, "Nexthop group family not supported");
                        goto err_inval;
                }
-
-               /* check nexthop group family */
-               switch (vxlan->default_dst.remote_ip.sa.sa_family) {
-               case AF_INET:
-                       if (!nexthop_has_v4(nh)) {
-                               err = -EAFNOSUPPORT;
-                               NL_SET_ERR_MSG(extack, "Nexthop group family not supported");
-                               goto err_inval;
-                       }
-                       break;
-               case AF_INET6:
-                       if (nexthop_has_v4(nh)) {
-                               err = -EAFNOSUPPORT;
-                               NL_SET_ERR_MSG(extack, "Nexthop group family not supported");
-                               goto err_inval;
-                       }
+               break;
+       case AF_INET6:
+               if (nexthop_has_v4(nh)) {
+                       err = -EAFNOSUPPORT;
+                       NL_SET_ERR_MSG(extack, "Nexthop group family not supported");
+                       goto err_inval;
                }
        }