[linux-next] LinuxNextTracking branch, master, updated. next-20150222

batman at open-mesh.org batman at open-mesh.org
Mon Feb 23 00:17:33 CET 2015


The following commit has been merged in the master branch:
commit 6d91147d183c87d290f3b062d3fbf1ede312b449
Author: Joe Perches <joe at perches.com>
Date:   Mon Feb 16 17:31:39 2015 -0800

    batman-adv: Remove uses of return value of seq_printf
    
    This function is soon going to return void so remove the
    return value use.
    
    Convert the return value to test seq_has_overflowed() instead.
    
    Signed-off-by: Joe Perches <joe at perches.com>
    Acked-by: Antonio Quartulli <antonio at meshcoding.com>
    Signed-off-by: David S. Miller <davem at davemloft.net>

diff --git a/net/batman-adv/gateway_client.c b/net/batman-adv/gateway_client.c
index 27649e8..a0876ea 100644
--- a/net/batman-adv/gateway_client.c
+++ b/net/batman-adv/gateway_client.c
@@ -592,15 +592,16 @@ static int batadv_write_buffer_text(struct batadv_priv *bat_priv,
 
 	curr_gw = batadv_gw_get_selected_gw_node(bat_priv);
 
-	ret = seq_printf(seq, "%s %pM (%3i) %pM [%10s]: %u.%u/%u.%u MBit\n",
-			 (curr_gw == gw_node ? "=>" : "  "),
-			 gw_node->orig_node->orig,
-			 router_ifinfo->bat_iv.tq_avg, router->addr,
-			 router->if_incoming->net_dev->name,
-			 gw_node->bandwidth_down / 10,
-			 gw_node->bandwidth_down % 10,
-			 gw_node->bandwidth_up / 10,
-			 gw_node->bandwidth_up % 10);
+	seq_printf(seq, "%s %pM (%3i) %pM [%10s]: %u.%u/%u.%u MBit\n",
+		   (curr_gw == gw_node ? "=>" : "  "),
+		   gw_node->orig_node->orig,
+		   router_ifinfo->bat_iv.tq_avg, router->addr,
+		   router->if_incoming->net_dev->name,
+		   gw_node->bandwidth_down / 10,
+		   gw_node->bandwidth_down % 10,
+		   gw_node->bandwidth_up / 10,
+		   gw_node->bandwidth_up % 10);
+	ret = seq_has_overflowed(seq);
 
 	if (curr_gw)
 		batadv_gw_node_free_ref(curr_gw);

-- 
LinuxNextTracking


More information about the linux-merge mailing list