Skip to content

Commit d9ae7f2

Browse files
Jakub Kicinskidavem330
authored andcommitted
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: Jakub Kicinski <[email protected]> Signed-off-by: David S. Miller <[email protected]>
1 parent 2707d6f commit d9ae7f2

File tree

6 files changed

+10
-10
lines changed

6 files changed

+10
-10
lines changed

drivers/net/ethernet/netronome/nfp/Makefile

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -21,17 +21,17 @@ nfp-objs := \
2121
nfp_main.o \
2222
nfp_net_common.o \
2323
nfp_net_ethtool.o \
24-
nfp_net_offload.o \
2524
nfp_net_main.o \
2625
nfp_netvf_main.o \
2726
nfp_port.o \
2827
bpf/main.o \
28+
bpf/offload.o \
2929
nic/main.o
3030

3131
ifeq ($(CONFIG_BPF_SYSCALL),y)
3232
nfp-objs += \
33-
nfp_bpf_verifier.o \
34-
nfp_bpf_jit.o
33+
bpf/verifier.o \
34+
bpf/jit.o
3535
endif
3636

3737
nfp-$(CONFIG_NFP_DEBUG) += nfp_net_debugfs.o

drivers/net/ethernet/netronome/nfp/nfp_bpf_jit.c renamed to drivers/net/ethernet/netronome/nfp/bpf/jit.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -39,8 +39,8 @@
3939
#include <linux/pkt_cls.h>
4040
#include <linux/unistd.h>
4141

42-
#include "nfp_asm.h"
43-
#include "nfp_bpf.h"
42+
#include "main.h"
43+
#include "../nfp_asm.h"
4444

4545
/* --- NFP prog --- */
4646
/* Foreach "multiple" entries macros provide pos and next<n> pointers.

drivers/net/ethernet/netronome/nfp/nfp_net_offload.c renamed to drivers/net/ethernet/netronome/nfp/bpf/offload.c

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -47,9 +47,9 @@
4747
#include <net/tc_act/tc_gact.h>
4848
#include <net/tc_act/tc_mirred.h>
4949

50-
#include "nfp_bpf.h"
51-
#include "nfp_net_ctrl.h"
52-
#include "nfp_net.h"
50+
#include "main.h"
51+
#include "../nfp_net_ctrl.h"
52+
#include "../nfp_net.h"
5353

5454
void nfp_net_filter_stats_timer(unsigned long data)
5555
{

drivers/net/ethernet/netronome/nfp/nfp_bpf_verifier.c renamed to drivers/net/ethernet/netronome/nfp/bpf/verifier.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@
3838
#include <linux/kernel.h>
3939
#include <linux/pkt_cls.h>
4040

41-
#include "nfp_bpf.h"
41+
#include "main.h"
4242

4343
/* Analyzer/verifier definitions */
4444
struct nfp_bpf_analyzer_priv {

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@
3434
#ifndef __NFP_ASM_H__
3535
#define __NFP_ASM_H__ 1
3636

37-
#include "nfp_bpf.h"
37+
#include <linux/types.h>
3838

3939
#define REG_NONE 0
4040

0 commit comments

Comments
 (0)