The following commit has been merged in the merge/master branch: commit 92b839175064632813a7c4b7e180efde4c08c850 Author: Joe Perches joe@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@perches.com Signed-off-by: David S. Miller davem@davemloft.net

diff --git a/net/batman-adv/gateway_client.c b/net/batman-adv/gateway_client.c index a0876ea..090828c 100644 --- a/net/batman-adv/gateway_client.c +++ b/net/batman-adv/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);