Skip to content

Commit

Permalink
nfp: move eBPF offload files to BPF app directory
Browse files Browse the repository at this point in the history
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 <jakub.kicinski@netronome.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
  • Loading branch information
Jakub Kicinski authored and David S. Miller committed May 31, 2017
1 parent 2707d6f commit d9ae7f2
Show file tree
Hide file tree
Showing 6 changed files with 10 additions and 10 deletions.
6 changes: 3 additions & 3 deletions drivers/net/ethernet/netronome/nfp/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -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
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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)
{
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
2 changes: 1 addition & 1 deletion drivers/net/ethernet/netronome/nfp/nfp_asm.h
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@
#ifndef __NFP_ASM_H__
#define __NFP_ASM_H__ 1

#include "nfp_bpf.h"
#include <linux/types.h>

#define REG_NONE 0

Expand Down

0 comments on commit d9ae7f2

Please sign in to comment.