* [PATCH 00/10] pull request for net-next: batman-adv 2017-06-13
@ 2017-06-13 11:36 Simon Wunderlich
[not found] ` <20170613113700.31220-1-sw-2YrNx6rUIHYiY0qSoAWiAoQuADTiUCJX@public.gmane.org>
` (10 more replies)
0 siblings, 11 replies; 12+ messages in thread
From: Simon Wunderlich @ 2017-06-13 11:36 UTC (permalink / raw)
To: davem; +Cc: netdev, b.a.t.m.a.n, Simon Wunderlich
Hi David,
here is our feature/cleanup pull request of batman-adv to go into net-next.
Please pull or let me know of any problem!
Thank you,
Simon
The following changes since commit 2ea659a9ef488125eb46da6eb571de5eae5c43f6:
Linux 4.12-rc1 (2017-05-13 13:19:49 -0700)
are available in the git repository at:
git://git.open-mesh.org/linux-merge.git tags/batadv-next-for-davem-20170613
for you to fetch changes up to d62890885efbc48acea46964ea3af69b61c8c5eb:
batman-adv: Accept only filled wifi station info (2017-06-13 12:25:43 +0200)
----------------------------------------------------------------
This feature/cleanup patchset includes the following patches:
- bump version strings, by Simon Wunderlich
- decrease maximum fragment size, by Matthias Schiffer
- Clean up seqfile writing, by Markus Elfring (2 patches)
- use __func__ in debug messages, by Sven Eckelmann
- Mark tpmeter initializers with __init, by Antonio Quartulli
- ignore loop detection MAC addresses, by Simon Wunderlich
- clean up some return handling, by Simon Wunderlich
- improve ELP throughput value handling for WiFi neighbors
in BATMAN V/ELP, by Sven Eckelmann (2 patches)
----------------------------------------------------------------
Antonio Quartulli (1):
batman-adv: tp_meter: mark init function with __init
Markus Elfring (2):
batman-adv: Replace a seq_puts() call by seq_putc() in two functions
batman-adv: Combine two seq_puts() calls into one call in batadv_nc_nodes_seq_print_text()
Matthias Schiffer (1):
batman-adv: decrease maximum fragment size
Simon Wunderlich (3):
batman-adv: Start new development cycle
batman-adv: do not add loop detection mac addresses to global tt
batman-adv: simplify return handling in some TT functions
Sven Eckelmann (3):
batman-adv: Print correct function names in dbg messages
batman-adv: Use default throughput value on cfg80211 error
batman-adv: Accept only filled wifi station info
net/batman-adv/bat_iv_ogm.c | 5 ++-
net/batman-adv/bat_v.c | 2 +-
net/batman-adv/bat_v_elp.c | 10 ++++-
net/batman-adv/bridge_loop_avoidance.c | 73 ++++++++++++++++++----------------
net/batman-adv/distributed-arp-table.c | 2 +-
net/batman-adv/main.h | 4 +-
net/batman-adv/network-coding.c | 4 +-
net/batman-adv/routing.c | 4 +-
net/batman-adv/send.c | 6 +--
net/batman-adv/tp_meter.c | 3 +-
net/batman-adv/translation-table.c | 21 +++++-----
11 files changed, 72 insertions(+), 62 deletions(-)
^ permalink raw reply [flat|nested] 12+ messages in thread[parent not found: <20170613113700.31220-1-sw-2YrNx6rUIHYiY0qSoAWiAoQuADTiUCJX@public.gmane.org>]
* [PATCH 01/10] batman-adv: Start new development cycle [not found] ` <20170613113700.31220-1-sw-2YrNx6rUIHYiY0qSoAWiAoQuADTiUCJX@public.gmane.org> @ 2017-06-13 11:36 ` Simon Wunderlich 0 siblings, 0 replies; 12+ messages in thread From: Simon Wunderlich @ 2017-06-13 11:36 UTC (permalink / raw) To: davem-fT/PcQaiUtIeIZ0/mPfg9Q Cc: netdev-u79uwXL29TY76Z2rM5mHXA, b.a.t.m.a.n-ZwoEplunGu2X36UT3dwllkB+6BGkLq7r Signed-off-by: Simon Wunderlich <sw-2YrNx6rUIHYiY0qSoAWiAoQuADTiUCJX@public.gmane.org> --- net/batman-adv/main.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/net/batman-adv/main.h b/net/batman-adv/main.h index 810f7d026f54..feaf60e4cbc3 100644 --- a/net/batman-adv/main.h +++ b/net/batman-adv/main.h @@ -24,7 +24,7 @@ #define BATADV_DRIVER_DEVICE "batman-adv" #ifndef BATADV_SOURCE_VERSION -#define BATADV_SOURCE_VERSION "2017.1" +#define BATADV_SOURCE_VERSION "2017.2" #endif /* B.A.T.M.A.N. parameters */ -- 2.11.0 ^ permalink raw reply related [flat|nested] 12+ messages in thread
* [PATCH 02/10] batman-adv: decrease maximum fragment size 2017-06-13 11:36 [PATCH 00/10] pull request for net-next: batman-adv 2017-06-13 Simon Wunderlich [not found] ` <20170613113700.31220-1-sw-2YrNx6rUIHYiY0qSoAWiAoQuADTiUCJX@public.gmane.org> @ 2017-06-13 11:36 ` Simon Wunderlich 2017-06-13 11:36 ` [PATCH 03/10] batman-adv: Replace a seq_puts() call by seq_putc() in two functions Simon Wunderlich ` (8 subsequent siblings) 10 siblings, 0 replies; 12+ messages in thread From: Simon Wunderlich @ 2017-06-13 11:36 UTC (permalink / raw) To: davem Cc: netdev, b.a.t.m.a.n, Matthias Schiffer, Linus Lüssing, Sven Eckelmann, Simon Wunderlich From: Matthias Schiffer <mschiffer@universe-factory.net> With this patch the maximum fragment size is reduced from 1400 to 1280 bytes. Fragmentation v2 correctly uses the smaller of 1400 and the interface MTU, thus generally supporting interfaces with an MTU < 1400 bytes, too. However, currently "Fragmentation v2" does not support re-fragmentation. Which means that once a packet is split into two packets of 1400 + x bytes for instance and the next hop provides an interface with an even smaller MTU of 1280 bytes, then the larger fragment is lost. A maximum fragment size of 1280 bytes is a safer option as this is the minimum MTU required by IPv6, making interfaces with an MTU < 1280 rather exotic. Regarding performance, this should have no negative impact on unicast traffic: Having some more bytes in the smaller and some less in the larger does not change the sum of both fragments. Concerning TT, choosing 1280 bytes fragments might result in more TT messages than necessary when a large network is bridged into batman-adv. However, the TT overhead in general is marginal due to its reactive nature, therefore such a performance impact on TT should not be noticeable for a user. Cc: Matthias Schiffer <mschiffer@universe-factory.net> [linus.luessing@c0d3.blue: Added commit message] Signed-off-by: Linus Lüssing <linus.luessing@c0d3.blue> Signed-off-by: Sven Eckelmann <sven@narfation.org> Signed-off-by: Simon Wunderlich <sw@simonwunderlich.de> --- net/batman-adv/main.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/net/batman-adv/main.h b/net/batman-adv/main.h index feaf60e4cbc3..2be8f1f46529 100644 --- a/net/batman-adv/main.h +++ b/net/batman-adv/main.h @@ -168,7 +168,7 @@ enum batadv_uev_type { /* Maximum number of fragments for one packet */ #define BATADV_FRAG_MAX_FRAGMENTS 16 /* Maxumim size of each fragment */ -#define BATADV_FRAG_MAX_FRAG_SIZE 1400 +#define BATADV_FRAG_MAX_FRAG_SIZE 1280 /* Time to keep fragments while waiting for rest of the fragments */ #define BATADV_FRAG_TIMEOUT 10000 -- 2.11.0 ^ permalink raw reply related [flat|nested] 12+ messages in thread
* [PATCH 03/10] batman-adv: Replace a seq_puts() call by seq_putc() in two functions 2017-06-13 11:36 [PATCH 00/10] pull request for net-next: batman-adv 2017-06-13 Simon Wunderlich [not found] ` <20170613113700.31220-1-sw-2YrNx6rUIHYiY0qSoAWiAoQuADTiUCJX@public.gmane.org> 2017-06-13 11:36 ` [PATCH 02/10] batman-adv: decrease maximum fragment size Simon Wunderlich @ 2017-06-13 11:36 ` Simon Wunderlich 2017-06-13 11:36 ` [PATCH 04/10] batman-adv: Combine two seq_puts() calls into one call in batadv_nc_nodes_seq_print_text() Simon Wunderlich ` (7 subsequent siblings) 10 siblings, 0 replies; 12+ messages in thread From: Simon Wunderlich @ 2017-06-13 11:36 UTC (permalink / raw) To: davem; +Cc: netdev, b.a.t.m.a.n, Markus Elfring, Sven Eckelmann, Simon Wunderlich From: Markus Elfring <elfring@users.sourceforge.net> Two single characters (line breaks) should be put into a sequence. Thus use the corresponding function "seq_putc". This issue was detected by using the Coccinelle software. Signed-off-by: Markus Elfring <elfring@users.sourceforge.net> Signed-off-by: Sven Eckelmann <sven@narfation.org> Signed-off-by: Simon Wunderlich <sw@simonwunderlich.de> --- net/batman-adv/bat_iv_ogm.c | 2 +- net/batman-adv/bat_v.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/net/batman-adv/bat_iv_ogm.c b/net/batman-adv/bat_iv_ogm.c index 495ba7cdcb04..1f80392ab37c 100644 --- a/net/batman-adv/bat_iv_ogm.c +++ b/net/batman-adv/bat_iv_ogm.c @@ -1944,7 +1944,7 @@ static void batadv_iv_ogm_orig_print(struct batadv_priv *bat_priv, batadv_iv_ogm_orig_print_neigh(orig_node, if_outgoing, seq); - seq_puts(seq, "\n"); + seq_putc(seq, '\n'); batman_count++; next: diff --git a/net/batman-adv/bat_v.c b/net/batman-adv/bat_v.c index a36c8e7291d6..4e2724c5b33d 100644 --- a/net/batman-adv/bat_v.c +++ b/net/batman-adv/bat_v.c @@ -400,7 +400,7 @@ static void batadv_v_orig_print(struct batadv_priv *bat_priv, neigh_node->if_incoming->net_dev->name); batadv_v_orig_print_neigh(orig_node, if_outgoing, seq); - seq_puts(seq, "\n"); + seq_putc(seq, '\n'); batman_count++; next: -- 2.11.0 ^ permalink raw reply related [flat|nested] 12+ messages in thread
* [PATCH 04/10] batman-adv: Combine two seq_puts() calls into one call in batadv_nc_nodes_seq_print_text() 2017-06-13 11:36 [PATCH 00/10] pull request for net-next: batman-adv 2017-06-13 Simon Wunderlich ` (2 preceding siblings ...) 2017-06-13 11:36 ` [PATCH 03/10] batman-adv: Replace a seq_puts() call by seq_putc() in two functions Simon Wunderlich @ 2017-06-13 11:36 ` Simon Wunderlich 2017-06-13 11:36 ` [PATCH 05/10] batman-adv: Print correct function names in dbg messages Simon Wunderlich ` (6 subsequent siblings) 10 siblings, 0 replies; 12+ messages in thread From: Simon Wunderlich @ 2017-06-13 11:36 UTC (permalink / raw) To: davem; +Cc: netdev, b.a.t.m.a.n, Markus Elfring, Sven Eckelmann, Simon Wunderlich From: Markus Elfring <elfring@users.sourceforge.net> A bit of text was put into a sequence by two separate function calls. Print the same data by a single function call instead. This issue was detected by using the Coccinelle software. Signed-off-by: Markus Elfring <elfring@users.sourceforge.net> Signed-off-by: Sven Eckelmann <sven@narfation.org> Signed-off-by: Simon Wunderlich <sw@simonwunderlich.de> --- net/batman-adv/network-coding.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/net/batman-adv/network-coding.c b/net/batman-adv/network-coding.c index e1f6fc72fe3e..3604d7899e2c 100644 --- a/net/batman-adv/network-coding.c +++ b/net/batman-adv/network-coding.c @@ -1935,9 +1935,7 @@ int batadv_nc_nodes_seq_print_text(struct seq_file *seq, void *offset) list) seq_printf(seq, "%pM ", nc_node->addr); - seq_puts(seq, "\n"); - - seq_puts(seq, " Outgoing: "); + seq_puts(seq, "\n Outgoing: "); /* For out_nc_node to this orig_node */ list_for_each_entry_rcu(nc_node, &orig_node->out_coding_list, -- 2.11.0 ^ permalink raw reply related [flat|nested] 12+ messages in thread
* [PATCH 05/10] batman-adv: Print correct function names in dbg messages 2017-06-13 11:36 [PATCH 00/10] pull request for net-next: batman-adv 2017-06-13 Simon Wunderlich ` (3 preceding siblings ...) 2017-06-13 11:36 ` [PATCH 04/10] batman-adv: Combine two seq_puts() calls into one call in batadv_nc_nodes_seq_print_text() Simon Wunderlich @ 2017-06-13 11:36 ` Simon Wunderlich 2017-06-13 11:36 ` [PATCH 06/10] batman-adv: tp_meter: mark init function with __init Simon Wunderlich ` (5 subsequent siblings) 10 siblings, 0 replies; 12+ messages in thread From: Simon Wunderlich @ 2017-06-13 11:36 UTC (permalink / raw) To: davem; +Cc: netdev, b.a.t.m.a.n, Sven Eckelmann, Simon Wunderlich From: Sven Eckelmann <sven@narfation.org> The function names in batman-adv changed slightly in the past. But some of the debug messages were not updated correctly and therefore some messages were incorrect. To avoid this in the future, these kind of messages should use __func__ to automatically print the correct function name. Signed-off-by: Sven Eckelmann <sven@narfation.org> Signed-off-by: Simon Wunderlich <sw@simonwunderlich.de> --- net/batman-adv/bat_iv_ogm.c | 3 +- net/batman-adv/bridge_loop_avoidance.c | 73 ++++++++++++++++++---------------- net/batman-adv/distributed-arp-table.c | 2 +- net/batman-adv/routing.c | 4 +- net/batman-adv/send.c | 6 +-- 5 files changed, 46 insertions(+), 42 deletions(-) diff --git a/net/batman-adv/bat_iv_ogm.c b/net/batman-adv/bat_iv_ogm.c index 1f80392ab37c..fa8d6b475c06 100644 --- a/net/batman-adv/bat_iv_ogm.c +++ b/net/batman-adv/bat_iv_ogm.c @@ -1022,7 +1022,8 @@ batadv_iv_ogm_orig_update(struct batadv_priv *bat_priv, u8 tq_avg; batadv_dbg(BATADV_DBG_BATMAN, bat_priv, - "update_originator(): Searching and updating originator entry of received packet\n"); + "%s(): Searching and updating originator entry of received packet\n", + __func__); rcu_read_lock(); hlist_for_each_entry_rcu(tmp_neigh_node, diff --git a/net/batman-adv/bridge_loop_avoidance.c b/net/batman-adv/bridge_loop_avoidance.c index d07e89ec8467..cdd8e8e4df0b 100644 --- a/net/batman-adv/bridge_loop_avoidance.c +++ b/net/batman-adv/bridge_loop_avoidance.c @@ -394,7 +394,7 @@ static void batadv_bla_send_claim(struct batadv_priv *bat_priv, u8 *mac, */ ether_addr_copy(ethhdr->h_source, mac); batadv_dbg(BATADV_DBG_BLA, bat_priv, - "bla_send_claim(): CLAIM %pM on vid %d\n", mac, + "%s(): CLAIM %pM on vid %d\n", __func__, mac, batadv_print_vid(vid)); break; case BATADV_CLAIM_TYPE_UNCLAIM: @@ -403,7 +403,7 @@ static void batadv_bla_send_claim(struct batadv_priv *bat_priv, u8 *mac, */ ether_addr_copy(hw_src, mac); batadv_dbg(BATADV_DBG_BLA, bat_priv, - "bla_send_claim(): UNCLAIM %pM on vid %d\n", mac, + "%s(): UNCLAIM %pM on vid %d\n", __func__, mac, batadv_print_vid(vid)); break; case BATADV_CLAIM_TYPE_ANNOUNCE: @@ -412,7 +412,7 @@ static void batadv_bla_send_claim(struct batadv_priv *bat_priv, u8 *mac, */ ether_addr_copy(hw_src, mac); batadv_dbg(BATADV_DBG_BLA, bat_priv, - "bla_send_claim(): ANNOUNCE of %pM on vid %d\n", + "%s(): ANNOUNCE of %pM on vid %d\n", __func__, ethhdr->h_source, batadv_print_vid(vid)); break; case BATADV_CLAIM_TYPE_REQUEST: @@ -423,15 +423,15 @@ static void batadv_bla_send_claim(struct batadv_priv *bat_priv, u8 *mac, ether_addr_copy(hw_src, mac); ether_addr_copy(ethhdr->h_dest, mac); batadv_dbg(BATADV_DBG_BLA, bat_priv, - "bla_send_claim(): REQUEST of %pM to %pM on vid %d\n", + "%s(): REQUEST of %pM to %pM on vid %d\n", __func__, ethhdr->h_source, ethhdr->h_dest, batadv_print_vid(vid)); break; case BATADV_CLAIM_TYPE_LOOPDETECT: ether_addr_copy(ethhdr->h_source, mac); batadv_dbg(BATADV_DBG_BLA, bat_priv, - "bla_send_claim(): LOOPDETECT of %pM to %pM on vid %d\n", - ethhdr->h_source, ethhdr->h_dest, + "%s(): LOOPDETECT of %pM to %pM on vid %d\n", + __func__, ethhdr->h_source, ethhdr->h_dest, batadv_print_vid(vid)); break; @@ -509,7 +509,7 @@ batadv_bla_get_backbone_gw(struct batadv_priv *bat_priv, u8 *orig, return entry; batadv_dbg(BATADV_DBG_BLA, bat_priv, - "bla_get_backbone_gw(): not found (%pM, %d), creating new entry\n", + "%s(): not found (%pM, %d), creating new entry\n", __func__, orig, batadv_print_vid(vid)); entry = kzalloc(sizeof(*entry), GFP_ATOMIC); @@ -605,7 +605,8 @@ static void batadv_bla_answer_request(struct batadv_priv *bat_priv, int i; batadv_dbg(BATADV_DBG_BLA, bat_priv, - "bla_answer_request(): received a claim request, send all of our own claims again\n"); + "%s(): received a claim request, send all of our own claims again\n", + __func__); backbone_gw = batadv_backbone_hash_find(bat_priv, primary_if->net_dev->dev_addr, @@ -718,8 +719,8 @@ static void batadv_bla_add_claim(struct batadv_priv *bat_priv, kref_init(&claim->refcount); batadv_dbg(BATADV_DBG_BLA, bat_priv, - "bla_add_claim(): adding new entry %pM, vid %d to hash ...\n", - mac, batadv_print_vid(vid)); + "%s(): adding new entry %pM, vid %d to hash ...\n", + __func__, mac, batadv_print_vid(vid)); kref_get(&claim->refcount); hash_added = batadv_hash_add(bat_priv->bla.claim_hash, @@ -739,8 +740,9 @@ static void batadv_bla_add_claim(struct batadv_priv *bat_priv, goto claim_free_ref; batadv_dbg(BATADV_DBG_BLA, bat_priv, - "bla_add_claim(): changing ownership for %pM, vid %d to gw %pM\n", - mac, batadv_print_vid(vid), backbone_gw->orig); + "%s(): changing ownership for %pM, vid %d to gw %pM\n", + __func__, mac, batadv_print_vid(vid), + backbone_gw->orig); remove_crc = true; } @@ -808,7 +810,7 @@ static void batadv_bla_del_claim(struct batadv_priv *bat_priv, if (!claim) return; - batadv_dbg(BATADV_DBG_BLA, bat_priv, "bla_del_claim(): %pM, vid %d\n", + batadv_dbg(BATADV_DBG_BLA, bat_priv, "%s(): %pM, vid %d\n", __func__, mac, batadv_print_vid(vid)); batadv_hash_remove(bat_priv->bla.claim_hash, batadv_compare_claim, @@ -848,8 +850,8 @@ static bool batadv_handle_announce(struct batadv_priv *bat_priv, u8 *an_addr, crc = ntohs(*((__be16 *)(&an_addr[4]))); batadv_dbg(BATADV_DBG_BLA, bat_priv, - "handle_announce(): ANNOUNCE vid %d (sent by %pM)... CRC = %#.4x\n", - batadv_print_vid(vid), backbone_gw->orig, crc); + "%s(): ANNOUNCE vid %d (sent by %pM)... CRC = %#.4x\n", + __func__, batadv_print_vid(vid), backbone_gw->orig, crc); spin_lock_bh(&backbone_gw->crc_lock); backbone_crc = backbone_gw->crc; @@ -857,8 +859,8 @@ static bool batadv_handle_announce(struct batadv_priv *bat_priv, u8 *an_addr, if (backbone_crc != crc) { batadv_dbg(BATADV_DBG_BLA, backbone_gw->bat_priv, - "handle_announce(): CRC FAILED for %pM/%d (my = %#.4x, sent = %#.4x)\n", - backbone_gw->orig, + "%s(): CRC FAILED for %pM/%d (my = %#.4x, sent = %#.4x)\n", + __func__, backbone_gw->orig, batadv_print_vid(backbone_gw->vid), backbone_crc, crc); @@ -903,8 +905,8 @@ static bool batadv_handle_request(struct batadv_priv *bat_priv, return true; batadv_dbg(BATADV_DBG_BLA, bat_priv, - "handle_request(): REQUEST vid %d (sent by %pM)...\n", - batadv_print_vid(vid), ethhdr->h_source); + "%s(): REQUEST vid %d (sent by %pM)...\n", + __func__, batadv_print_vid(vid), ethhdr->h_source); batadv_bla_answer_request(bat_priv, primary_if, vid); return true; @@ -940,7 +942,7 @@ static bool batadv_handle_unclaim(struct batadv_priv *bat_priv, /* this must be an UNCLAIM frame */ batadv_dbg(BATADV_DBG_BLA, bat_priv, - "handle_unclaim(): UNCLAIM %pM on vid %d (sent by %pM)...\n", + "%s(): UNCLAIM %pM on vid %d (sent by %pM)...\n", __func__, claim_addr, batadv_print_vid(vid), backbone_gw->orig); batadv_bla_del_claim(bat_priv, claim_addr, vid); @@ -1160,9 +1162,9 @@ static bool batadv_bla_process_claim(struct batadv_priv *bat_priv, ethhdr); if (ret == 1) batadv_dbg(BATADV_DBG_BLA, bat_priv, - "bla_process_claim(): received a claim frame from another group. From: %pM on vid %d ...(hw_src %pM, hw_dst %pM)\n", - ethhdr->h_source, batadv_print_vid(vid), hw_src, - hw_dst); + "%s(): received a claim frame from another group. From: %pM on vid %d ...(hw_src %pM, hw_dst %pM)\n", + __func__, ethhdr->h_source, batadv_print_vid(vid), + hw_src, hw_dst); if (ret < 2) return !!ret; @@ -1196,8 +1198,9 @@ static bool batadv_bla_process_claim(struct batadv_priv *bat_priv, } batadv_dbg(BATADV_DBG_BLA, bat_priv, - "bla_process_claim(): ERROR - this looks like a claim frame, but is useless. eth src %pM on vid %d ...(hw_src %pM, hw_dst %pM)\n", - ethhdr->h_source, batadv_print_vid(vid), hw_src, hw_dst); + "%s(): ERROR - this looks like a claim frame, but is useless. eth src %pM on vid %d ...(hw_src %pM, hw_dst %pM)\n", + __func__, ethhdr->h_source, batadv_print_vid(vid), hw_src, + hw_dst); return true; } @@ -1237,8 +1240,8 @@ static void batadv_bla_purge_backbone_gw(struct batadv_priv *bat_priv, int now) continue; batadv_dbg(BATADV_DBG_BLA, backbone_gw->bat_priv, - "bla_purge_backbone_gw(): backbone gw %pM timed out\n", - backbone_gw->orig); + "%s(): backbone gw %pM timed out\n", + __func__, backbone_gw->orig); purge_now: /* don't wait for the pending request anymore */ @@ -1295,11 +1298,11 @@ static void batadv_bla_purge_claims(struct batadv_priv *bat_priv, goto skip; batadv_dbg(BATADV_DBG_BLA, bat_priv, - "bla_purge_claims(): timed out.\n"); + "%s(): timed out.\n", __func__); purge_now: batadv_dbg(BATADV_DBG_BLA, bat_priv, - "bla_purge_claims(): %pM, vid %d\n", + "%s(): %pM, vid %d\n", __func__, claim->addr, claim->vid); batadv_handle_unclaim(bat_priv, primary_if, @@ -1851,8 +1854,8 @@ bool batadv_bla_rx(struct batadv_priv *bat_priv, struct sk_buff *skb, */ batadv_dbg(BATADV_DBG_BLA, bat_priv, - "bla_rx(): Unclaimed MAC %pM found. Claim it. Local: %s\n", - ethhdr->h_source, + "%s(): Unclaimed MAC %pM found. Claim it. Local: %s\n", + __func__, ethhdr->h_source, batadv_is_my_client(bat_priv, ethhdr->h_source, vid) ? "yes" : "no"); @@ -1978,15 +1981,15 @@ bool batadv_bla_tx(struct batadv_priv *bat_priv, struct sk_buff *skb, * older than 100 ms to make sure we really * have a roaming client here. */ - batadv_dbg(BATADV_DBG_BLA, bat_priv, "bla_tx(): Roaming client %pM detected. Unclaim it.\n", - ethhdr->h_source); + batadv_dbg(BATADV_DBG_BLA, bat_priv, "%s(): Roaming client %pM detected. Unclaim it.\n", + __func__, ethhdr->h_source); batadv_handle_unclaim(bat_priv, primary_if, primary_if->net_dev->dev_addr, ethhdr->h_source, vid); goto allow; } else { - batadv_dbg(BATADV_DBG_BLA, bat_priv, "bla_tx(): Race for claim %pM detected. Drop packet.\n", - ethhdr->h_source); + batadv_dbg(BATADV_DBG_BLA, bat_priv, "%s(): Race for claim %pM detected. Drop packet.\n", + __func__, ethhdr->h_source); goto handled; } } diff --git a/net/batman-adv/distributed-arp-table.c b/net/batman-adv/distributed-arp-table.c index 013e970eff39..362cae2ef82a 100644 --- a/net/batman-adv/distributed-arp-table.c +++ b/net/batman-adv/distributed-arp-table.c @@ -601,7 +601,7 @@ batadv_dat_select_candidates(struct batadv_priv *bat_priv, __be32 ip_dst, BATADV_DAT_ADDR_MAX); batadv_dbg(BATADV_DBG_DAT, bat_priv, - "dat_select_candidates(): IP=%pI4 hash(IP)=%u\n", &ip_dst, + "%s(): IP=%pI4 hash(IP)=%u\n", __func__, &ip_dst, ip_key); for (select = 0; select < BATADV_DAT_CANDIDATES_NUM; select++) diff --git a/net/batman-adv/routing.c b/net/batman-adv/routing.c index e1ebe14ee2a6..1338b9221613 100644 --- a/net/batman-adv/routing.c +++ b/net/batman-adv/routing.c @@ -985,8 +985,8 @@ int batadv_recv_unicast_packet(struct sk_buff *skb, batadv_orig_node_put(orig_node_gw); if (is_gw) { batadv_dbg(BATADV_DBG_BLA, bat_priv, - "recv_unicast_packet(): Dropped unicast pkt received from another backbone gw %pM.\n", - orig_addr_gw); + "%s(): Dropped unicast pkt received from another backbone gw %pM.\n", + __func__, orig_addr_gw); return NET_RX_DROP; } } diff --git a/net/batman-adv/send.c b/net/batman-adv/send.c index 403df596a73d..d239a9d72ac3 100644 --- a/net/batman-adv/send.c +++ b/net/batman-adv/send.c @@ -971,11 +971,11 @@ batadv_purge_outstanding_packets(struct batadv_priv *bat_priv, if (hard_iface) batadv_dbg(BATADV_DBG_BATMAN, bat_priv, - "purge_outstanding_packets(): %s\n", - hard_iface->net_dev->name); + "%s(): %s\n", + __func__, hard_iface->net_dev->name); else batadv_dbg(BATADV_DBG_BATMAN, bat_priv, - "purge_outstanding_packets()\n"); + "%s()\n", __func__); /* claim bcast list for free() */ spin_lock_bh(&bat_priv->forw_bcast_list_lock); -- 2.11.0 ^ permalink raw reply related [flat|nested] 12+ messages in thread
* [PATCH 06/10] batman-adv: tp_meter: mark init function with __init 2017-06-13 11:36 [PATCH 00/10] pull request for net-next: batman-adv 2017-06-13 Simon Wunderlich ` (4 preceding siblings ...) 2017-06-13 11:36 ` [PATCH 05/10] batman-adv: Print correct function names in dbg messages Simon Wunderlich @ 2017-06-13 11:36 ` Simon Wunderlich 2017-06-13 11:36 ` [PATCH 07/10] batman-adv: do not add loop detection mac addresses to global tt Simon Wunderlich ` (4 subsequent siblings) 10 siblings, 0 replies; 12+ messages in thread From: Simon Wunderlich @ 2017-06-13 11:36 UTC (permalink / raw) To: davem Cc: netdev, b.a.t.m.a.n, Antonio Quartulli, Sven Eckelmann, Simon Wunderlich From: Antonio Quartulli <a@unstable.cc> batadv_tp_meter_init() is invoked in batadv_init() only which is marked with __init. For this reason batadv_tp_meter_init() can be marked with __init as well and dropped after module load. Signed-off-by: Antonio Quartulli <a@unstable.cc> Signed-off-by: Sven Eckelmann <sven@narfation.org> Signed-off-by: Simon Wunderlich <sw@simonwunderlich.de> --- net/batman-adv/tp_meter.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/net/batman-adv/tp_meter.c b/net/batman-adv/tp_meter.c index 556f9a865ddf..e3e2585d0977 100644 --- a/net/batman-adv/tp_meter.c +++ b/net/batman-adv/tp_meter.c @@ -27,6 +27,7 @@ #include <linux/etherdevice.h> #include <linux/fs.h> #include <linux/if_ether.h> +#include <linux/init.h> #include <linux/jiffies.h> #include <linux/kernel.h> #include <linux/kref.h> @@ -1497,7 +1498,7 @@ void batadv_tp_meter_recv(struct batadv_priv *bat_priv, struct sk_buff *skb) /** * batadv_tp_meter_init - initialize global tp_meter structures */ -void batadv_tp_meter_init(void) +void __init batadv_tp_meter_init(void) { get_random_bytes(batadv_tp_prerandom, sizeof(batadv_tp_prerandom)); } -- 2.11.0 ^ permalink raw reply related [flat|nested] 12+ messages in thread
* [PATCH 07/10] batman-adv: do not add loop detection mac addresses to global tt 2017-06-13 11:36 [PATCH 00/10] pull request for net-next: batman-adv 2017-06-13 Simon Wunderlich ` (5 preceding siblings ...) 2017-06-13 11:36 ` [PATCH 06/10] batman-adv: tp_meter: mark init function with __init Simon Wunderlich @ 2017-06-13 11:36 ` Simon Wunderlich 2017-06-13 11:36 ` [PATCH 08/10] batman-adv: simplify return handling in some TT functions Simon Wunderlich ` (3 subsequent siblings) 10 siblings, 0 replies; 12+ messages in thread From: Simon Wunderlich @ 2017-06-13 11:36 UTC (permalink / raw) To: davem; +Cc: netdev, b.a.t.m.a.n, Simon Wunderlich, Sven Eckelmann This change has been made for local TT already, add another one for global TT - but only for temporary entries (aka speedy join), to prevent inconsistencies between local and global tables in case an older batman-adv version is still announcing those entries from its local table. Signed-off-by: Simon Wunderlich <sw@simonwunderlich.de> Signed-off-by: Sven Eckelmann <sven@narfation.org> --- net/batman-adv/translation-table.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/net/batman-adv/translation-table.c b/net/batman-adv/translation-table.c index e75b4937b497..4b64a9a633d9 100644 --- a/net/batman-adv/translation-table.c +++ b/net/batman-adv/translation-table.c @@ -4012,6 +4012,12 @@ bool batadv_tt_add_temporary_global_entry(struct batadv_priv *bat_priv, { bool ret = false; + /* ignore loop detect macs, they are not supposed to be in the tt local + * data as well. + */ + if (batadv_bla_is_loopdetect_mac(addr)) + return false; + if (!batadv_tt_global_add(bat_priv, orig_node, addr, vid, BATADV_TT_CLIENT_TEMP, atomic_read(&orig_node->last_ttvn))) -- 2.11.0 ^ permalink raw reply related [flat|nested] 12+ messages in thread
* [PATCH 08/10] batman-adv: simplify return handling in some TT functions 2017-06-13 11:36 [PATCH 00/10] pull request for net-next: batman-adv 2017-06-13 Simon Wunderlich ` (6 preceding siblings ...) 2017-06-13 11:36 ` [PATCH 07/10] batman-adv: do not add loop detection mac addresses to global tt Simon Wunderlich @ 2017-06-13 11:36 ` Simon Wunderlich 2017-06-13 11:36 ` [PATCH 09/10] batman-adv: Use default throughput value on cfg80211 error Simon Wunderlich ` (2 subsequent siblings) 10 siblings, 0 replies; 12+ messages in thread From: Simon Wunderlich @ 2017-06-13 11:36 UTC (permalink / raw) To: davem; +Cc: netdev, b.a.t.m.a.n, Simon Wunderlich, Sven Eckelmann Signed-off-by: Simon Wunderlich <sw@simonwunderlich.de> Signed-off-by: Sven Eckelmann <sven@narfation.org> --- net/batman-adv/translation-table.c | 17 ++++++----------- 1 file changed, 6 insertions(+), 11 deletions(-) diff --git a/net/batman-adv/translation-table.c b/net/batman-adv/translation-table.c index 4b64a9a633d9..e1133bc634b5 100644 --- a/net/batman-adv/translation-table.c +++ b/net/batman-adv/translation-table.c @@ -2488,18 +2488,16 @@ static bool _batadv_is_ap_isolated(struct batadv_tt_local_entry *tt_local_entry, struct batadv_tt_global_entry *tt_global_entry) { - bool ret = false; - if (tt_local_entry->common.flags & BATADV_TT_CLIENT_WIFI && tt_global_entry->common.flags & BATADV_TT_CLIENT_WIFI) - ret = true; + return true; /* check if the two clients are marked as isolated */ if (tt_local_entry->common.flags & BATADV_TT_CLIENT_ISOLA && tt_global_entry->common.flags & BATADV_TT_CLIENT_ISOLA) - ret = true; + return true; - return ret; + return false; } /** @@ -4010,8 +4008,6 @@ bool batadv_tt_add_temporary_global_entry(struct batadv_priv *bat_priv, const unsigned char *addr, unsigned short vid) { - bool ret = false; - /* ignore loop detect macs, they are not supposed to be in the tt local * data as well. */ @@ -4021,14 +4017,13 @@ bool batadv_tt_add_temporary_global_entry(struct batadv_priv *bat_priv, if (!batadv_tt_global_add(bat_priv, orig_node, addr, vid, BATADV_TT_CLIENT_TEMP, atomic_read(&orig_node->last_ttvn))) - goto out; + return false; batadv_dbg(BATADV_DBG_TT, bat_priv, "Added temporary global client (addr: %pM, vid: %d, orig: %pM)\n", addr, batadv_print_vid(vid), orig_node->orig); - ret = true; -out: - return ret; + + return true; } /** -- 2.11.0 ^ permalink raw reply related [flat|nested] 12+ messages in thread
* [PATCH 09/10] batman-adv: Use default throughput value on cfg80211 error 2017-06-13 11:36 [PATCH 00/10] pull request for net-next: batman-adv 2017-06-13 Simon Wunderlich ` (7 preceding siblings ...) 2017-06-13 11:36 ` [PATCH 08/10] batman-adv: simplify return handling in some TT functions Simon Wunderlich @ 2017-06-13 11:36 ` Simon Wunderlich 2017-06-13 11:37 ` [PATCH 10/10] batman-adv: Accept only filled wifi station info Simon Wunderlich 2017-06-13 17:52 ` [PATCH 00/10] pull request for net-next: batman-adv 2017-06-13 David Miller 10 siblings, 0 replies; 12+ messages in thread From: Simon Wunderlich @ 2017-06-13 11:36 UTC (permalink / raw) To: davem; +Cc: netdev, b.a.t.m.a.n, Sven Eckelmann, Simon Wunderlich From: Sven Eckelmann <sven@narfation.org> A wifi interface should never be handled like an ethernet devices. The parser of the cfg80211 output must therefore skip the ethtool code when cfg80211_get_station returned an error. Fixes: f44a3ae9a281 ("batman-adv: refactor wifi interface detection") Signed-off-by: Sven Eckelmann <sven@narfation.org> Reviewed-by: Marek Lindner <mareklindner@neomailbox.ch> Signed-off-by: Simon Wunderlich <sw@simonwunderlich.de> --- net/batman-adv/bat_v_elp.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/net/batman-adv/bat_v_elp.c b/net/batman-adv/bat_v_elp.c index b90c9903e246..96e7333764f0 100644 --- a/net/batman-adv/bat_v_elp.c +++ b/net/batman-adv/bat_v_elp.c @@ -109,8 +109,10 @@ static u32 batadv_v_elp_get_throughput(struct batadv_hardif_neigh_node *neigh) */ return 0; } - if (!ret) - return sinfo.expected_throughput / 100; + if (ret) + goto default_throughput; + + return sinfo.expected_throughput / 100; } /* if not a wifi interface, check if this device provides data via -- 2.11.0 ^ permalink raw reply related [flat|nested] 12+ messages in thread
* [PATCH 10/10] batman-adv: Accept only filled wifi station info 2017-06-13 11:36 [PATCH 00/10] pull request for net-next: batman-adv 2017-06-13 Simon Wunderlich ` (8 preceding siblings ...) 2017-06-13 11:36 ` [PATCH 09/10] batman-adv: Use default throughput value on cfg80211 error Simon Wunderlich @ 2017-06-13 11:37 ` Simon Wunderlich 2017-06-13 17:52 ` [PATCH 00/10] pull request for net-next: batman-adv 2017-06-13 David Miller 10 siblings, 0 replies; 12+ messages in thread From: Simon Wunderlich @ 2017-06-13 11:37 UTC (permalink / raw) To: davem; +Cc: netdev, b.a.t.m.a.n, Sven Eckelmann, Simon Wunderlich From: Sven Eckelmann <sven@narfation.org> The wifi driver can decide to not provide parts of the station info. For example, the expected throughput of the station can be omitted when the used rate control doesn't provide this kind of information. The B.A.T.M.A.N. V implementation must therefore check the filled bitfield before it tries to access the expected_throughput of the returned station_info. Reported-by: Alvaro Antelo <alvaro.antelo@gmail.com> Fixes: c833484e5f38 ("batman-adv: ELP - compute the metric based on the estimated throughput") Signed-off-by: Sven Eckelmann <sven@narfation.org> Reviewed-by: Marek Lindner <mareklindner@neomailbox.ch> Signed-off-by: Simon Wunderlich <sw@simonwunderlich.de> --- net/batman-adv/bat_v_elp.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/net/batman-adv/bat_v_elp.c b/net/batman-adv/bat_v_elp.c index 96e7333764f0..b58007b79e3a 100644 --- a/net/batman-adv/bat_v_elp.c +++ b/net/batman-adv/bat_v_elp.c @@ -19,6 +19,7 @@ #include "main.h" #include <linux/atomic.h> +#include <linux/bitops.h> #include <linux/byteorder/generic.h> #include <linux/errno.h> #include <linux/etherdevice.h> @@ -29,6 +30,7 @@ #include <linux/kernel.h> #include <linux/kref.h> #include <linux/netdevice.h> +#include <linux/nl80211.h> #include <linux/random.h> #include <linux/rculist.h> #include <linux/rcupdate.h> @@ -111,6 +113,8 @@ static u32 batadv_v_elp_get_throughput(struct batadv_hardif_neigh_node *neigh) } if (ret) goto default_throughput; + if (!(sinfo.filled & BIT(NL80211_STA_INFO_EXPECTED_THROUGHPUT))) + goto default_throughput; return sinfo.expected_throughput / 100; } -- 2.11.0 ^ permalink raw reply related [flat|nested] 12+ messages in thread
* Re: [PATCH 00/10] pull request for net-next: batman-adv 2017-06-13 2017-06-13 11:36 [PATCH 00/10] pull request for net-next: batman-adv 2017-06-13 Simon Wunderlich ` (9 preceding siblings ...) 2017-06-13 11:37 ` [PATCH 10/10] batman-adv: Accept only filled wifi station info Simon Wunderlich @ 2017-06-13 17:52 ` David Miller 10 siblings, 0 replies; 12+ messages in thread From: David Miller @ 2017-06-13 17:52 UTC (permalink / raw) To: sw; +Cc: netdev, b.a.t.m.a.n From: Simon Wunderlich <sw@simonwunderlich.de> Date: Tue, 13 Jun 2017 13:36:50 +0200 > here is our feature/cleanup pull request of batman-adv to go into net-next. > > Please pull or let me know of any problem! Pulled, thanks. ^ permalink raw reply [flat|nested] 12+ messages in thread
end of thread, other threads:[~2017-06-13 17:52 UTC | newest]
Thread overview: 12+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2017-06-13 11:36 [PATCH 00/10] pull request for net-next: batman-adv 2017-06-13 Simon Wunderlich
[not found] ` <20170613113700.31220-1-sw-2YrNx6rUIHYiY0qSoAWiAoQuADTiUCJX@public.gmane.org>
2017-06-13 11:36 ` [PATCH 01/10] batman-adv: Start new development cycle Simon Wunderlich
2017-06-13 11:36 ` [PATCH 02/10] batman-adv: decrease maximum fragment size Simon Wunderlich
2017-06-13 11:36 ` [PATCH 03/10] batman-adv: Replace a seq_puts() call by seq_putc() in two functions Simon Wunderlich
2017-06-13 11:36 ` [PATCH 04/10] batman-adv: Combine two seq_puts() calls into one call in batadv_nc_nodes_seq_print_text() Simon Wunderlich
2017-06-13 11:36 ` [PATCH 05/10] batman-adv: Print correct function names in dbg messages Simon Wunderlich
2017-06-13 11:36 ` [PATCH 06/10] batman-adv: tp_meter: mark init function with __init Simon Wunderlich
2017-06-13 11:36 ` [PATCH 07/10] batman-adv: do not add loop detection mac addresses to global tt Simon Wunderlich
2017-06-13 11:36 ` [PATCH 08/10] batman-adv: simplify return handling in some TT functions Simon Wunderlich
2017-06-13 11:36 ` [PATCH 09/10] batman-adv: Use default throughput value on cfg80211 error Simon Wunderlich
2017-06-13 11:37 ` [PATCH 10/10] batman-adv: Accept only filled wifi station info Simon Wunderlich
2017-06-13 17:52 ` [PATCH 00/10] pull request for net-next: batman-adv 2017-06-13 David Miller
This is a public inbox, see mirroring instructions for how to clone and mirror all data and code used for this inbox; as well as URLs for NNTP newsgroup(s).