netsniff-ng-libs = -lpthread ifeq ($(CONFIG_LIBPCAP), 1) netsniff-ng-libs += -lpcap endif ifeq ($(CONFIG_GEOIP), 1) netsniff-ng-libs += -lGeoIP \ -lz endif ifeq ($(CONFIG_LIBNL), 1) netsniff-ng-libs += $(shell PKG_CONFIG_PATH=$(PKG_CONFIG_PATH) $(PKG_CONFIG) --libs libnl-3.0) \ $(shell PKG_CONFIG_PATH=$(PKG_CONFIG_PATH) $(PKG_CONFIG) --libs libnl-genl-3.0) \ $(shell PKG_CONFIG_PATH=$(PKG_CONFIG_PATH) $(PKG_CONFIG) --libs libnl-route-3.0) endif netsniff-ng-objs = dissector.o \ dissector_sll.o \ dissector_eth.o \ dissector_80211.o \ dissector_netlink.o \ lookup.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 \ pcap_rw.o \ pcap_sg.o \ pcap_mm.o \ ring_rx.o \ ring_tx.o \ ring.o \ tprintf.o \ timer.o \ die.o \ sysctl.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 ifeq ($(CONFIG_LIBNL), 1) netsniff-ng-objs += mac80211.o \ proto_nlmsg.o endif netsniff-ng-eflags = -DNEED_TCPDUMP_LIKE_FILTER ifeq ($(CONFIG_LIBNL), 1) netsniff-ng-eflags += $(shell PKG_CONFIG_PATH=$(PKG_CONFIG_PATH) $(PKG_CONFIG) --cflags libnl-3.0) \ $(shell PKG_CONFIG_PATH=$(PKG_CONFIG_PATH) $(PKG_CONFIG) --cflags libnl-genl-3.0) \ $(shell PKG_CONFIG_PATH=$(PKG_CONFIG_PATH) $(PKG_CONFIG) --cflags libnl-route-3.0) endif netsniff-ng-confs = ether.conf \ tcp.conf \ udp.conf \ oui.conf \ geoip.conf 974cf711fe4a18206c09d3'>diff
diff options
context:
space:
mode:
authorDavid S. Miller <davem@davemloft.net>2017-02-06 10:55:08 -0500
committerDavid S. Miller <davem@davemloft.net>2017-02-06 10:55:08 -0500
commit89389b4d5524350e74974cf711fe4a18206c09d3 (patch)
tree0ac0b66637257c82b1cf6132a052ef2d60febd49
parentebf6c9cb23d7e56eec8575a88071dec97ad5c6e2 (diff)
parentfd551bac4795854adaa87bad7e5136083719802b (diff)
Merge tag 'mac80211-for-davem-2017-02-06' of git://git.kernel.org/pub/scm/linux/kernel/git/jberg/mac80211
Johannes Berg says: ==================== A few simple fixes: * fix FILS AEAD cipher usage to use the correct AAD vectors and to use synchronous algorithms * fix using mesh HT operation data from userspace * fix adding mesh vendor elements to beacons & plink frames ==================== Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat
-rw-r--r--net/mac80211/fils_aead.c6
-rw-r--r--net/mac80211/mesh.c2
-rw-r--r--net/wireless/nl80211.c1
3 files changed, 5 insertions, 4 deletions
diff --git a/net/mac80211/fils_aead.c b/net/mac80211/fils_aead.c