From: John Hurley <john.hurley@netronome.com>
Date: Wed, 7 Nov 2018 18:32:49 +0000 (+0000)
Subject: nfp: flower: use geneve and vxlan helpers
X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=83f27d027da3a1d4fff95fd66df0c0100b66ae4c;p=openwrt%2Fstaging%2Fblogic.git

nfp: flower: use geneve and vxlan helpers

Make use of the recently added VXLAN and geneve helper functions to
determine the type of the netdev from its rtnl_link_ops.

Signed-off-by: John Hurley <john.hurley@netronome.com>
Reviewed-by: Jakub Kicinski <jakub.kicinski@netronome.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
---

diff --git a/drivers/net/ethernet/netronome/nfp/flower/action.c b/drivers/net/ethernet/netronome/nfp/flower/action.c
index cfea8f790f95..fbc052d5bb47 100644
--- a/drivers/net/ethernet/netronome/nfp/flower/action.c
+++ b/drivers/net/ethernet/netronome/nfp/flower/action.c
@@ -11,6 +11,7 @@
 #include <net/tc_act/tc_pedit.h>
 #include <net/tc_act/tc_vlan.h>
 #include <net/tc_act/tc_tunnel_key.h>
+#include <net/vxlan.h>
 
 #include "cmsg.h"
 #include "main.h"
@@ -94,13 +95,10 @@ nfp_fl_pre_lag(struct nfp_app *app, const struct tc_action *action,
 static bool nfp_fl_netdev_is_tunnel_type(struct net_device *out_dev,
 					 enum nfp_flower_tun_type tun_type)
 {
-	if (!out_dev->rtnl_link_ops)
-		return false;
-
-	if (!strcmp(out_dev->rtnl_link_ops->kind, "vxlan"))
+	if (netif_is_vxlan(out_dev))
 		return tun_type == NFP_FL_TUNNEL_VXLAN;
 
-	if (!strcmp(out_dev->rtnl_link_ops->kind, "geneve"))
+	if (netif_is_geneve(out_dev))
 		return tun_type == NFP_FL_TUNNEL_GENEVE;
 
 	return false;