B.A.T.M.A.N

b.a.t.m.a.n@lists.open-mesh.org

15 participants
4308 discussions

[B.A.T.M.A.N.] [PATCH RFCv4 0/3] batman-adv: Unicasting multicast reports to querier-node only
by Linus Lüssing 04 May '15

04 May '15

The last round of multicast patches send to the batman-adv mailinglist to add support for the multicast optimizations in bridged scenarios, too, unfortunately had one major conceptual flaw: It could lead to packet loss. It's not sufficient to have the unicasting of reports implemented on bridge-nodes only. Nodes without bridges need to treat reports the same way. The issue is described in detail here: https://www.open-mesh.org/projects/batman-adv/wiki/Multicast-optimizations-… Cheers, Linus ----- Changelog: v4: * excluded bridge part from this patchset, they should hopefully be added to net-next soon * Added a compat solution (PATCH 3/3) * Removed Kconfig-depends as by David's suggestion the needed parsing functions for MLD are going to be forced built-ins even if IPv6 is going to be built as a module * Removed unused variable 'int ret' in batadv_mcast_is_report_ipv6() * Adjusted to new folder structure v3: * Adding Kconfig-depends and #if's (so basically adding similar dependancy constraints as the bridge code has, except that there are no depends if batman-adv gets compiled without multicast optimizations) -> the case of IPv6=M and batman-adv=y is still impossible if multicast optimizations are enabled; but I don't see the practical demand for that either - people who use IPv6 as a module will probably also want to use batman-adv as a module v2: * various bugfixes (now runtime tested, too - should(tm) work) * added netdev+bridge mailinglists

1 3

[B.A.T.M.A.N.] [PATCHv3 net-next 0/2] Exporting IGMP/MLD checking from bridge code
by Linus Lüssing 04 May '15

04 May '15

The multicast optimizations in batman-adv are yet only usable and enabled in non-bridged scenarios. To be able to support bridged setups batman-adv needs to be able to detect IGMP/MLD queriers and reports on mesh nodes without bridges, too. See the following link for details: http://www.open-mesh.org/projects/batman-adv/wiki/Multicast-optimizations-l… To avoid duplicate code between the bridge and batman-adv, the IGMP/MLD message validation code is moved from the bridge to the IPv4/IPv6 stack. On the way, some refactoring to increase readability and to iron out some subtle differences between the IGMP and MLD parsing code is done. Cheers, Linus Changelog v3: * changed interface / restructuring of skb_checksum_trimmed() * kernel doc for skb_checksum_trimmed()/skb_checksum_maybe_trim() * fixed a memory leak in the cloned skb case in skb_checksum_trimmed() * fixed transport_len calculation in __ipv6_mc_check_mld(), make it relative to the skb transport header offset (= exclude the hop-by-hop option size in transport_len) Changelog v2: * Updated copyright for mcast_snoop.c

3 4

[B.A.T.M.A.N.] [PATCH 1/2] batman-adv: Clarify calculation precedence for '&' and '?'
by Sven Eckelmann 26 Apr '15

26 Apr '15

Signed-off-by: Sven Eckelmann <sven(a)narfation.org> --- net/batman-adv/bat_iv_ogm.c | 2 +- net/batman-adv/main.h | 2 +- net/batman-adv/translation-table.c | 42 +++++++++++++++++++------------------- 3 files changed, 23 insertions(+), 23 deletions(-) diff --git a/net/batman-adv/bat_iv_ogm.c b/net/batman-adv/bat_iv_ogm.c index 9adbc61..753383c 100644 --- a/net/batman-adv/bat_iv_ogm.c +++ b/net/batman-adv/bat_iv_ogm.c @@ -479,7 +479,7 @@ static void batadv_iv_ogm_send_to_if(struct batadv_forw_packet *forw_packet, batadv_ogm_packet->orig, ntohl(batadv_ogm_packet->seqno), batadv_ogm_packet->tq, batadv_ogm_packet->ttl, - (batadv_ogm_packet->flags & BATADV_DIRECTLINK ? + ((batadv_ogm_packet->flags & BATADV_DIRECTLINK) ? "on" : "off"), hard_iface->net_dev->name, hard_iface->net_dev->dev_addr); diff --git a/net/batman-adv/main.h b/net/batman-adv/main.h index 4cb77ed..3c981d0 100644 --- a/net/batman-adv/main.h +++ b/net/batman-adv/main.h @@ -182,7 +182,7 @@ struct batadv_ogm_packet; struct seq_file; struct sk_buff; -#define BATADV_PRINT_VID(vid) (vid & BATADV_VLAN_HAS_TAG ? \ +#define BATADV_PRINT_VID(vid) ((vid & BATADV_VLAN_HAS_TAG) ? \ (int)(vid & VLAN_VID_MASK) : -1) extern char batadv_routing_algo[]; diff --git a/net/batman-adv/translation-table.c b/net/batman-adv/translation-table.c index 0611c58..b482495 100644 --- a/net/batman-adv/translation-table.c +++ b/net/batman-adv/translation-table.c @@ -973,17 +973,17 @@ int batadv_tt_local_seq_print_text(struct seq_file *seq, void *offset) " * %pM %4i [%c%c%c%c%c%c] %3u.%03u (%#.8x)\n", tt_common_entry->addr, BATADV_PRINT_VID(tt_common_entry->vid), - (tt_common_entry->flags & - BATADV_TT_CLIENT_ROAM ? 'R' : '.'), + ((tt_common_entry->flags & + BATADV_TT_CLIENT_ROAM) ? 'R' : '.'), no_purge ? 'P' : '.', - (tt_common_entry->flags & - BATADV_TT_CLIENT_NEW ? 'N' : '.'), - (tt_common_entry->flags & - BATADV_TT_CLIENT_PENDING ? 'X' : '.'), - (tt_common_entry->flags & - BATADV_TT_CLIENT_WIFI ? 'W' : '.'), - (tt_common_entry->flags & - BATADV_TT_CLIENT_ISOLA ? 'I' : '.'), + ((tt_common_entry->flags & + BATADV_TT_CLIENT_NEW) ? 'N' : '.'), + ((tt_common_entry->flags & + BATADV_TT_CLIENT_PENDING) ? 'X' : '.'), + ((tt_common_entry->flags & + BATADV_TT_CLIENT_WIFI) ? 'W' : '.'), + ((tt_common_entry->flags & + BATADV_TT_CLIENT_ISOLA) ? 'I' : '.'), no_purge ? 0 : last_seen_secs, no_purge ? 0 : last_seen_msecs, vlan->tt.crc); @@ -1547,10 +1547,10 @@ batadv_tt_global_print_entry(struct batadv_priv *bat_priv, BATADV_PRINT_VID(tt_global_entry->common.vid), best_entry->ttvn, best_entry->orig_node->orig, last_ttvn, vlan->tt.crc, - (flags & BATADV_TT_CLIENT_ROAM ? 'R' : '.'), - (flags & BATADV_TT_CLIENT_WIFI ? 'W' : '.'), - (flags & BATADV_TT_CLIENT_ISOLA ? 'I' : '.'), - (flags & BATADV_TT_CLIENT_TEMP ? 'T' : '.')); + ((flags & BATADV_TT_CLIENT_ROAM) ? 'R' : '.'), + ((flags & BATADV_TT_CLIENT_WIFI) ? 'W' : '.'), + ((flags & BATADV_TT_CLIENT_ISOLA) ? 'I' : '.'), + ((flags & BATADV_TT_CLIENT_TEMP) ? 'T' : '.')); batadv_orig_node_vlan_free_ref(vlan); } @@ -1579,10 +1579,10 @@ print_list: BATADV_PRINT_VID(tt_global_entry->common.vid), orig_entry->ttvn, orig_entry->orig_node->orig, last_ttvn, vlan->tt.crc, - (flags & BATADV_TT_CLIENT_ROAM ? 'R' : '.'), - (flags & BATADV_TT_CLIENT_WIFI ? 'W' : '.'), - (flags & BATADV_TT_CLIENT_ISOLA ? 'I' : '.'), - (flags & BATADV_TT_CLIENT_TEMP ? 'T' : '.')); + ((flags & BATADV_TT_CLIENT_ROAM) ? 'R' : '.'), + ((flags & BATADV_TT_CLIENT_WIFI) ? 'W' : '.'), + ((flags & BATADV_TT_CLIENT_ISOLA) ? 'I' : '.'), + ((flags & BATADV_TT_CLIENT_TEMP) ? 'T' : '.')); batadv_orig_node_vlan_free_ref(vlan); } @@ -2548,7 +2548,7 @@ static bool batadv_send_other_tt_response(struct batadv_priv *bat_priv, batadv_dbg(BATADV_DBG_TT, bat_priv, "Received TT_REQUEST from %pM for ttvn: %u (%pM) [%c]\n", req_src, tt_data->ttvn, req_dst, - (tt_data->flags & BATADV_TT_FULL_TABLE ? 'F' : '.')); + ((tt_data->flags & BATADV_TT_FULL_TABLE) ? 'F' : '.')); /* Let's get the orig node of the REAL destination */ req_dst_orig_node = batadv_orig_hash_find(bat_priv, req_dst); @@ -2679,7 +2679,7 @@ static bool batadv_send_my_tt_response(struct batadv_priv *bat_priv, batadv_dbg(BATADV_DBG_TT, bat_priv, "Received TT_REQUEST from %pM for ttvn: %u (me) [%c]\n", req_src, tt_data->ttvn, - (tt_data->flags & BATADV_TT_FULL_TABLE ? 'F' : '.')); + ((tt_data->flags & BATADV_TT_FULL_TABLE) ? 'F' : '.')); spin_lock_bh(&bat_priv->tt.commit_lock); @@ -2918,7 +2918,7 @@ static void batadv_handle_tt_response(struct batadv_priv *bat_priv, batadv_dbg(BATADV_DBG_TT, bat_priv, "Received TT_RESPONSE from %pM for ttvn %d t_size: %d [%c]\n", resp_src, tt_data->ttvn, num_entries, - (tt_data->flags & BATADV_TT_FULL_TABLE ? 'F' : '.')); + ((tt_data->flags & BATADV_TT_FULL_TABLE) ? 'F' : '.')); orig_node = batadv_orig_hash_find(bat_priv, resp_src); if (!orig_node) -- 2.1.4

2 3

[B.A.T.M.A.N.] [PATCHv3 1/3] batman-adv: Use kernel-like folder structure
by Sven Eckelmann 26 Apr '15

26 Apr '15

The person submitting the patches to the Networking maintainer has to take each patch and move files around and add some files to make it work in the actual kernel tree. Having all files included and already in the correct kernel tree layout should make this a lot easier. The only files not part of the kernel tree are compat-include and every regular file in the top level directory. Signed-off-by: Sven Eckelmann <sven(a)narfation.org> --- v3: Rebased it on current master without the the hashtable patches v2: * Cleaned up the Makefile * Rebased on top of 9f01c16a4409e43e86629418fae9184fabb59da5 * Use symlink to show the Documentation/networking/batman-adv.txt as README in the root folder .../ABI/testing/sysfs-class-net-batman-adv | 0 .../ABI/testing/sysfs-class-net-mesh | 0 README => Documentation/networking/batman-adv.txt | 0 Makefile | 22 +++++++++++++++------- Makefile.kbuild => net/batman-adv/Makefile | 0 bat_algo.h => net/batman-adv/bat_algo.h | 0 bat_iv_ogm.c => net/batman-adv/bat_iv_ogm.c | 0 bitarray.c => net/batman-adv/bitarray.c | 0 bitarray.h => net/batman-adv/bitarray.h | 0 .../batman-adv/bridge_loop_avoidance.c | 0 .../batman-adv/bridge_loop_avoidance.h | 0 debugfs.c => net/batman-adv/debugfs.c | 0 debugfs.h => net/batman-adv/debugfs.h | 0 .../batman-adv/distributed-arp-table.c | 0 .../batman-adv/distributed-arp-table.h | 0 fragmentation.c => net/batman-adv/fragmentation.c | 0 fragmentation.h => net/batman-adv/fragmentation.h | 0 .../batman-adv/gateway_client.c | 0 .../batman-adv/gateway_client.h | 0 .../batman-adv/gateway_common.c | 0 .../batman-adv/gateway_common.h | 0 .../batman-adv/hard-interface.c | 0 .../batman-adv/hard-interface.h | 0 hash.c => net/batman-adv/hash.c | 0 hash.h => net/batman-adv/hash.h | 0 icmp_socket.c => net/batman-adv/icmp_socket.c | 0 icmp_socket.h => net/batman-adv/icmp_socket.h | 0 main.c => net/batman-adv/main.c | 0 main.h => net/batman-adv/main.h | 0 multicast.c => net/batman-adv/multicast.c | 0 multicast.h => net/batman-adv/multicast.h | 0 .../batman-adv/network-coding.c | 0 .../batman-adv/network-coding.h | 0 originator.c => net/batman-adv/originator.c | 0 originator.h => net/batman-adv/originator.h | 0 packet.h => net/batman-adv/packet.h | 0 routing.c => net/batman-adv/routing.c | 0 routing.h => net/batman-adv/routing.h | 0 send.c => net/batman-adv/send.c | 0 send.h => net/batman-adv/send.h | 0 .../batman-adv/soft-interface.c | 0 .../batman-adv/soft-interface.h | 0 sysfs.c => net/batman-adv/sysfs.c | 0 sysfs.h => net/batman-adv/sysfs.h | 0 .../batman-adv/translation-table.c | 0 .../batman-adv/translation-table.h | 0 types.h => net/batman-adv/types.h | 0 47 files changed, 15 insertions(+), 7 deletions(-) rename sysfs-class-net-batman-adv => Documentation/ABI/testing/sysfs-class-net-batman-adv (100%) rename sysfs-class-net-mesh => Documentation/ABI/testing/sysfs-class-net-mesh (100%) rename README => Documentation/networking/batman-adv.txt (100%) rename Makefile.kbuild => net/batman-adv/Makefile (100%) rename bat_algo.h => net/batman-adv/bat_algo.h (100%) rename bat_iv_ogm.c => net/batman-adv/bat_iv_ogm.c (100%) rename bitarray.c => net/batman-adv/bitarray.c (100%) rename bitarray.h => net/batman-adv/bitarray.h (100%) rename bridge_loop_avoidance.c => net/batman-adv/bridge_loop_avoidance.c (100%) rename bridge_loop_avoidance.h => net/batman-adv/bridge_loop_avoidance.h (100%) rename debugfs.c => net/batman-adv/debugfs.c (100%) rename debugfs.h => net/batman-adv/debugfs.h (100%) rename distributed-arp-table.c => net/batman-adv/distributed-arp-table.c (100%) rename distributed-arp-table.h => net/batman-adv/distributed-arp-table.h (100%) rename fragmentation.c => net/batman-adv/fragmentation.c (100%) rename fragmentation.h => net/batman-adv/fragmentation.h (100%) rename gateway_client.c => net/batman-adv/gateway_client.c (100%) rename gateway_client.h => net/batman-adv/gateway_client.h (100%) rename gateway_common.c => net/batman-adv/gateway_common.c (100%) rename gateway_common.h => net/batman-adv/gateway_common.h (100%) rename hard-interface.c => net/batman-adv/hard-interface.c (100%) rename hard-interface.h => net/batman-adv/hard-interface.h (100%) rename hash.c => net/batman-adv/hash.c (100%) rename hash.h => net/batman-adv/hash.h (100%) rename icmp_socket.c => net/batman-adv/icmp_socket.c (100%) rename icmp_socket.h => net/batman-adv/icmp_socket.h (100%) rename main.c => net/batman-adv/main.c (100%) rename main.h => net/batman-adv/main.h (100%) rename multicast.c => net/batman-adv/multicast.c (100%) rename multicast.h => net/batman-adv/multicast.h (100%) rename network-coding.c => net/batman-adv/network-coding.c (100%) rename network-coding.h => net/batman-adv/network-coding.h (100%) rename originator.c => net/batman-adv/originator.c (100%) rename originator.h => net/batman-adv/originator.h (100%) rename packet.h => net/batman-adv/packet.h (100%) rename routing.c => net/batman-adv/routing.c (100%) rename routing.h => net/batman-adv/routing.h (100%) rename send.c => net/batman-adv/send.c (100%) rename send.h => net/batman-adv/send.h (100%) rename soft-interface.c => net/batman-adv/soft-interface.c (100%) rename soft-interface.h => net/batman-adv/soft-interface.h (100%) rename sysfs.c => net/batman-adv/sysfs.c (100%) rename sysfs.h => net/batman-adv/sysfs.h (100%) rename translation-table.c => net/batman-adv/translation-table.c (100%) rename translation-table.h => net/batman-adv/translation-table.h (100%) rename types.h => net/batman-adv/types.h (100%) diff --git a/sysfs-class-net-batman-adv b/Documentation/ABI/testing/sysfs-class-net-batman-adv similarity index 100% rename from sysfs-class-net-batman-adv rename to Documentation/ABI/testing/sysfs-class-net-batman-adv diff --git a/sysfs-class-net-mesh b/Documentation/ABI/testing/sysfs-class-net-mesh similarity index 100% rename from sysfs-class-net-mesh rename to Documentation/ABI/testing/sysfs-class-net-mesh diff --git a/README b/Documentation/networking/batman-adv.txt similarity index 100% rename from README rename to Documentation/networking/batman-adv.txt diff --git a/Makefile b/Makefile index e57fcb3..8a04d12 100644 --- a/Makefile +++ b/Makefile @@ -41,26 +41,34 @@ RM ?= rm -f REVISION= $(shell if [ -d "$(PWD)/.git" ]; then \ echo $$(git --git-dir="$(PWD)/.git" describe --always --dirty --match "v*" |sed 's/^v//' 2> /dev/null || echo "[unknown]"); \ fi) -NOSTDINC_FLAGS := \ +export NOSTDINC_FLAGS := \ -I$(PWD)/compat-include/ \ -include $(PWD)/compat.h \ $(CFLAGS) -CONFIG_BATMAN_ADV=m ifneq ($(REVISION),) -ccflags-y += -DBATADV_SOURCE_VERSION=\"$(REVISION)\" +NOSTDINC_FLAGS += -DBATADV_SOURCE_VERSION=\"$(REVISION)\" endif -include $(PWD)/Makefile.kbuild + +BUILD_FLAGS := \ + M=$(PWD)/net/batman-adv \ + CONFIG_BATMAN_ADV=m \ + CONFIG_BATMAN_ADV_DEBUG=$(CONFIG_BATMAN_ADV_DEBUG) \ + CONFIG_BATMAN_ADV_BLA=$(CONFIG_BATMAN_ADV_BLA) \ + CONFIG_BATMAN_ADV_DAT=$(CONFIG_BATMAN_ADV_DAT) \ + CONFIG_BATMAN_ADV_NC=$(CONFIG_BATMAN_ADV_NC) \ + CONFIG_BATMAN_ADV_MCAST=$(CONFIG_BATMAN_ADV_MCAST) \ + INSTALL_MOD_DIR=updates/net/batman-adv/ all: config - $(MAKE) -C $(KERNELPATH) M=$(PWD) PWD=$(PWD) modules + $(MAKE) -C $(KERNELPATH) $(BUILD_FLAGS) modules clean: $(RM) compat-autoconf.h* - $(MAKE) -C $(KERNELPATH) M=$(PWD) PWD=$(PWD) clean + $(MAKE) -C $(KERNELPATH) $(BUILD_FLAGS) clean install: config - $(MAKE) -C $(KERNELPATH) M=$(PWD) PWD=$(PWD) INSTALL_MOD_DIR=updates/net/batman-adv/ modules_install + $(MAKE) -C $(KERNELPATH) $(BUILD_FLAGS) modules_install depmod -a config: diff --git a/Makefile.kbuild b/net/batman-adv/Makefile similarity index 100% rename from Makefile.kbuild rename to net/batman-adv/Makefile diff --git a/bat_algo.h b/net/batman-adv/bat_algo.h similarity index 100% rename from bat_algo.h rename to net/batman-adv/bat_algo.h diff --git a/bat_iv_ogm.c b/net/batman-adv/bat_iv_ogm.c similarity index 100% rename from bat_iv_ogm.c rename to net/batman-adv/bat_iv_ogm.c diff --git a/bitarray.c b/net/batman-adv/bitarray.c similarity index 100% rename from bitarray.c rename to net/batman-adv/bitarray.c diff --git a/bitarray.h b/net/batman-adv/bitarray.h similarity index 100% rename from bitarray.h rename to net/batman-adv/bitarray.h diff --git a/bridge_loop_avoidance.c b/net/batman-adv/bridge_loop_avoidance.c similarity index 100% rename from bridge_loop_avoidance.c rename to net/batman-adv/bridge_loop_avoidance.c diff --git a/bridge_loop_avoidance.h b/net/batman-adv/bridge_loop_avoidance.h similarity index 100% rename from bridge_loop_avoidance.h rename to net/batman-adv/bridge_loop_avoidance.h diff --git a/debugfs.c b/net/batman-adv/debugfs.c similarity index 100% rename from debugfs.c rename to net/batman-adv/debugfs.c diff --git a/debugfs.h b/net/batman-adv/debugfs.h similarity index 100% rename from debugfs.h rename to net/batman-adv/debugfs.h diff --git a/distributed-arp-table.c b/net/batman-adv/distributed-arp-table.c similarity index 100% rename from distributed-arp-table.c rename to net/batman-adv/distributed-arp-table.c diff --git a/distributed-arp-table.h b/net/batman-adv/distributed-arp-table.h similarity index 100% rename from distributed-arp-table.h rename to net/batman-adv/distributed-arp-table.h diff --git a/fragmentation.c b/net/batman-adv/fragmentation.c similarity index 100% rename from fragmentation.c rename to net/batman-adv/fragmentation.c diff --git a/fragmentation.h b/net/batman-adv/fragmentation.h similarity index 100% rename from fragmentation.h rename to net/batman-adv/fragmentation.h diff --git a/gateway_client.c b/net/batman-adv/gateway_client.c similarity index 100% rename from gateway_client.c rename to net/batman-adv/gateway_client.c diff --git a/gateway_client.h b/net/batman-adv/gateway_client.h similarity index 100% rename from gateway_client.h rename to net/batman-adv/gateway_client.h diff --git a/gateway_common.c b/net/batman-adv/gateway_common.c similarity index 100% rename from gateway_common.c rename to net/batman-adv/gateway_common.c diff --git a/gateway_common.h b/net/batman-adv/gateway_common.h similarity index 100% rename from gateway_common.h rename to net/batman-adv/gateway_common.h diff --git a/hard-interface.c b/net/batman-adv/hard-interface.c similarity index 100% rename from hard-interface.c rename to net/batman-adv/hard-interface.c diff --git a/hard-interface.h b/net/batman-adv/hard-interface.h similarity index 100% rename from hard-interface.h rename to net/batman-adv/hard-interface.h diff --git a/hash.c b/net/batman-adv/hash.c similarity index 100% rename from hash.c rename to net/batman-adv/hash.c diff --git a/hash.h b/net/batman-adv/hash.h similarity index 100% rename from hash.h rename to net/batman-adv/hash.h diff --git a/icmp_socket.c b/net/batman-adv/icmp_socket.c similarity index 100% rename from icmp_socket.c rename to net/batman-adv/icmp_socket.c diff --git a/icmp_socket.h b/net/batman-adv/icmp_socket.h similarity index 100% rename from icmp_socket.h rename to net/batman-adv/icmp_socket.h diff --git a/main.c b/net/batman-adv/main.c similarity index 100% rename from main.c rename to net/batman-adv/main.c diff --git a/main.h b/net/batman-adv/main.h similarity index 100% rename from main.h rename to net/batman-adv/main.h diff --git a/multicast.c b/net/batman-adv/multicast.c similarity index 100% rename from multicast.c rename to net/batman-adv/multicast.c diff --git a/multicast.h b/net/batman-adv/multicast.h similarity index 100% rename from multicast.h rename to net/batman-adv/multicast.h diff --git a/network-coding.c b/net/batman-adv/network-coding.c similarity index 100% rename from network-coding.c rename to net/batman-adv/network-coding.c diff --git a/network-coding.h b/net/batman-adv/network-coding.h similarity index 100% rename from network-coding.h rename to net/batman-adv/network-coding.h diff --git a/originator.c b/net/batman-adv/originator.c similarity index 100% rename from originator.c rename to net/batman-adv/originator.c diff --git a/originator.h b/net/batman-adv/originator.h similarity index 100% rename from originator.h rename to net/batman-adv/originator.h diff --git a/packet.h b/net/batman-adv/packet.h similarity index 100% rename from packet.h rename to net/batman-adv/packet.h diff --git a/routing.c b/net/batman-adv/routing.c similarity index 100% rename from routing.c rename to net/batman-adv/routing.c diff --git a/routing.h b/net/batman-adv/routing.h similarity index 100% rename from routing.h rename to net/batman-adv/routing.h diff --git a/send.c b/net/batman-adv/send.c similarity index 100% rename from send.c rename to net/batman-adv/send.c diff --git a/send.h b/net/batman-adv/send.h similarity index 100% rename from send.h rename to net/batman-adv/send.h diff --git a/soft-interface.c b/net/batman-adv/soft-interface.c similarity index 100% rename from soft-interface.c rename to net/batman-adv/soft-interface.c diff --git a/soft-interface.h b/net/batman-adv/soft-interface.h similarity index 100% rename from soft-interface.h rename to net/batman-adv/soft-interface.h diff --git a/sysfs.c b/net/batman-adv/sysfs.c similarity index 100% rename from sysfs.c rename to net/batman-adv/sysfs.c diff --git a/sysfs.h b/net/batman-adv/sysfs.h similarity index 100% rename from sysfs.h rename to net/batman-adv/sysfs.h diff --git a/translation-table.c b/net/batman-adv/translation-table.c similarity index 100% rename from translation-table.c rename to net/batman-adv/translation-table.c diff --git a/translation-table.h b/net/batman-adv/translation-table.h similarity index 100% rename from translation-table.h rename to net/batman-adv/translation-table.h diff --git a/types.h b/net/batman-adv/types.h similarity index 100% rename from types.h rename to net/batman-adv/types.h -- 2.1.4

2 5

[B.A.T.M.A.N.] [PATCH 1/2] batman-adv: update copyright years for 2015
by Sven Eckelmann 26 Apr '15

26 Apr '15

Signed-off-by: Sven Eckelmann <sven(a)narfation.org> --- Makefile.kbuild | 2 +- bat_algo.h | 2 +- bat_iv_ogm.c | 2 +- bitarray.c | 2 +- bitarray.h | 2 +- bridge_loop_avoidance.c | 2 +- bridge_loop_avoidance.h | 2 +- debugfs.c | 2 +- debugfs.h | 2 +- distributed-arp-table.c | 2 +- distributed-arp-table.h | 2 +- fragmentation.c | 2 +- fragmentation.h | 2 +- gateway_client.c | 2 +- gateway_client.h | 2 +- gateway_common.c | 2 +- gateway_common.h | 2 +- hard-interface.c | 2 +- hard-interface.h | 2 +- hash.c | 2 +- hash.h | 2 +- icmp_socket.c | 2 +- icmp_socket.h | 2 +- main.c | 2 +- main.h | 2 +- multicast.c | 2 +- multicast.h | 2 +- network-coding.c | 2 +- network-coding.h | 2 +- originator.c | 2 +- originator.h | 2 +- packet.h | 2 +- routing.c | 2 +- routing.h | 2 +- send.c | 2 +- send.h | 2 +- soft-interface.c | 2 +- soft-interface.h | 2 +- sysfs.c | 2 +- sysfs.h | 2 +- translation-table.c | 2 +- translation-table.h | 2 +- types.h | 2 +- 43 files changed, 43 insertions(+), 43 deletions(-) diff --git a/Makefile.kbuild b/Makefile.kbuild index 6903703..21434ab 100644 --- a/Makefile.kbuild +++ b/Makefile.kbuild @@ -1,5 +1,5 @@ # -# Copyright (C) 2007-2014 B.A.T.M.A.N. contributors: +# Copyright (C) 2007-2015 B.A.T.M.A.N. contributors: # # Marek Lindner, Simon Wunderlich # diff --git a/bat_algo.h b/bat_algo.h index 4e49666..4e59cf3 100644 --- a/bat_algo.h +++ b/bat_algo.h @@ -1,4 +1,4 @@ -/* Copyright (C) 2011-2014 B.A.T.M.A.N. contributors: +/* Copyright (C) 2011-2015 B.A.T.M.A.N. contributors: * * Marek Lindner * diff --git a/bat_iv_ogm.c b/bat_iv_ogm.c index f3214ed..9adbc61 100644 --- a/bat_iv_ogm.c +++ b/bat_iv_ogm.c @@ -1,4 +1,4 @@ -/* Copyright (C) 2007-2014 B.A.T.M.A.N. contributors: +/* Copyright (C) 2007-2015 B.A.T.M.A.N. contributors: * * Marek Lindner, Simon Wunderlich * diff --git a/bitarray.c b/bitarray.c index ea483f5..cf68c32 100644 --- a/bitarray.c +++ b/bitarray.c @@ -1,4 +1,4 @@ -/* Copyright (C) 2006-2014 B.A.T.M.A.N. contributors: +/* Copyright (C) 2006-2015 B.A.T.M.A.N. contributors: * * Simon Wunderlich, Marek Lindner * diff --git a/bitarray.h b/bitarray.h index 0240fc2..0c24562 100644 --- a/bitarray.h +++ b/bitarray.h @@ -1,4 +1,4 @@ -/* Copyright (C) 2006-2014 B.A.T.M.A.N. contributors: +/* Copyright (C) 2006-2015 B.A.T.M.A.N. contributors: * * Simon Wunderlich, Marek Lindner * diff --git a/bridge_loop_avoidance.c b/bridge_loop_avoidance.c index 1882b91..ba06092 100644 --- a/bridge_loop_avoidance.c +++ b/bridge_loop_avoidance.c @@ -1,4 +1,4 @@ -/* Copyright (C) 2011-2014 B.A.T.M.A.N. contributors: +/* Copyright (C) 2011-2015 B.A.T.M.A.N. contributors: * * Simon Wunderlich * diff --git a/bridge_loop_avoidance.h b/bridge_loop_avoidance.h index 1318805..0282690 100644 --- a/bridge_loop_avoidance.h +++ b/bridge_loop_avoidance.h @@ -1,4 +1,4 @@ -/* Copyright (C) 2011-2014 B.A.T.M.A.N. contributors: +/* Copyright (C) 2011-2015 B.A.T.M.A.N. contributors: * * Simon Wunderlich * diff --git a/debugfs.c b/debugfs.c index e7d6f1a..c4c1e80 100644 --- a/debugfs.c +++ b/debugfs.c @@ -1,4 +1,4 @@ -/* Copyright (C) 2010-2014 B.A.T.M.A.N. contributors: +/* Copyright (C) 2010-2015 B.A.T.M.A.N. contributors: * * Marek Lindner * diff --git a/debugfs.h b/debugfs.h index ce085b8..187acdc 100644 --- a/debugfs.h +++ b/debugfs.h @@ -1,4 +1,4 @@ -/* Copyright (C) 2010-2014 B.A.T.M.A.N. contributors: +/* Copyright (C) 2010-2015 B.A.T.M.A.N. contributors: * * Marek Lindner * diff --git a/distributed-arp-table.c b/distributed-arp-table.c index 0b3d13d..fb54e6a 100644 --- a/distributed-arp-table.c +++ b/distributed-arp-table.c @@ -1,4 +1,4 @@ -/* Copyright (C) 2011-2014 B.A.T.M.A.N. contributors: +/* Copyright (C) 2011-2015 B.A.T.M.A.N. contributors: * * Antonio Quartulli * diff --git a/distributed-arp-table.h b/distributed-arp-table.h index 7fe6cd9..3181507 100644 --- a/distributed-arp-table.h +++ b/distributed-arp-table.h @@ -1,4 +1,4 @@ -/* Copyright (C) 2011-2014 B.A.T.M.A.N. contributors: +/* Copyright (C) 2011-2015 B.A.T.M.A.N. contributors: * * Antonio Quartulli * diff --git a/fragmentation.c b/fragmentation.c index 124356a..c0f0d01 100644 --- a/fragmentation.c +++ b/fragmentation.c @@ -1,4 +1,4 @@ -/* Copyright (C) 2013-2014 B.A.T.M.A.N. contributors: +/* Copyright (C) 2013-2015 B.A.T.M.A.N. contributors: * * Martin Hundebøll <martin(a)hundeboll.net> * diff --git a/fragmentation.h b/fragmentation.h index 7436a57..8b9877e 100644 --- a/fragmentation.h +++ b/fragmentation.h @@ -1,4 +1,4 @@ -/* Copyright (C) 2013-2014 B.A.T.M.A.N. contributors: +/* Copyright (C) 2013-2015 B.A.T.M.A.N. contributors: * * Martin Hundebøll <martin(a)hundeboll.net> * diff --git a/gateway_client.c b/gateway_client.c index 9b2ef82..14f0a22 100644 --- a/gateway_client.c +++ b/gateway_client.c @@ -1,4 +1,4 @@ -/* Copyright (C) 2009-2014 B.A.T.M.A.N. contributors: +/* Copyright (C) 2009-2015 B.A.T.M.A.N. contributors: * * Marek Lindner * diff --git a/gateway_client.h b/gateway_client.h index 60a52d5..89565b4 100644 --- a/gateway_client.h +++ b/gateway_client.h @@ -1,4 +1,4 @@ -/* Copyright (C) 2009-2014 B.A.T.M.A.N. contributors: +/* Copyright (C) 2009-2015 B.A.T.M.A.N. contributors: * * Marek Lindner * diff --git a/gateway_common.c b/gateway_common.c index f5d6734..39cf44c 100644 --- a/gateway_common.c +++ b/gateway_common.c @@ -1,4 +1,4 @@ -/* Copyright (C) 2009-2014 B.A.T.M.A.N. contributors: +/* Copyright (C) 2009-2015 B.A.T.M.A.N. contributors: * * Marek Lindner * diff --git a/gateway_common.h b/gateway_common.h index 2020c0f..bd5c812 100644 --- a/gateway_common.h +++ b/gateway_common.h @@ -1,4 +1,4 @@ -/* Copyright (C) 2009-2014 B.A.T.M.A.N. contributors: +/* Copyright (C) 2009-2015 B.A.T.M.A.N. contributors: * * Marek Lindner * diff --git a/hard-interface.c b/hard-interface.c index a05cf66..f4a15d2 100644 --- a/hard-interface.c +++ b/hard-interface.c @@ -1,4 +1,4 @@ -/* Copyright (C) 2007-2014 B.A.T.M.A.N. contributors: +/* Copyright (C) 2007-2015 B.A.T.M.A.N. contributors: * * Marek Lindner, Simon Wunderlich * diff --git a/hard-interface.h b/hard-interface.h index 1012a5b..5a31420 100644 --- a/hard-interface.h +++ b/hard-interface.h @@ -1,4 +1,4 @@ -/* Copyright (C) 2007-2014 B.A.T.M.A.N. contributors: +/* Copyright (C) 2007-2015 B.A.T.M.A.N. contributors: * * Marek Lindner, Simon Wunderlich * diff --git a/hash.c b/hash.c index 0532dc9..e89f314 100644 --- a/hash.c +++ b/hash.c @@ -1,4 +1,4 @@ -/* Copyright (C) 2006-2014 B.A.T.M.A.N. contributors: +/* Copyright (C) 2006-2015 B.A.T.M.A.N. contributors: * * Simon Wunderlich, Marek Lindner * diff --git a/hash.h b/hash.h index b7cc418..5065f50 100644 --- a/hash.h +++ b/hash.h @@ -1,4 +1,4 @@ -/* Copyright (C) 2006-2014 B.A.T.M.A.N. contributors: +/* Copyright (C) 2006-2015 B.A.T.M.A.N. contributors: * * Simon Wunderlich, Marek Lindner * diff --git a/icmp_socket.c b/icmp_socket.c index c09342c..07061bc 100644 --- a/icmp_socket.c +++ b/icmp_socket.c @@ -1,4 +1,4 @@ -/* Copyright (C) 2007-2014 B.A.T.M.A.N. contributors: +/* Copyright (C) 2007-2015 B.A.T.M.A.N. contributors: * * Marek Lindner * diff --git a/icmp_socket.h b/icmp_socket.h index 0189910..7de7fce 100644 --- a/icmp_socket.h +++ b/icmp_socket.h @@ -1,4 +1,4 @@ -/* Copyright (C) 2007-2014 B.A.T.M.A.N. contributors: +/* Copyright (C) 2007-2015 B.A.T.M.A.N. contributors: * * Marek Lindner * diff --git a/main.c b/main.c index 0cbbd6f..8457097 100644 --- a/main.c +++ b/main.c @@ -1,4 +1,4 @@ -/* Copyright (C) 2007-2014 B.A.T.M.A.N. contributors: +/* Copyright (C) 2007-2015 B.A.T.M.A.N. contributors: * * Marek Lindner, Simon Wunderlich * diff --git a/main.h b/main.h index dee8072..4cb77ed 100644 --- a/main.h +++ b/main.h @@ -1,4 +1,4 @@ -/* Copyright (C) 2007-2014 B.A.T.M.A.N. contributors: +/* Copyright (C) 2007-2015 B.A.T.M.A.N. contributors: * * Marek Lindner, Simon Wunderlich * diff --git a/multicast.c b/multicast.c index 70ce652..7aa480b 100644 --- a/multicast.c +++ b/multicast.c @@ -1,4 +1,4 @@ -/* Copyright (C) 2014 B.A.T.M.A.N. contributors: +/* Copyright (C) 2014-2015 B.A.T.M.A.N. contributors: * * Linus Lüssing * diff --git a/multicast.h b/multicast.h index ae04f1e..beb6e56 100644 --- a/multicast.h +++ b/multicast.h @@ -1,4 +1,4 @@ -/* Copyright (C) 2014 B.A.T.M.A.N. contributors: +/* Copyright (C) 2014-2015 B.A.T.M.A.N. contributors: * * Linus Lüssing * diff --git a/network-coding.c b/network-coding.c index b3b3c4e..f0a50f3 100644 --- a/network-coding.c +++ b/network-coding.c @@ -1,4 +1,4 @@ -/* Copyright (C) 2012-2014 B.A.T.M.A.N. contributors: +/* Copyright (C) 2012-2015 B.A.T.M.A.N. contributors: * * Martin Hundebøll, Jeppe Ledet-Pedersen * diff --git a/network-coding.h b/network-coding.h index 4008ec2..5b79aa8 100644 --- a/network-coding.h +++ b/network-coding.h @@ -1,4 +1,4 @@ -/* Copyright (C) 2012-2014 B.A.T.M.A.N. contributors: +/* Copyright (C) 2012-2015 B.A.T.M.A.N. contributors: * * Martin Hundebøll, Jeppe Ledet-Pedersen * diff --git a/originator.c b/originator.c index 684536e..018b749 100644 --- a/originator.c +++ b/originator.c @@ -1,4 +1,4 @@ -/* Copyright (C) 2009-2014 B.A.T.M.A.N. contributors: +/* Copyright (C) 2009-2015 B.A.T.M.A.N. contributors: * * Marek Lindner, Simon Wunderlich * diff --git a/originator.h b/originator.h index 39085cc..79734d3 100644 --- a/originator.h +++ b/originator.h @@ -1,4 +1,4 @@ -/* Copyright (C) 2007-2014 B.A.T.M.A.N. contributors: +/* Copyright (C) 2007-2015 B.A.T.M.A.N. contributors: * * Marek Lindner, Simon Wunderlich * diff --git a/packet.h b/packet.h index 7a9cb7a..9e747c0 100644 --- a/packet.h +++ b/packet.h @@ -1,4 +1,4 @@ -/* Copyright (C) 2007-2014 B.A.T.M.A.N. contributors: +/* Copyright (C) 2007-2015 B.A.T.M.A.N. contributors: * * Marek Lindner, Simon Wunderlich * diff --git a/routing.c b/routing.c index db68ae4..c360c0c 100644 --- a/routing.c +++ b/routing.c @@ -1,4 +1,4 @@ -/* Copyright (C) 2007-2014 B.A.T.M.A.N. contributors: +/* Copyright (C) 2007-2015 B.A.T.M.A.N. contributors: * * Marek Lindner, Simon Wunderlich * diff --git a/routing.h b/routing.h index f8a9e14..6bc29d3 100644 --- a/routing.h +++ b/routing.h @@ -1,4 +1,4 @@ -/* Copyright (C) 2007-2014 B.A.T.M.A.N. contributors: +/* Copyright (C) 2007-2015 B.A.T.M.A.N. contributors: * * Marek Lindner, Simon Wunderlich * diff --git a/send.c b/send.c index 879ccad..0a01992 100644 --- a/send.c +++ b/send.c @@ -1,4 +1,4 @@ -/* Copyright (C) 2007-2014 B.A.T.M.A.N. contributors: +/* Copyright (C) 2007-2015 B.A.T.M.A.N. contributors: * * Marek Lindner, Simon Wunderlich * diff --git a/send.h b/send.h index de85f2f..0536835 100644 --- a/send.h +++ b/send.h @@ -1,4 +1,4 @@ -/* Copyright (C) 2007-2014 B.A.T.M.A.N. contributors: +/* Copyright (C) 2007-2015 B.A.T.M.A.N. contributors: * * Marek Lindner, Simon Wunderlich * diff --git a/soft-interface.c b/soft-interface.c index 310031f..c002961 100644 --- a/soft-interface.c +++ b/soft-interface.c @@ -1,4 +1,4 @@ -/* Copyright (C) 2007-2014 B.A.T.M.A.N. contributors: +/* Copyright (C) 2007-2015 B.A.T.M.A.N. contributors: * * Marek Lindner, Simon Wunderlich * diff --git a/soft-interface.h b/soft-interface.h index e1e8bb9..578e8a6 100644 --- a/soft-interface.h +++ b/soft-interface.h @@ -1,4 +1,4 @@ -/* Copyright (C) 2007-2014 B.A.T.M.A.N. contributors: +/* Copyright (C) 2007-2015 B.A.T.M.A.N. contributors: * * Marek Lindner * diff --git a/sysfs.c b/sysfs.c index ddfa989..d6a312a 100644 --- a/sysfs.c +++ b/sysfs.c @@ -1,4 +1,4 @@ -/* Copyright (C) 2010-2014 B.A.T.M.A.N. contributors: +/* Copyright (C) 2010-2015 B.A.T.M.A.N. contributors: * * Marek Lindner * diff --git a/sysfs.h b/sysfs.h index bc1f6df..2294583 100644 --- a/sysfs.h +++ b/sysfs.h @@ -1,4 +1,4 @@ -/* Copyright (C) 2010-2014 B.A.T.M.A.N. contributors: +/* Copyright (C) 2010-2015 B.A.T.M.A.N. contributors: * * Marek Lindner * diff --git a/translation-table.c b/translation-table.c index 5551ecc..0611c58 100644 --- a/translation-table.c +++ b/translation-table.c @@ -1,4 +1,4 @@ -/* Copyright (C) 2007-2014 B.A.T.M.A.N. contributors: +/* Copyright (C) 2007-2015 B.A.T.M.A.N. contributors: * * Marek Lindner, Simon Wunderlich, Antonio Quartulli * diff --git a/translation-table.h b/translation-table.h index 3c2b868..6acc25d 100644 --- a/translation-table.h +++ b/translation-table.h @@ -1,4 +1,4 @@ -/* Copyright (C) 2007-2014 B.A.T.M.A.N. contributors: +/* Copyright (C) 2007-2015 B.A.T.M.A.N. contributors: * * Marek Lindner, Simon Wunderlich, Antonio Quartulli * diff --git a/types.h b/types.h index 1d4781e..67d6348 100644 --- a/types.h +++ b/types.h @@ -1,4 +1,4 @@ -/* Copyright (C) 2007-2014 B.A.T.M.A.N. contributors: +/* Copyright (C) 2007-2015 B.A.T.M.A.N. contributors: * * Marek Lindner, Simon Wunderlich * -- 2.1.4

2 3

[B.A.T.M.A.N.] [PATCH-next] batman-adv: Remove unused compat function batadv_free_rcu_softif_vlan
by Sven Eckelmann 23 Apr '15

23 Apr '15

The commit e78c16c0550c ("batman-adv: Revert "fix var name to keep compatibility with old kernels"") should have renamed the function to batadv_free_rcu_softif_vlan instead of adding a new function batadv_free_rcu_vlan because it was only used in this single place. Signed-off-by: Sven Eckelmann <sven(a)narfation.org> --- This patch is complete optional and would only silence a build_test warning until the master branch becomes the next branch. But this would create a merge conflict because batadv_free_rcu_softif_vlan is already removed in master. --- compat.c | 9 --------- compat.h | 1 - 2 files changed, 10 deletions(-) diff --git a/compat.c b/compat.c index 516d06c..f8e213f 100644 --- a/compat.c +++ b/compat.c @@ -33,15 +33,6 @@ void batadv_free_rcu_orig_vlan(struct rcu_head *rcu) kfree(vlan); } -void batadv_free_rcu_softif_vlan(struct rcu_head *rcu) -{ - struct batadv_softif_vlan *vlan; - - vlan = container_of(rcu, struct batadv_softif_vlan, rcu); - - kfree(vlan); -} - void batadv_free_rcu_vlan(struct rcu_head *rcu) { struct batadv_softif_vlan *vlan; diff --git a/compat.h b/compat.h index 94d0e85..d6ca427 100644 --- a/compat.h +++ b/compat.h @@ -226,7 +226,6 @@ static const struct { \ #define vlan_insert_tag(skb, proto, vid) __vlan_put_tag(skb, vid) void batadv_free_rcu_orig_vlan(struct rcu_head *rcu); -void batadv_free_rcu_softif_vlan(struct rcu_head *rcu); void batadv_free_rcu_tt_global_entry(struct rcu_head *rcu); void batadv_free_rcu_gw_node(struct rcu_head *rcu); void batadv_free_rcu_tt_local_entry(struct rcu_head *rcu); -- 2.1.4

2 2

[B.A.T.M.A.N.] [PATCH] batman-adv: bugfix for kernel crash in batadv_tt_local_table_free
by Andreas Pape 22 Apr '15

22 Apr '15

This missing check lead to a kernel crash when a hard_if is removed on a node forwarding untagged and tagged traffic (VLANID 0) to and from the mesh network. Signed-off-by: Andreas Pape <apape(a)phoenixcontact.com> --- translation-table.c | 6 ++++-- 1 files changed, 4 insertions(+), 2 deletions(-) diff --git a/translation-table.c b/translation-table.c index b20812b..4d3ab8d 100644 --- a/translation-table.c +++ b/translation-table.c @@ -1143,8 +1143,10 @@ static void batadv_tt_local_table_free(struct batadv_priv *bat_priv) /* decrease the reference held for this vlan */ vlan = batadv_softif_vlan_get(bat_priv, tt_common_entry->vid); - batadv_softif_vlan_free_ref(vlan); - batadv_softif_vlan_free_ref(vlan); + if (vlan) { + batadv_softif_vlan_free_ref(vlan); + batadv_softif_vlan_free_ref(vlan); + } batadv_tt_local_entry_free_ref(tt_local); } -- 1.7.0.4 .................................................................. PHOENIX CONTACT ELECTRONICS GmbH Sitz der Gesellschaft / registered office of the company: 31812 Bad Pyrmont USt-Id-Nr.: DE811742156 Amtsgericht Hannover HRB 100528 / district court Hannover HRB 100528 Geschäftsführer / Executive Board: Roland Bent, Dr. Martin Heubeck ___________________________________________________________________ Diese E-Mail enthält vertrauliche und/oder rechtlich geschützte Informationen. Wenn Sie nicht der richtige Adressat sind oder diese E-Mail irrtümlich erhalten haben, informieren Sie bitte sofort den Absender und vernichten Sie diese Mail. Das unerlaubte Kopieren, jegliche anderweitige Verwendung sowie die unbefugte Weitergabe dieser Mail ist nicht gestattet. ---------------------------------------------------------------------------------------------------- This e-mail may contain confidential and/or privileged information. If you are not the intended recipient (or have received this e-mail in error) please notify the sender immediately and destroy this e-mail. Any unauthorized copying, disclosure, distribution or other use of the material or parts thereof is strictly forbidden. ___________________________________________________________________

2 3

[B.A.T.M.A.N.] Installing issue (Makefile configuration doesn't exist)
by Omar Shrit 22 Apr '15

22 Apr '15

HI everybody: I have four Raspberry Pi's, connected as a mesh network, I am trying to use Batman as routing protocol (the batman-adv module is used), however I need to have the log file, and debug folder, as they already doesn’t exist in the installed module in the Linux kernel. The FAQ page explained that I have to re-install the module and modifying the Makefile Debug option to y , In fact I have found that only the module which exist in the website of Batman have these options in the Makefile, the makefile of the module that exist in the Linux kernel is different, and doesn’t have any option , by default the batman module in the Linux kernel doesn’t enable the Debug option as I'm using in my RPI's Raspian with kernel version 3.18.5 Does anyone have any idea about how to change the options in the module Makefile in Linux kernel before installing it ??, I need to use cross-compile for compiling the kernel. All suggestions are welcomed. Thanks.

2 1

[B.A.T.M.A.N.] [PATCHv2] batman-adv: Document multicast compile time option
by Sven Eckelmann 22 Apr '15

22 Apr '15

The README.external lists all options which can be enabled/disabled during compile time. The CONFIG_BATMAN_ADV_MCAST option wasn't document in this list. Signed-off-by: Sven Eckelmann <sven(a)narfation.org> --- v2: Remove the wrong Makefile change which slipped into the patch README.external | 1 + 1 file changed, 1 insertion(+) diff --git a/README.external b/README.external index e3b533d..f068273 100644 --- a/README.external +++ b/README.external @@ -38,6 +38,7 @@ module). Available options and their possible values are * CONFIG_BATMAN_ADV_DEBUG=[y|n*] (B.A.T.M.A.N. debugging) * CONFIG_BATMAN_ADV_BLA=[y*|n] (B.A.T.M.A.N. bridge loop avoidance) * CONFIG_BATMAN_ADV_DAT=[y*|n] (B.A.T.M.A.N. Distributed ARP Table) + * CONFIG_BATMAN_ADV_MCAST=[y*|n] (B.A.T.M.A.N. multicast optimizations) * CONFIG_BATMAN_ADV_NC=[y|n*] (B.A.T.M.A.N. Network Coding) e.g., debugging can be enabled by -- 2.1.4

2 1

[B.A.T.M.A.N.] [PATCH] batman-adv: Document multicast compile time option
by Sven Eckelmann 22 Apr '15

22 Apr '15

The README.external lists all options which can be enabled/disabled during compile time. The CONFIG_BATMAN_ADV_MCAST option wasn't document in this list. Signed-off-by: Sven Eckelmann <sven(a)narfation.org> --- Makefile | 1 + README.external | 1 + 2 files changed, 2 insertions(+) diff --git a/Makefile b/Makefile index 8a04d12..d8bd4ef 100644 --- a/Makefile +++ b/Makefile @@ -59,6 +59,7 @@ BUILD_FLAGS := \ CONFIG_BATMAN_ADV_NC=$(CONFIG_BATMAN_ADV_NC) \ CONFIG_BATMAN_ADV_MCAST=$(CONFIG_BATMAN_ADV_MCAST) \ INSTALL_MOD_DIR=updates/net/batman-adv/ +export batman-adv-y += ../../compat.o all: config $(MAKE) -C $(KERNELPATH) $(BUILD_FLAGS) modules diff --git a/README.external b/README.external index e3b533d..f068273 100644 --- a/README.external +++ b/README.external @@ -38,6 +38,7 @@ module). Available options and their possible values are * CONFIG_BATMAN_ADV_DEBUG=[y|n*] (B.A.T.M.A.N. debugging) * CONFIG_BATMAN_ADV_BLA=[y*|n] (B.A.T.M.A.N. bridge loop avoidance) * CONFIG_BATMAN_ADV_DAT=[y*|n] (B.A.T.M.A.N. Distributed ARP Table) + * CONFIG_BATMAN_ADV_MCAST=[y*|n] (B.A.T.M.A.N. multicast optimizations) * CONFIG_BATMAN_ADV_NC=[y|n*] (B.A.T.M.A.N. Network Coding) e.g., debugging can be enabled by -- 2.1.4

2 2

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

B.A.T.M.A.N