Hello David,
Here you have our first pull request intended for net-next.
This batch of patches includes a number of corrections and
improvements for our kernel-doc. These changes also make sure
that our doc is now properly processed by the kernel-doc
parsing tool.
Other than that you have a patch updating all the copyright
lines to 2016 and another patch switching the URLs in our
readme, Kconfig and MAINTAINERS file from "http" to "https".
Both by Sven Eckelmann.
Please pull or let me know of any problem!
Thanks a lot,
Antonio
P.S. as you requested I wrote the message above also in the
git tag so that you get it when pulling from our tree.
this is our first pull request intended for net-next.
The following changes since commit b45efa30a626e915192a6c548cd8642379cd47cc:
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net (2016-02-01 18:44:07 -0800)
are available in the git repository at:
git://git.open-mesh.org/linux-merge.git tags/batman-adv-for-davem
for you to fetch changes up to 7b5e73961915438d623cb80eea97868b3a66cc48:
batman-adv: Switch to HTTPS version of links (2016-02-03 09:54:39 +0800)
----------------------------------------------------------------
This batch of patches includes a number of corrections and
improvements for our kernel-doc. These changes also make sure
that our doc is now properly processed by the kernel-doc
parsing tool.
Other than that you have a patch updating all the copyright
lines to 2016 and another patch switching the URLs in our
readme, Kconfig and MAINTAINERS file from "http" to "https".
Both by Sven Eckelmann.
----------------------------------------------------------------
Antonio Quartulli (3):
batman-adv: fix kerneldoc for DAT functions
batman-adv: fix kerneldoc for TT functions
batman-adv: add kernel doc for AP isolation attributes in bat_priv
Marek Lindner (1):
batman-adv: kernel doc readability updates
Simon Wunderlich (2):
batman-adv: Update/repair bridge loop avoidance kerneldoc
batman-adv: add kerneldoc for batadv_iv_ogm_aggr_packet
Sven Eckelmann (10):
batman-adv: Fix kerneldoc parsing of structs/enums
batman-adv: Remove kerneldoc for missing parameters
batman-adv: Fix names in kerneldoc of functions
batman-adv: Drop invalid kerneldoc for variable batadv_vlan_attrs
batman-adv: Fix kerneldoc parsing of return description
batman-adv: Fix kerneldoc of main functions
batman-adv: Fix kerneldoc of network-coding functions
batman-adv: Fix kernel-doc for batadv_claim_free_ref
batman-adv: update copyright years for 2016
batman-adv: Switch to HTTPS version of links
Documentation/networking/batman-adv.txt | 2 +-
MAINTAINERS | 2 +-
net/batman-adv/Kconfig | 2 +-
net/batman-adv/Makefile | 2 +-
net/batman-adv/bat_algo.h | 2 +-
net/batman-adv/bat_iv_ogm.c | 29 ++--
net/batman-adv/bitarray.c | 14 +-
net/batman-adv/bitarray.h | 14 +-
net/batman-adv/bridge_loop_avoidance.c | 231 +++++++++++++++++++++++---------
net/batman-adv/bridge_loop_avoidance.h | 2 +-
net/batman-adv/debugfs.c | 8 +-
net/batman-adv/debugfs.h | 2 +-
net/batman-adv/distributed-arp-table.c | 43 +++---
net/batman-adv/distributed-arp-table.h | 2 +-
net/batman-adv/fragmentation.c | 20 +--
net/batman-adv/fragmentation.h | 4 +-
net/batman-adv/gateway_client.c | 16 +--
net/batman-adv/gateway_client.h | 2 +-
net/batman-adv/gateway_common.c | 4 +-
net/batman-adv/gateway_common.h | 2 +-
net/batman-adv/hard-interface.c | 9 +-
net/batman-adv/hard-interface.h | 2 +-
net/batman-adv/hash.c | 2 +-
net/batman-adv/hash.h | 24 ++--
net/batman-adv/icmp_socket.c | 2 +-
net/batman-adv/icmp_socket.h | 2 +-
net/batman-adv/main.c | 30 +++--
net/batman-adv/main.h | 19 ++-
net/batman-adv/multicast.c | 37 +++--
net/batman-adv/multicast.h | 4 +-
net/batman-adv/network-coding.c | 57 +++++---
net/batman-adv/network-coding.h | 2 +-
net/batman-adv/originator.c | 56 ++++----
net/batman-adv/originator.h | 2 +-
net/batman-adv/packet.h | 19 ++-
net/batman-adv/routing.c | 38 +++---
net/batman-adv/routing.h | 2 +-
net/batman-adv/send.c | 31 +++--
net/batman-adv/send.h | 6 +-
net/batman-adv/soft-interface.c | 20 +--
net/batman-adv/soft-interface.h | 2 +-
net/batman-adv/sysfs.c | 17 ++-
net/batman-adv/sysfs.h | 2 +-
net/batman-adv/translation-table.c | 119 +++++++++-------
net/batman-adv/translation-table.h | 2 +-
net/batman-adv/types.h | 30 +++--
46 files changed, 584 insertions(+), 355 deletions(-)
Fixes: 5c324517 ("ELP - compute the metric based on the estimated throughput")
Signed-off-by: Marek Lindner <mareklindner(a)neomailbox.ch>
---
net/batman-adv/bat_v_elp.c | 3 ++-
net/batman-adv/main.h | 2 +-
2 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/net/batman-adv/bat_v_elp.c b/net/batman-adv/bat_v_elp.c
index f257897..46c6a00 100644
--- a/net/batman-adv/bat_v_elp.c
+++ b/net/batman-adv/bat_v_elp.c
@@ -67,7 +67,8 @@ static void batadv_v_elp_start_timer(struct batadv_hard_iface *hard_iface)
* batadv_v_elp_get_throughput - get the throughput towards a neighbour
* @neigh: the neighbour for which the throughput has to be obtained
*
- * Return: the throughput towards the given neighbour.
+ * Return: The throughput towards the given neighbour in multiples of 100kpbs
+ * (a value of '10' equals to 1Mbps).
*/
static u32 batadv_v_elp_get_throughput(struct batadv_hardif_neigh_node *neigh)
{
diff --git a/net/batman-adv/main.h b/net/batman-adv/main.h
index 7b05f68..db45336 100644
--- a/net/batman-adv/main.h
+++ b/net/batman-adv/main.h
@@ -62,7 +62,7 @@
#define BATADV_TQ_TOTAL_BIDRECT_LIMIT 1
/* B.A.T.M.A.N. V */
-#define BATADV_THROUGHPUT_DEFAULT_VALUE 10
+#define BATADV_THROUGHPUT_DEFAULT_VALUE 10 /* 1 Mbps */
#define BATADV_ELP_PROBES_PER_NODE 2
#define BATADV_ELP_MIN_PROBE_SIZE 200 /* bytes */
#define BATADV_ELP_PROBE_MAX_TX_DIFF 100 /* milliseconds */
--
2.7.0