i40e: display correct UDP tunnel type name

The i40e driver attempts to display the UDP tunnel name by doing a check
against the type, where for non-zero types we use "vxlan" and for zero
type we use "geneve". This is not future proof, because if new tunnel
types get added, we'll incorrectly label them. It also depends on the
value of UDP_TUNNEL_TYPE_GENEVE == 0, which is brittle.

Instead, replace this with a function that can return a constant string
depending on the type. For now we'll use "unknown" for types we don't
know about, and we can expand this in the future if new types get added.

Signed-off-by: Jacob Keller <jacob.e.keller@intel.com>
Tested-by: Andrew Bowers <andrewx.bowers@intel.com>
Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
Orabug: 26785018
(cherry picked from commit d8b2c700a3a07c7108d9031dc88a6298c101e05d)
Signed-off-by: Jack Vogel <jack.vogel@oracle.com>
Reviewed-by: Kyle Fortin <kyle.fortin@oracle.com>

diff --git a/drivers/net/ethernet/intel/i40e/i40e_main.c b/drivers/net/ethernet/intel/i40e/i40e_main.c
index 89034100cd273469c10743aced27e2c96caaea32..2cf263b2b7f2397a4d98ce8a9d5e1b295ab6559c 100644 (file)
--- a/drivers/net/ethernet/intel/i40e/i40e_main.c
+++ b/drivers/net/ethernet/intel/i40e/i40e_main.c
@@ -7434,6 +7434,18 @@ static void i40e_handle_mdd_event(struct i40e_pf *pf)
        i40e_flush(hw);
 }
 
+static const char *i40e_tunnel_name(struct i40e_udp_port_config *port)
+{
+       switch (port->type) {
+       case UDP_TUNNEL_TYPE_VXLAN:
+               return "vxlan";
+       case UDP_TUNNEL_TYPE_GENEVE:
+               return "geneve";
+       default:
+               return "unknown";
+       }
+}
+
 /**
  * i40e_sync_udp_filters - Trigger a sync event for existing UDP filters
  * @pf: board private structure
@@ -7479,14 +7491,14 @@ static void i40e_sync_udp_filters_subtask(struct i40e_pf *pf)
                                ret = i40e_aq_del_udp_tunnel(hw, i, NULL);
 
                        if (ret) {
-                               dev_dbg(&pf->pdev->dev,
-                                       "%s %s port %d, index %d failed, err %s aq_err %s\n",
-                                       pf->udp_ports[i].type ? "vxlan" : "geneve",
-                                       port ? "add" : "delete",
-                                       port, i,
-                                       i40e_stat_str(&pf->hw, ret),
-                                       i40e_aq_str(&pf->hw,
-                                                   pf->hw.aq.asq_last_status));
+                               dev_info(&pf->pdev->dev,
+                                        "%s %s port %d, index %d failed, err %s aq_err %s\n",
+                                        i40e_tunnel_name(&pf->udp_ports[i]),
+                                        port ? "add" : "delete",
+                                        port, i,
+                                        i40e_stat_str(&pf->hw, ret),
+                                        i40e_aq_str(&pf->hw,
+                                                    pf->hw.aq.asq_last_status));
                                pf->udp_ports[i].port = 0;
                        }
                }