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

Commit 2e9d594d authored by Jakub Kicinski's avatar Jakub Kicinski Committed by David S. Miller
Browse files

nfp: remove unnecessary parameters from nfp_net_bpf_offload() 



nfp_net_bpf_offload() takes all .setup_tc() parameters but it
doesn't use them at the moment.  Remove unnecessary ones to make
it possible for XDP to reuse this function.

Signed-off-by: default avatarJakub Kicinski <jakub.kicinski@netronome.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent ecd63a02

drivers/net/ethernet/netronome/nfp/nfp_net.h

+1 −3
Original line number Original line Diff line number Diff line
@@ -817,8 +817,6 @@ static inline void nfp_net_debugfs_adapter_del(struct nfp_net *nn) 
#endif /* CONFIG_NFP_NET_DEBUG */

#endif /* CONFIG_NFP_NET_DEBUG */





void nfp_net_filter_stats_timer(unsigned long data);

void nfp_net_filter_stats_timer(unsigned long data);

int

int nfp_net_bpf_offload(struct nfp_net *nn, struct tc_cls_bpf_offload *cls_bpf);

nfp_net_bpf_offload(struct nfp_net *nn, u32 handle, __be16 proto,

		    struct tc_cls_bpf_offload *cls_bpf);





#endif /* _NFP_NET_H_ */
 
#endif /* _NFP_NET_H_ */

drivers/net/ethernet/netronome/nfp/nfp_net_common.c

+1 −1
Original line number Original line Diff line number Diff line
@@ -2694,7 +2694,7 @@ nfp_net_setup_tc(struct net_device *netdev, u32 handle, __be16 proto, 
		return -ENOTSUPP;

		return -ENOTSUPP;





	if (tc->type == TC_SETUP_CLSBPF && nfp_net_ebpf_capable(nn))

	if (tc->type == TC_SETUP_CLSBPF && nfp_net_ebpf_capable(nn))

		return nfp_net_bpf_offload(nn, handle, proto, tc->cls_bpf);

		return nfp_net_bpf_offload(nn, tc->cls_bpf);





	return -EINVAL;

	return -EINVAL;

}

}

drivers/net/ethernet/netronome/nfp/nfp_net_offload.c

+1 −3
Original line number Original line Diff line number Diff line
@@ -233,9 +233,7 @@ static int nfp_net_bpf_stop(struct nfp_net *nn) 
	return nfp_net_reconfig(nn, NFP_NET_CFG_UPDATE_GEN);

	return nfp_net_reconfig(nn, NFP_NET_CFG_UPDATE_GEN);

}

}





int

int nfp_net_bpf_offload(struct nfp_net *nn, struct tc_cls_bpf_offload *cls_bpf)

nfp_net_bpf_offload(struct nfp_net *nn, u32 handle, __be16 proto,

		    struct tc_cls_bpf_offload *cls_bpf)

{

{

	struct nfp_bpf_result res;

	struct nfp_bpf_result res;

	dma_addr_t dma_addr;

	dma_addr_t dma_addr;