From: Jiri Pirko <jiri@mellanox.com>
Date: Mon, 7 Aug 2017 10:15:27 +0200
Subject: nfp: change flows in apps that offload ndo_setup_tc
Patch-mainline: v4.14-rc1
Git-commit: 37cba6b3f86b24d82f27713b3154657ecc95f678
References: bsc#1055968
Change the flows a bit in preparation of follow-up changes in
ndo_setup_tc args. Also, change the error code to align with the rest of
the drivers.
Signed-off-by: Jiri Pirko <jiri@mellanox.com>
Acked-by: Jamal Hadi Salim <jhs@mojatatu.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Acked-by: Thomas Bogendoerfer <tbogendoerfer@suse.de>
---
drivers/net/ethernet/netronome/nfp/bpf/main.c | 16 ++++++----------
drivers/net/ethernet/netronome/nfp/flower/offload.c | 10 +++-------
2 files changed, 9 insertions(+), 17 deletions(-)
--- a/drivers/net/ethernet/netronome/nfp/bpf/main.c
+++ b/drivers/net/ethernet/netronome/nfp/bpf/main.c
@@ -126,19 +126,15 @@ static int nfp_bpf_setup_tc(struct nfp_a
{
struct nfp_net *nn = netdev_priv(netdev);
- if (TC_H_MAJ(handle) != TC_H_MAJ(TC_H_INGRESS))
- return -EOPNOTSUPP;
- if (proto != htons(ETH_P_ALL))
+ if (type != TC_SETUP_CLSBPF || !nfp_net_ebpf_capable(nn) ||
+ TC_H_MAJ(handle) != TC_H_MAJ(TC_H_INGRESS) ||
+ proto != htons(ETH_P_ALL))
return -EOPNOTSUPP;
- if (type == TC_SETUP_CLSBPF && nfp_net_ebpf_capable(nn)) {
- if (!nn->dp.bpf_offload_xdp)
- return nfp_net_bpf_offload(nn, tc->cls_bpf);
- else
- return -EBUSY;
- }
+ if (nn->dp.bpf_offload_xdp)
+ return -EBUSY;
- return -EINVAL;
+ return nfp_net_bpf_offload(nn, tc->cls_bpf);
}
static bool nfp_bpf_tc_busy(struct nfp_app *app, struct nfp_net *nn)
--- a/drivers/net/ethernet/netronome/nfp/flower/offload.c
+++ b/drivers/net/ethernet/netronome/nfp/flower/offload.c
@@ -412,14 +412,10 @@ int nfp_flower_setup_tc(struct nfp_app *
enum tc_setup_type type, u32 handle, __be16 proto,
struct tc_to_netdev *tc)
{
- if (TC_H_MAJ(handle) != TC_H_MAJ(TC_H_INGRESS))
+ if (type != TC_SETUP_CLSFLOWER ||
+ TC_H_MAJ(handle) != TC_H_MAJ(TC_H_INGRESS) ||
+ !eth_proto_is_802_3(proto))
return -EOPNOTSUPP;
- if (!eth_proto_is_802_3(proto))
- return -EOPNOTSUPP;
-
- if (type != TC_SETUP_CLSFLOWER)
- return -EINVAL;
-
return nfp_flower_repr_offload(app, netdev, tc->cls_flower);
}