netsniff-ng-libs = $(shell pkg-config --libs libnl-3.0) \
$(shell pkg-config --libs libnl-genl-3.0) \
-lpthread
ifeq ($(CONFIG_LIBPCAP), 1)
netsniff-ng-libs += -lpcap
endif
ifeq ($(CONFIG_GEOIP), 1)
netsniff-ng-libs += -lGeoIP \
-lz
endif
netsniff-ng-objs = dissector.o \
dissector_eth.o \
dissector_80211.o \
proto_arp.o \
proto_ethernet.o \
proto_icmpv4.o \
proto_icmpv6.o \
proto_igmp.o \
proto_ip_authentication_hdr.o \
proto_ip_esp.o \
proto_ipv4.o \
proto_ipv6.o \
proto_ipv6_dest_opts.o \
proto_ipv6_fragm.o \
proto_ipv6_hop_by_hop.o \
proto_ipv6_in_ipv4.o \
proto_ipv6_mobility_hdr.o \
proto_ipv6_no_nxt_hdr.o \
proto_ipv6_routing.o \
proto_lldp.o \
proto_none.o \
proto_tcp.o \
proto_udp.o \
proto_vlan.o \
proto_vlan_q_in_q.o \
proto_mpls_unicast.o \
proto_80211_mac_hdr.o \
privs.o \
proc.o \
dev.o \
str.o \
sig.o \
sock.o \
irq.o \
iosched.o \
ioops.o \
link.o \
xmalloc.o \
hash.o \
bpf.o \
oui.o \
pcap_rw.o \
pcap_sg.o \
pcap_mm.o \
ring_rx.o \
ring_tx.o \
ring.o \
tprintf.o \
timer.o \
mac80211.o \
netsniff-ng.o
ifeq ($(CONFIG_LIBPCAP), 1)
netsniff-ng-objs += bpf_comp.o
endif
ifeq ($(CONFIG_GEOIP), 1)
netsniff-ng-objs += geoip.o
endif
ifeq ($(CONFIG_HWTSTAMP), 1)
netsniff-ng-objs += tstamping.o
endif
netsniff-ng-eflags = $(shell pkg-config --cflags libnl-3.0) \
$(shell pkg-config --cflags libnl-genl-3.0) \
-DHAVE_DISSECTOR_PROTOS -DNEED_TCPDUMP_LIKE_FILTER
netsniff-ng-confs = ether.conf \
tcp.conf \
udp.conf \
oui.conf \
geoip.conf
?h=nds-private-remove'>summaryrefslogtreecommitdiff
Merge branch 'libnvdimm-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/nvdimm/nvdimm
Pull DAX updates from Dan Williams:
"The completion of Jan's DAX work for 4.10.
As I mentioned in the libnvdimm-for-4.10 pull request, these are some
final fixes for the DAX dirty-cacheline-tracking invalidation work
that was merged through the -mm, ext4, and xfs trees in -rc1. These
patches were prepared prior to the merge window, but we waited for
4.10-rc1 to have a stable merge base after all the prerequisites were
merged.
Quoting Jan on the overall changes in these patches:
"So I'd like all these 6 patches to go for rc2. The first three
patches fix invalidation of exceptional DAX entries (a bug which
is there for a long time) - without these patches data loss can
occur on power failure even though user called fsync(2). The other
three patches change locking of DAX faults so that ->iomap_begin()
is called in a more relaxed locking context and we are safe to
start a transaction there for ext4"
These have received a build success notification from the kbuild
robot, and pass the latest libnvdimm unit tests. There have not been
any -next releases since -rc1, so they have not appeared there"
* 'libnvdimm-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/nvdimm/nvdimm:
ext4: Simplify DAX fault path
dax: Call ->iomap_begin without entry lock during dax fault
dax: Finish fault completely when loading holes
dax: Avoid page invalidation races and unnecessary radix tree traversals
mm: Invalidate DAX radix tree entries only if appropriate
ext2: Return BH_New buffers for zeroed blocks