Minki/linux
1
0
Fork 1
mirror of https://github.com/torvalds/linux.git synced 2024-10-30 08:42:47 +00:00
Code Issues Packages Projects Releases Wiki Activity

nfp: change flows in apps that offload ndo_setup_tc

Browse Source 
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>
This commit is contained in:
Jiri Pirko 2017-08-07 10:15:27 +02:00 committed by David S. Miller
parent 3fbae382f7
commit 37cba6b3f8
2 changed files with 9 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
drivers/net/ethernet/netronome/nfp/bpf/main.c
View File

@ -126,19 +126,15 @@ static int nfp_bpf_setup_tc(struct nfp_app *app, struct net_device *netdev,
{
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)

10
drivers/net/ethernet/netronome/nfp/flower/offload.c
View File

@ -388,14 +388,10 @@ int nfp_flower_setup_tc(struct nfp_app *app, struct net_device *netdev,
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);
}