B.A.T.M.A.N October 2016

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

17 participants
57 discussions

[B.A.T.M.A.N.] [PATCH maint v2] batman-adv: Install module in $INSTALL_MOD_DIR/updates/net/batman-adv
by Sven Eckelmann 30 Oct '16

30 Oct '16

depmod may skip the batman-adv.ko module in the $INSTALL_MOD_DIR/update/ folder when it is also available in $INSTALL_MOD_DIR/kernel/ but in an higher position in the subtree. Avoid this extra directory "build" in the installation path by making the obj-y dir relative to build/ in the source directory. Reported-by: Jean-Jacques Sarton <jj.sarton(a)t-online.de> Signed-off-by: Sven Eckelmann <sven(a)narfation.org> --- Remove clean target change which was accidentally added to this patch Makefile | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) diff --git a/Makefile b/Makefile index 7ef2569..b852a17 100644 --- a/Makefile +++ b/Makefile @@ -46,6 +46,7 @@ MKDIR := mkdir -p PATCH_FLAGS = --batch --fuzz=0 --forward --strip=1 --unified --version-control=never -g0 --remove-empty-files --no-backup-if-mismatch --reject-file=- PATCH := patch $(PATCH_FLAGS) -i CP := cp -fpR +LN := ln -sf SOURCE = $(wildcard net/batman-adv/*.[ch]) net/batman-adv/Makefile SOURCE_BUILD = $(wildcard $(BUILD_DIR)/net/batman-adv/*.[ch]) $(BUILD_DIR)/net/batman-adv/Makefile @@ -55,25 +56,25 @@ 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 += \ - -I$(PWD)/compat-include/ \ - -I$(PWD)/include/ \ - -include $(PWD)/compat.h \ + -I$(PWD)/../compat-include/ \ + -I$(PWD)/../include/ \ + -include $(PWD)/../compat.h \ $(CFLAGS) ifneq ($(REVISION),) NOSTDINC_FLAGS += -DBATADV_SOURCE_VERSION=\"$(REVISION)\" endif -include $(PWD)/compat-sources/Makefile +-include $(PWD)/../compat-sources/Makefile -obj-y += build/net/batman-adv/ +obj-y += net/batman-adv/ export batman-adv-y BUILD_FLAGS := \ - M=$(PWD) \ - PWD=$(PWD) \ + M=$(BUILD_DIR) \ + PWD=$(BUILD_DIR) \ REVISION=$(REVISION) \ CONFIG_BATMAN_ADV=m \ CONFIG_BATMAN_ADV_DEBUG=$(CONFIG_BATMAN_ADV_DEBUG) \ @@ -101,6 +102,7 @@ config: $(SOURCE_STAMP): $(SOURCE) compat-patches/* compat-patches/replacements.sh $(MKDIR) $(BUILD_DIR)/net/batman-adv/ + @$(LN) ../Makefile $(BUILD_DIR)/Makefile @$(RM) $(SOURCE_BUILD) @$(CP) $(SOURCE) $(BUILD_DIR)/net/batman-adv/ @set -e; \ -- 2.10.1

1 0

[B.A.T.M.A.N.] [PATCH maint] batman-adv: Install module in $INSTALL_MOD_DIR/updates/net/batman-adv
by Sven Eckelmann 30 Oct '16

30 Oct '16

depmod may skip the batman-adv.ko module in the $INSTALL_MOD_DIR/update/ folder when it is also available in $INSTALL_MOD_DIR/kernel/ but in an higher position in the subtree. Avoid this extra directory "build" in the installation path by making the obj-y dir relative to build/ in the source directory. Reported-by: Jean-Jacques Sarton <jj.sarton(a)t-online.de> Signed-off-by: Sven Eckelmann <sven(a)narfation.org> --- Makefile | 17 ++++++++++------- 1 file changed, 10 insertions(+), 7 deletions(-) diff --git a/Makefile b/Makefile index 7ef2569..2f5cff6 100644 --- a/Makefile +++ b/Makefile @@ -46,6 +46,7 @@ MKDIR := mkdir -p PATCH_FLAGS = --batch --fuzz=0 --forward --strip=1 --unified --version-control=never -g0 --remove-empty-files --no-backup-if-mismatch --reject-file=- PATCH := patch $(PATCH_FLAGS) -i CP := cp -fpR +LN := ln -sf SOURCE = $(wildcard net/batman-adv/*.[ch]) net/batman-adv/Makefile SOURCE_BUILD = $(wildcard $(BUILD_DIR)/net/batman-adv/*.[ch]) $(BUILD_DIR)/net/batman-adv/Makefile @@ -55,25 +56,25 @@ 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 += \ - -I$(PWD)/compat-include/ \ - -I$(PWD)/include/ \ - -include $(PWD)/compat.h \ + -I$(PWD)/../compat-include/ \ + -I$(PWD)/../include/ \ + -include $(PWD)/../compat.h \ $(CFLAGS) ifneq ($(REVISION),) NOSTDINC_FLAGS += -DBATADV_SOURCE_VERSION=\"$(REVISION)\" endif -include $(PWD)/compat-sources/Makefile +-include $(PWD)/../compat-sources/Makefile -obj-y += build/net/batman-adv/ +obj-y += net/batman-adv/ export batman-adv-y BUILD_FLAGS := \ - M=$(PWD) \ - PWD=$(PWD) \ + M=$(BUILD_DIR) \ + PWD=$(BUILD_DIR) \ REVISION=$(REVISION) \ CONFIG_BATMAN_ADV=m \ CONFIG_BATMAN_ADV_DEBUG=$(CONFIG_BATMAN_ADV_DEBUG) \ @@ -89,6 +90,7 @@ all: config $(SOURCE_STAMP) $(MAKE) -C $(KERNELPATH) $(BUILD_FLAGS) modules clean: + $(MAKE) -C $(KERNELPATH) $(BUILD_FLAGS) modules_clean $(RM) compat-autoconf.h* $(RM) -r $(BUILD_DIR) @@ -101,6 +103,7 @@ config: $(SOURCE_STAMP): $(SOURCE) compat-patches/* compat-patches/replacements.sh $(MKDIR) $(BUILD_DIR)/net/batman-adv/ + @$(LN) ../Makefile $(BUILD_DIR)/Makefile @$(RM) $(SOURCE_BUILD) @$(CP) $(SOURCE) $(BUILD_DIR)/net/batman-adv/ @set -e; \ -- 2.10.1

1 0

[B.A.T.M.A.N.] [PATCH 0/3] pull request for net: batman-adv 2016-10-26
by Simon Wunderlich 29 Oct '16

29 Oct '16

Hi David, here are some bugfix patches which we would like to have integrated into net. Please pull or let me know of any problem! Thank you, Simon The following changes since commit 29fbff8698fc0ac1a1d74584b258e0bf18b469f9: Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net (2016-10-13 21:40:23 -0700) are available in the git repository at: git://git.open-mesh.org/linux-merge.git tags/batadv-net-for-davem-20161026 for you to fetch changes up to 9799c50372b23ed774791bdb87d700f1286ee8a9: batman-adv: fix splat on disabling an interface (2016-10-21 14:47:02 +0200) ---------------------------------------------------------------- Here are three batman-adv bugfix patches: - Fix RCU usage for neighbor list, by Sven Eckelmann - Fix BATADV_DBG_ALL loglevel to include TP Meter messages, by Sven Eckelmann - Fix possible splat when disabling an interface, by Linus Luessing ---------------------------------------------------------------- Linus Lüssing (1): batman-adv: fix splat on disabling an interface Sven Eckelmann (2): batman-adv: Modify neigh_list only with rcu-list functions batman-adv: Add BATADV_DBG_TP_METER to BATADV_DBG_ALL net/batman-adv/hard-interface.c | 1 - net/batman-adv/log.h | 2 +- net/batman-adv/originator.c | 2 +- 3 files changed, 2 insertions(+), 3 deletions(-)

2 4

[B.A.T.M.A.N.] [PATCH 1/6] batman-adv: use consume_skb for non-dropped packets
by Sven Eckelmann 29 Oct '16

29 Oct '16

kfree_skb assumes that an skb is dropped after an failure and notes that. consume_skb should be used in non-failure situations. Such information is important for dropmonitor netlink which tells how many packets were dropped and where this drop happened. Signed-off-by: Sven Eckelmann <sven(a)narfation.org> --- net/batman-adv/bat_iv_ogm.c | 13 ++++++++----- net/batman-adv/fragmentation.c | 20 ++++++++++++++------ net/batman-adv/network-coding.c | 24 +++++++++++++++--------- net/batman-adv/send.c | 27 +++++++++++++++++++-------- net/batman-adv/send.h | 3 ++- net/batman-adv/soft-interface.c | 2 +- 6 files changed, 59 insertions(+), 30 deletions(-) diff --git a/net/batman-adv/bat_iv_ogm.c b/net/batman-adv/bat_iv_ogm.c index a40cdf2..baf3d72 100644 --- a/net/batman-adv/bat_iv_ogm.c +++ b/net/batman-adv/bat_iv_ogm.c @@ -692,7 +692,7 @@ static void batadv_iv_ogm_aggregate_new(const unsigned char *packet_buff, forw_packet_aggr->skb = netdev_alloc_skb_ip_align(NULL, skb_size); if (!forw_packet_aggr->skb) { - batadv_forw_packet_free(forw_packet_aggr); + batadv_forw_packet_free(forw_packet_aggr, true); return; } @@ -1605,7 +1605,7 @@ out: if (hardif_neigh) batadv_hardif_neigh_put(hardif_neigh); - kfree_skb(skb_priv); + consume_skb(skb_priv); } /** @@ -1777,6 +1777,7 @@ static void batadv_iv_send_outstanding_bat_ogm_packet(struct work_struct *work) struct delayed_work *delayed_work; struct batadv_forw_packet *forw_packet; struct batadv_priv *bat_priv; + bool dropped = false; delayed_work = to_delayed_work(work); forw_packet = container_of(delayed_work, struct batadv_forw_packet, @@ -1786,8 +1787,10 @@ static void batadv_iv_send_outstanding_bat_ogm_packet(struct work_struct *work) hlist_del(&forw_packet->list); spin_unlock_bh(&bat_priv->forw_bat_list_lock); - if (atomic_read(&bat_priv->mesh_state) == BATADV_MESH_DEACTIVATING) + if (atomic_read(&bat_priv->mesh_state) == BATADV_MESH_DEACTIVATING) { + dropped = true; goto out; + } batadv_iv_ogm_emit(forw_packet); @@ -1804,7 +1807,7 @@ static void batadv_iv_send_outstanding_bat_ogm_packet(struct work_struct *work) batadv_iv_ogm_schedule(forw_packet->if_incoming); out: - batadv_forw_packet_free(forw_packet); + batadv_forw_packet_free(forw_packet, dropped); } static int batadv_iv_ogm_receive(struct sk_buff *skb, @@ -1845,7 +1848,7 @@ static int batadv_iv_ogm_receive(struct sk_buff *skb, ogm_packet = (struct batadv_ogm_packet *)packet_pos; } - kfree_skb(skb); + consume_skb(skb); return NET_RX_SUCCESS; } diff --git a/net/batman-adv/fragmentation.c b/net/batman-adv/fragmentation.c index 0934730..461b77d 100644 --- a/net/batman-adv/fragmentation.c +++ b/net/batman-adv/fragmentation.c @@ -42,17 +42,23 @@ /** * batadv_frag_clear_chain - delete entries in the fragment buffer chain * @head: head of chain with entries. + * @dropped: whether the chain is cleared because all fragments are dropped * * Free fragments in the passed hlist. Should be called with appropriate lock. */ -static void batadv_frag_clear_chain(struct hlist_head *head) +static void batadv_frag_clear_chain(struct hlist_head *head, bool dropped) { struct batadv_frag_list_entry *entry; struct hlist_node *node; hlist_for_each_entry_safe(entry, node, head, list) { hlist_del(&entry->list); - kfree_skb(entry->skb); + + if (dropped) + kfree_skb(entry->skb); + else + consume_skb(entry->skb); + kfree(entry); } } @@ -73,7 +79,7 @@ void batadv_frag_purge_orig(struct batadv_orig_node *orig_node, spin_lock_bh(&chain->lock); if (!check_cb || check_cb(chain)) { - batadv_frag_clear_chain(&chain->head); + batadv_frag_clear_chain(&chain->head, true); chain->size = 0; } @@ -118,7 +124,7 @@ static bool batadv_frag_init_chain(struct batadv_frag_table_entry *chain, return false; if (!hlist_empty(&chain->head)) - batadv_frag_clear_chain(&chain->head); + batadv_frag_clear_chain(&chain->head, true); chain->size = 0; chain->seqno = seqno; @@ -220,7 +226,7 @@ out: * exceeds the maximum size of one merged packet. Don't allow * packets to have different total_size. */ - batadv_frag_clear_chain(&chain->head); + batadv_frag_clear_chain(&chain->head, true); chain->size = 0; } else if (ntohs(frag_packet->total_size) == chain->size) { /* All fragments received. Hand over chain to caller. */ @@ -254,6 +260,7 @@ batadv_frag_merge_packets(struct hlist_head *chain) struct batadv_frag_list_entry *entry; struct sk_buff *skb_out = NULL; int size, hdr_size = sizeof(struct batadv_frag_packet); + bool dropped = false; /* Remove first entry, as this is the destination for the rest of the * fragments. @@ -270,6 +277,7 @@ batadv_frag_merge_packets(struct hlist_head *chain) if (pskb_expand_head(skb_out, 0, size - skb_out->len, GFP_ATOMIC) < 0) { kfree_skb(skb_out); skb_out = NULL; + dropped = true; goto free; } @@ -291,7 +299,7 @@ batadv_frag_merge_packets(struct hlist_head *chain) free: /* Locking is not needed, because 'chain' is not part of any orig. */ - batadv_frag_clear_chain(chain); + batadv_frag_clear_chain(chain, dropped); return skb_out; } diff --git a/net/batman-adv/network-coding.c b/net/batman-adv/network-coding.c index 293ef4f..e924256 100644 --- a/net/batman-adv/network-coding.c +++ b/net/batman-adv/network-coding.c @@ -261,10 +261,16 @@ static void batadv_nc_path_put(struct batadv_nc_path *nc_path) /** * batadv_nc_packet_free - frees nc packet * @nc_packet: the nc packet to free + * @dropped: whether the packet is freed because is is dropped */ -static void batadv_nc_packet_free(struct batadv_nc_packet *nc_packet) +static void batadv_nc_packet_free(struct batadv_nc_packet *nc_packet, + bool dropped) { - kfree_skb(nc_packet->skb); + if (dropped) + kfree_skb(nc_packet->skb); + else + consume_skb(nc_packet->skb); + batadv_nc_path_put(nc_packet->nc_path); kfree(nc_packet); } @@ -577,7 +583,7 @@ static void batadv_nc_send_packet(struct batadv_nc_packet *nc_packet) { batadv_send_unicast_skb(nc_packet->skb, nc_packet->neigh_node); nc_packet->skb = NULL; - batadv_nc_packet_free(nc_packet); + batadv_nc_packet_free(nc_packet, false); } /** @@ -611,7 +617,7 @@ static bool batadv_nc_sniffed_purge(struct batadv_priv *bat_priv, /* purge nc packet */ list_del(&nc_packet->list); - batadv_nc_packet_free(nc_packet); + batadv_nc_packet_free(nc_packet, true); res = true; @@ -1210,11 +1216,11 @@ static bool batadv_nc_code_packets(struct batadv_priv *bat_priv, } /* skb_src is now coded into skb_dest, so free it */ - kfree_skb(skb_src); + consume_skb(skb_src); /* avoid duplicate free of skb from nc_packet */ nc_packet->skb = NULL; - batadv_nc_packet_free(nc_packet); + batadv_nc_packet_free(nc_packet, false); /* Send the coded packet and return true */ batadv_send_unicast_skb(skb_dest, first_dest); @@ -1401,7 +1407,7 @@ static void batadv_nc_skb_store_before_coding(struct batadv_priv *bat_priv, /* batadv_nc_skb_store_for_decoding() clones the skb, so we must free * our ref */ - kfree_skb(skb); + consume_skb(skb); } /** @@ -1725,7 +1731,7 @@ batadv_nc_skb_decode_packet(struct batadv_priv *bat_priv, struct sk_buff *skb, ether_addr_copy(unicast_packet->dest, orig_dest); unicast_packet->ttvn = ttvn; - batadv_nc_packet_free(nc_packet); + batadv_nc_packet_free(nc_packet, false); return unicast_packet; } @@ -1862,7 +1868,7 @@ static int batadv_nc_recv_coded_packet(struct sk_buff *skb, return batadv_recv_unicast_packet(skb, recv_if); free_nc_packet: - batadv_nc_packet_free(nc_packet); + batadv_nc_packet_free(nc_packet, true); return NET_RX_DROP; } diff --git a/net/batman-adv/send.c b/net/batman-adv/send.c index 8d4e1f5..4f44ee2 100644 --- a/net/batman-adv/send.c +++ b/net/batman-adv/send.c @@ -451,13 +451,19 @@ int batadv_send_skb_via_gw(struct batadv_priv *bat_priv, struct sk_buff *skb, /** * batadv_forw_packet_free - free a forwarding packet * @forw_packet: The packet to free + * @dropped: whether the packet is freed because is is dropped * * This frees a forwarding packet and releases any resources it might * have claimed. */ -void batadv_forw_packet_free(struct batadv_forw_packet *forw_packet) +void batadv_forw_packet_free(struct batadv_forw_packet *forw_packet, + bool dropped) { - kfree_skb(forw_packet->skb); + if (dropped) + kfree_skb(forw_packet->skb); + else + consume_skb(forw_packet->skb); + if (forw_packet->if_incoming) batadv_hardif_put(forw_packet->if_incoming); if (forw_packet->if_outgoing) @@ -597,7 +603,7 @@ int batadv_add_bcast_packet_to_list(struct batadv_priv *bat_priv, return NETDEV_TX_OK; err_packet_free: - batadv_forw_packet_free(forw_packet); + batadv_forw_packet_free(forw_packet, true); err: return NETDEV_TX_BUSY; } @@ -610,6 +616,7 @@ static void batadv_send_outstanding_bcast_packet(struct work_struct *work) struct sk_buff *skb1; struct net_device *soft_iface; struct batadv_priv *bat_priv; + bool dropped = false; delayed_work = to_delayed_work(work); forw_packet = container_of(delayed_work, struct batadv_forw_packet, @@ -621,11 +628,15 @@ static void batadv_send_outstanding_bcast_packet(struct work_struct *work) hlist_del(&forw_packet->list); spin_unlock_bh(&bat_priv->forw_bcast_list_lock); - if (atomic_read(&bat_priv->mesh_state) == BATADV_MESH_DEACTIVATING) + if (atomic_read(&bat_priv->mesh_state) == BATADV_MESH_DEACTIVATING) { + dropped = true; goto out; + } - if (batadv_dat_drop_broadcast_packet(bat_priv, forw_packet)) + if (batadv_dat_drop_broadcast_packet(bat_priv, forw_packet)) { + dropped = true; goto out; + } /* rebroadcast packet */ rcu_read_lock(); @@ -658,7 +669,7 @@ static void batadv_send_outstanding_bcast_packet(struct work_struct *work) } out: - batadv_forw_packet_free(forw_packet); + batadv_forw_packet_free(forw_packet, dropped); } void @@ -699,7 +710,7 @@ batadv_purge_outstanding_packets(struct batadv_priv *bat_priv, if (pending) { hlist_del(&forw_packet->list); - batadv_forw_packet_free(forw_packet); + batadv_forw_packet_free(forw_packet, true); } } spin_unlock_bh(&bat_priv->forw_bcast_list_lock); @@ -726,7 +737,7 @@ batadv_purge_outstanding_packets(struct batadv_priv *bat_priv, if (pending) { hlist_del(&forw_packet->list); - batadv_forw_packet_free(forw_packet); + batadv_forw_packet_free(forw_packet, true); } } spin_unlock_bh(&bat_priv->forw_bat_list_lock); diff --git a/net/batman-adv/send.h b/net/batman-adv/send.h index 999f786..e3968fe 100644 --- a/net/batman-adv/send.h +++ b/net/batman-adv/send.h @@ -27,7 +27,8 @@ struct sk_buff; -void batadv_forw_packet_free(struct batadv_forw_packet *forw_packet); +void batadv_forw_packet_free(struct batadv_forw_packet *forw_packet, + bool dropped); struct batadv_forw_packet * batadv_forw_packet_alloc(struct batadv_hard_iface *if_incoming, struct batadv_hard_iface *if_outgoing, diff --git a/net/batman-adv/soft-interface.c b/net/batman-adv/soft-interface.c index e508bf5..cb5b966 100644 --- a/net/batman-adv/soft-interface.c +++ b/net/batman-adv/soft-interface.c @@ -341,7 +341,7 @@ send: /* a copy is stored in the bcast list, therefore removing * the original skb. */ - kfree_skb(skb); + consume_skb(skb); /* unicast packet */ } else { -- 2.8.1

3 8

[B.A.T.M.A.N.] batman-adv 2016.4
by Simon Wunderlich 28 Oct '16

28 Oct '16

Oct 27th, 2016. Today the B.A.T.M.A.N. team publishes the October 2016 update to batman-adv, batctl and alfred! This release netlink support was enhanced and now can replace most of the data currently available via debugfs. batman- adv can therefore be used in multiple network namespaces without collision in debugfs. The size of the translation table was optimized and the gateway selection algorithm for B.A.T.M.A.N. V was integrated. Also several bugfixes, code cleanups and code documentation updates are included in this version. As the kernel module always depends on the Linux kernel it is compiled against, it does not make sense to provide binaries on our website. As usual, you will find the signed tarballs in our download section: https://downloads.open-mesh.org/batman/releases/batman-adv-2016.4/ as well as prepackaged binaries in your distribution. Thanks ------ Thanks to all people sending in patches: * Andreas Pape <apape(a)phoenixcontact.com> * Andrew Lunn <andrew(a)lunn.ch> * Antonio Quartulli <a(a)unstable.cc> * Jonathan Haws <jhaws(a)sdl.usu.edu> * Linus Lüssing <linus.luessing(a)c0d3.blue> * Markus Pargmann <mpa(a)pengutronix.de> * Masahiro Yamada <yamada.masahiro(a)socionext.com> * Matthias Schiffer <mschiffer(a)universe-factory.net> * Simon Wunderlich <sw(a)simonwunderlich.de> * Stephen Hemminger <stephen(a)networkplumber.org> * Sven Eckelmann <sven(a)narfation.org> batman-adv ---------- * support latest kernels (3.2 - 4.9) * add GW selection algorithm for B.A.T.M.A.N. V * add support for querying most tables/lists via netlink * adjusted device modifications for easier handling via rtnl (ip-link) * disabled (bad) debugfs support in network namespaces * add improved compat-patches support (note the new build directory) * reduced translation table memory consumption * coding style cleanups and refactoring * bugs squashed: - avoid locking problems when modifying interfaces - fix sysfs errors on fast device deletion/creation events - add missing memory barriers for neighbor list modifications - fix tpmeter debug log output batctl ------ * integrate support for batman-adv netlink * coding style cleanups * documentation updates * bugs squashed: - fix endless loop in TP meter on some platforms - fix build errors caused by name conflicts alfred ------ * add expert option to specify sync interval * fix various bugs in batadv-vis netlink integration * fix build build problems with libnl-tiny Happy routing, The B.A.T.M.A.N. team

1 0

[B.A.T.M.A.N.] [PATCH] batman-adv: Revert "use core MTU range checking in misc drivers"
by Sven Eckelmann 26 Oct '16

26 Oct '16

The maximum MTU is defined via the slave devices of an batman-adv interface. Thus it is not possible to calculate the max_mtu during the creation of the batman-adv device when no slave devices are attached. Doing so would for example break non-fragmentation setups which then (incorrectly) allow an MTU of 1500 even when underlying device cannot transport 1500 bytes + batman-adv headers. Checking the dynamically calculated max_mtu via the minimum of the slave devices MTU during .ndo_change_mtu is also used by the bridge interface. Cc: Jarod Wilson <jarod(a)redhat.com> Fixes: b3e3893e1253 ("net: use core MTU range checking in misc drivers") Signed-off-by: Sven Eckelmann <sven(a)narfation.org> --- Original patch + my comment: https://patchwork.ozlabs.org/patch/684722/ I just got informed about this patch when it was already applied in net-next. So I can only ask for an revet of the batman-adv parts net/batman-adv/soft-interface.c | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/net/batman-adv/soft-interface.c b/net/batman-adv/soft-interface.c index 112679d..49e16b6 100644 --- a/net/batman-adv/soft-interface.c +++ b/net/batman-adv/soft-interface.c @@ -158,6 +158,17 @@ static int batadv_interface_set_mac_addr(struct net_device *dev, void *p) return 0; } +static int batadv_interface_change_mtu(struct net_device *dev, int new_mtu) +{ + /* check ranges */ + if ((new_mtu < 68) || (new_mtu > batadv_hardif_min_mtu(dev))) + return -EINVAL; + + dev->mtu = new_mtu; + + return 0; +} + /** * batadv_interface_set_rx_mode - set the rx mode of a device * @dev: registered network device to modify @@ -909,6 +920,7 @@ static const struct net_device_ops batadv_netdev_ops = { .ndo_vlan_rx_add_vid = batadv_interface_add_vid, .ndo_vlan_rx_kill_vid = batadv_interface_kill_vid, .ndo_set_mac_address = batadv_interface_set_mac_addr, + .ndo_change_mtu = batadv_interface_change_mtu, .ndo_set_rx_mode = batadv_interface_set_rx_mode, .ndo_start_xmit = batadv_interface_tx, .ndo_validate_addr = eth_validate_addr, @@ -975,7 +987,6 @@ struct net_device *batadv_softif_create(struct net *net, const char *name) dev_net_set(soft_iface, net); soft_iface->rtnl_link_ops = &batadv_link_ops; - soft_iface->max_mtu = batadv_hardif_min_mtu(soft_iface); ret = register_netdevice(soft_iface); if (ret < 0) { -- 2.9.3

3 4

Re: [B.A.T.M.A.N.] Whether Batman-adv need suitable wifi network card (support interface modes ( mesh point ) ) .
by Simon Wunderlich 26 Oct '16

26 Oct '16

On Wednesday, October 26, 2016 2:52:39 PM CEST johnzeng via B.A.T.M.A.N wrote: > Dear Sven : > > Thanks , and i will try to purchase suitable wifi > hardware , > > Because i use raspberry > <http://www.baidu.com/link?url=s_ofbUc1ZEO-1ohz5A3WnLdqY4CNZ948d7JxBMkwZtW_f > jTcOKUwMjkloBUHVW475SCTMxAci7HoEvHeH80Fuz9lC1X4W6Hw4BvwQaUIDzq> pi , i > have to use wifi card based usb . > > whether you can advise a set of usb wifi card > based Atheros ( driver ath9k) ? After looking at different USB chips, I would also recommend looking into ath9k_htc first. Even if it has limitations, other chips are doing much worse ... Cheers, Simon

1 0

Re: [B.A.T.M.A.N.] Whether Batman-adv need suitable wifi network card (support interface modes ( mesh point ) ) .
by Sven Eckelmann 26 Oct '16

26 Oct '16

On Mittwoch, 26. Oktober 2016 08:48:36 CEST johnzeng wrote: > > Hello Dear SIr : > > I am testing between RTL8188CUS 802.11n WLAN > Adapter and Rt2070 now , > > > > When i ping hostB from hostA , > > hostA show ping info , ( From 10.10.130.66 > icmp_seq=211 Destination Host Unreachable ) > > and i catch some info via tcpdump at hostB. i > guess it was caused by not suitable RTL8188CUS or driver . Please check if the underlying link works. Check `iw dev wlan0 station dump` and add an ip in a separate ip subnet to the wlan0 and try to ping each other via this ip. Also check `batctl o` to find out if the batman-adv nodes can see each other. Kind regards, Sven

3 6

Whether Batman-adv need suitable wifi network card (support interface modes ( mesh point ) ) .
by johnzeng 26 Oct '16

26 Oct '16

Hello Dear Sir : Whether Batman-adv need suitable wifi network card (support interface modes ( mesh point ) ) . there are two wifi network card , and i thought Rt2070 will support Batman-adv . Because Rt2070 will support interface modes ( mesh point ) , and RTL8188CUS can't support interface modes based mesh point . this is some info via iw list , whether it will be correct understanding ? Bus 001 Device 005: ID 148f:2070 Ralink Technology, Corp. RT2070 Wireless Adapter Supported interface modes: * IBSS * managed * AP * AP/VLAN * WDS * monitor * mesh point 8176 Realtek Semiconductor Corp. RTL8188CUS 802.11n WLAN Adapter Supported interface modes: * IBSS * managed * AP * monitor * P2P-client * P2P-GO

2 3

[B.A.T.M.A.N.] [PATCH v3 0/9] batctl: rtnetlink interface manipulation + userspace icmp
by Sven Eckelmann 24 Oct '16

24 Oct '16

Hi, I had to merge the ICMP and rtnetlink patchset [1] into one single patchset because the two remaining ICMP patches depend on the rtnetlink query functionality. This is already the biggest change to the patchset(s). Other minor things are: * remove patchset already in master * rebased patchset(s) on top of current master * changed __unused to __maybe_unused Kind regards, Sven [1] https://lists.open-mesh.org/pipermail/b.a.t.m.a.n/2016-July/015941.html [2] https://lists.open-mesh.org/pipermail/b.a.t.m.a.n/2016-July/016046.html Sven Eckelmann (9): batctl: Use rtnl to query list of softif devices batctl: Add command to create/destroy batman-adv interface batctl: Use rtnl to add/remove interfaces batctl: Parse interface arguments relative to last parsed option batctl: Allow to disable automatic interface create/destroy batctl: Move interface command to extra file batctl: Move check_mesh_iface* to functions.c batctl: Add helper to generate instant random bytes batctl: Implement non-routing batadv_icmp in userspace Makefile | 2 + functions.c | 248 +++++++++++++++++++++++ functions.h | 12 +- icmp_helper.c | 633 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ icmp_helper.h | 58 ++++++ interface.c | 457 ++++++++++++++++++++++++++++++++++++++++++ interface.h | 29 +++ main.c | 1 + man/batctl.8 | 7 +- netlink.c | 178 ++++++++++++++++- netlink.h | 3 + ping.c | 42 ++-- sys.c | 215 +------------------- sys.h | 3 - traceroute.c | 42 ++-- 15 files changed, 1654 insertions(+), 276 deletions(-)

2 10

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

B.A.T.M.A.N October 2016