Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 37cba6b3 authored by Jiri Pirko's avatar Jiri Pirko Committed by David S. Miller
Browse files

nfp: change flows in apps that offload ndo_setup_tc 



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: default avatarJiri Pirko <jiri@mellanox.com>
Acked-by: default avatarJamal Hadi Salim <jhs@mojatatu.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 3fbae382

drivers/net/ethernet/netronome/nfp/bpf/main.c

+6 −10
Original line number Diff line number Diff line
@@ -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

	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)

drivers/net/ethernet/netronome/nfp/flower/offload.c

+3 −7
Original line number Diff line number Diff line
@@ -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);

}