From mboxrd@z Thu Jan 1 00:00:00 1970 From: John Hurley Subject: [PATCH net-next 2/3] nfp: flower: use geneve and vxlan helpers Date: Wed, 7 Nov 2018 18:32:49 +0000 Message-ID: <1541615570-523-3-git-send-email-john.hurley@netronome.com> References: <1541615570-523-1-git-send-email-john.hurley@netronome.com> Cc: John Hurley To: netdev@vger.kernel.org, davem@davemloft.net, oss-drivers@netronome.com, jakub.kicinski@netronome.com Return-path: Received: from mail-ed1-f68.google.com ([209.85.208.68]:46494 "EHLO mail-ed1-f68.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728173AbeKHEEp (ORCPT ); Wed, 7 Nov 2018 23:04:45 -0500 Received: by mail-ed1-f68.google.com with SMTP id b34-v6so2008998ede.13 for ; Wed, 07 Nov 2018 10:33:09 -0800 (PST) In-Reply-To: <1541615570-523-1-git-send-email-john.hurley@netronome.com> Sender: netdev-owner@vger.kernel.org List-ID: 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 Reviewed-by: Jakub Kicinski --- drivers/net/ethernet/netronome/nfp/flower/action.c | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/drivers/net/ethernet/netronome/nfp/flower/action.c b/drivers/net/ethernet/netronome/nfp/flower/action.c index 244dc26..2f67cd55 100644 --- a/drivers/net/ethernet/netronome/nfp/flower/action.c +++ b/drivers/net/ethernet/netronome/nfp/flower/action.c @@ -11,6 +11,7 @@ #include #include #include +#include #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; -- 2.7.4