Merge branch 'master' into net-next

This commit is contained in:
Stephen Hemminger 2017-08-09 08:34:38 -07:00
commit ee66d60ee8
2 changed files with 5 additions and 6 deletions

View File

@ -1,13 +1,8 @@
eBPF toy code examples (running in kernel) to familiarize yourself eBPF toy code examples (running in kernel) to familiarize yourself
with syntax and features: with syntax and features:
- bpf_prog.c -> Classifier examples with using maps
- bpf_shared.c -> Ingress/egress map sharing example - bpf_shared.c -> Ingress/egress map sharing example
- bpf_tailcall.c -> Using tail call chains - bpf_tailcall.c -> Using tail call chains
- bpf_cyclic.c -> Simple cycle as tail calls - bpf_cyclic.c -> Simple cycle as tail calls
- bpf_graft.c -> Demo on altering runtime behaviour - bpf_graft.c -> Demo on altering runtime behaviour
- bpf_map_in_map.c -> Using map in map example
User space code example:
- bpf_agent.c -> Counterpart to bpf_prog.c for user
space to transfer/read out map data

View File

@ -4,6 +4,10 @@ ifeq ($(IP_CONFIG_SETNS),y)
CFLAGS += -DHAVE_SETNS CFLAGS += -DHAVE_SETNS
endif endif
ifeq ($(HAVE_MNL),y)
CFLAGS += -DHAVE_LIBMNL $(shell $(PKG_CONFIG) libmnl --cflags)
endif
CFLAGS += -fPIC CFLAGS += -fPIC
UTILOBJ = utils.o rt_names.o ll_types.o ll_proto.o ll_addr.o \ UTILOBJ = utils.o rt_names.o ll_types.o ll_proto.o ll_addr.o \