Repository : ssh://git@open-mesh.org/batman-adv
On branch : master
>---------------------------------------------------------------
commit d00159aec639311d51fe4cba8c483ab55a0191d4
Author: Markus Pargmann <mpa(a)pengutronix.de>
Date: Fri Dec 26 12:41:34 2014 +0100
batman-adv: iv_ogm, Fix dup_status comment
Signed-off-by: Markus Pargmann <mpa(a)pengutronix.de>
Signed-off-by: Marek Lindner <mareklindner(a)neomailbox.ch>
>---------------------------------------------------------------
d00159aec639311d51fe4cba8c483ab55a0191d4
bat_iv_ogm.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/bat_iv_ogm.c b/bat_iv_ogm.c
index 7d4f6bf..139377e 100644
--- a/bat_iv_ogm.c
+++ b/bat_iv_ogm.c
@@ -28,7 +28,7 @@
/**
* enum batadv_dup_status - duplicate status
- * @BATADV_NO_DUP: the packet is a duplicate
+ * @BATADV_NO_DUP: the packet is no duplicate
* @BATADV_ORIG_DUP: OGM is a duplicate in the originator (but not for the
* neighbor)
* @BATADV_NEIGH_DUP: OGM is a duplicate for the neighbor
The annotated tag, v4.0-rc1 has been created
at 2e0c59488ed2cd9f563dbbc0c8dadf1ff6d985d8 (tag)
tagging c517d838eb7d07bbe9507871fab3931deccff539 (commit)
replaces v3.19
tagged by Linus Torvalds
on Sun Feb 22 18:32:41 2015 -0800
- Shortlog ------------------------------------------------------------
Linux 34.0-rc1
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1
iQEcBAABAgAGBQJU6pFJAAoJEHm+PkMAQRiG2OwH/24nDK+l9zkaRs0xJsVh+qiW
8A2N1od0ickz43iMk48jfeWGkFOkd4izyvan/daJshJOE1Y5lCdSs7jq/OXVOv9L
G0+KQUoC5NL0hqYKn1XJPFluNQ1yqMvrDwQt99grDGzruNGBbwHuBhAQmgzpj1nU
do8KrGjr7ft1Rzm4mOAdET/ExWiF+mRSJSxxOv598HbsIRdM5wgn0hHjPlqDxmLN
KH4r3YYEm0cHyjf4Krse0+YdhqdamRGJlmYxJgEsYNwCoMwkmHlLTc71diseUhrg
r/VYIYQvpAA6Yvgw8rJ0N5gk/sJJig+WyyPhfQuc2bD5sbL9eO7mPnz2UP7z7ss=
=vXB6
-----END PGP SIGNATURE-----
Antonio Quartulli (7):
batman-adv: avoid useless return in void functions
batman-adv: checkpatch - else is not generally useful after a break or return
batman-adv: checkpatch - No space is necessary after a cast
batman-adv: checkpatch - Please use a blank line after declarations
batman-adv: checkpatch - Please don't use multiple blank lines
batman-adv: checkpatch - remove unnecessary parentheses
batman-adv: fix misspelled words
Markus Pargmann (1):
batman-adv: Kconfig, Add missing DEBUG_FS dependency
Martin Hundebøll (5):
batman-adv: kernel doc fixes for bat_iv_ogm.c
batman-adv: kernel doc fixes for bridge_loop_avoidance.c
batman-adv: kernel doc fix for distributed-arp-table.h
batman-adv: kernel doc fixes for main.{c, h}
batman-adv: clear control block of received socket buffers
Simon Wunderlich (2):
batman-adv: remove obsolete variable primary_iface from orig_node
batman-adv: Start new development cycle
-----------------------------------------------------------------------
--
linux integration
Repository : ssh://git@open-mesh.org/batman-adv
On branch : next
>---------------------------------------------------------------
commit e36785ec715e75d2cc6fa48d0115285d9b9ad583
Author: Joe Perches <joe(a)perches.com>
Date: Sun Feb 22 13:47:56 2015 -0800
batman-adv: Fix use of seq_has_overflowed()
net-next commit 6d91147d183c ("batman-adv: Remove uses of return value
of seq_printf") incorrectly changed the overflow occurred return from
-1 to 1. Change it back so that the test of batadv_write_buffer_text's
return value in batadv_gw_client_seq_print_text works properly.
Signed-off-by: Joe Perches <joe(a)perches.com>
Signed-off-by: Marek Lindner <mareklindner(a)neomailbox.ch>
>---------------------------------------------------------------
e36785ec715e75d2cc6fa48d0115285d9b9ad583
gateway_client.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/gateway_client.c b/gateway_client.c
index a0876ea..090828c 100644
--- a/gateway_client.c
+++ b/gateway_client.c
@@ -601,7 +601,7 @@ static int batadv_write_buffer_text(struct batadv_priv *bat_priv,
gw_node->bandwidth_down % 10,
gw_node->bandwidth_up / 10,
gw_node->bandwidth_up % 10);
- ret = seq_has_overflowed(seq);
+ ret = seq_has_overflowed(seq) ? -1 : 0;
if (curr_gw)
batadv_gw_node_free_ref(curr_gw);