Merge tag 'batman-adv-for-davem' of git://git.open-mesh.org/linux-merge (e87183c2) · Commits · 戴 / test

Included changes: - The last batch of patches aimed to clean the batman-adv namespace - a couple of style fixes - a fix for the ethtool support - a fix to prevent sending unicast packets with an uninitialised header field Signed-off-by:

David S. Miller <davem@davemloft.net>

net/batman-adv/Makefile

+2 −2

Original line number	Diff line number	Diff line
		@@ -19,11 +19,10 @@
		#

		obj-$(CONFIG_BATMAN_ADV) += batman-adv.o
		batman-adv-y += bat_debugfs.o
		batman-adv-y += bat_iv_ogm.o
		batman-adv-y += bat_sysfs.o
		batman-adv-y += bitarray.o
		batman-adv-$(CONFIG_BATMAN_ADV_BLA) += bridge_loop_avoidance.o
		batman-adv-y += debugfs.o
		batman-adv-y += gateway_client.o
		batman-adv-y += gateway_common.o
		batman-adv-y += hard-interface.o
		@@ -35,6 +34,7 @@ batman-adv-y += ring_buffer.o
		batman-adv-y += routing.o
		batman-adv-y += send.o
		batman-adv-y += soft-interface.o
		batman-adv-y += sysfs.o
		batman-adv-y += translation-table.o
		batman-adv-y += unicast.o
		batman-adv-y += vis.o

Admin message