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

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

nfp: move eBPF offload files to BPF app directory 



Pure move of eBPF offload files to BPF app directory,
only change the names and relative header location.
nfp_asm.h stays in the main dir and it doesn't really
have to include nfp_bpf.h.

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

drivers/net/ethernet/netronome/nfp/Makefile

+3 −3
Original line number Diff line number Diff line
@@ -21,17 +21,17 @@ nfp-objs := \ 
	    nfp_main.o \

	    nfp_net_common.o \

	    nfp_net_ethtool.o \

	    nfp_net_offload.o \

	    nfp_net_main.o \

	    nfp_netvf_main.o \

	    nfp_port.o \

	    bpf/main.o \

	    bpf/offload.o \

	    nic/main.o



ifeq ($(CONFIG_BPF_SYSCALL),y)

nfp-objs += \

	    nfp_bpf_verifier.o \

	    nfp_bpf_jit.o

	    bpf/verifier.o \

	    bpf/jit.o

endif



nfp-$(CONFIG_NFP_DEBUG) += nfp_net_debugfs.o

drivers/net/ethernet/netronome/nfp/nfp_bpf_jit.c→drivers/net/ethernet/netronome/nfp/bpf/jit.c

+2 −2
Original line number Diff line number Diff line
@@ -39,8 +39,8 @@ 
#include <linux/pkt_cls.h>

#include <linux/unistd.h>



#include "nfp_asm.h"

#include "nfp_bpf.h"

#include "main.h"

#include "../nfp_asm.h"



/* --- NFP prog --- */

/* Foreach "multiple" entries macros provide pos and next<n> pointers.

drivers/net/ethernet/netronome/nfp/nfp_net_offload.c→drivers/net/ethernet/netronome/nfp/bpf/offload.c

+3 −3
Original line number Diff line number Diff line
@@ -47,9 +47,9 @@ 
#include <net/tc_act/tc_gact.h>

#include <net/tc_act/tc_mirred.h>



#include "nfp_bpf.h"

#include "nfp_net_ctrl.h"

#include "nfp_net.h"

#include "main.h"

#include "../nfp_net_ctrl.h"

#include "../nfp_net.h"



void nfp_net_filter_stats_timer(unsigned long data)

{

drivers/net/ethernet/netronome/nfp/nfp_bpf_verifier.c→drivers/net/ethernet/netronome/nfp/bpf/verifier.c

+1 −1
Original line number Diff line number Diff line
@@ -38,7 +38,7 @@ 
#include <linux/kernel.h>

#include <linux/pkt_cls.h>



#include "nfp_bpf.h"

#include "main.h"



/* Analyzer/verifier definitions */

struct nfp_bpf_analyzer_priv {