Merge branch 'master' into type5-default-originate

1 files changed, 18 insertions, 26 deletions

diff --git a/ospf6d/ospf6_interface.c b/ospf6d/ospf6_interface.c
index 5eaf617702..8524292215 100644
--- a/ospf6d/ospf6_interface.c
+++ b/ospf6d/ospf6_interface.c
@@ -125,7 +125,7 @@ static u_int32_t ospf6_interface_get_cost(struct ospf6_interface *oi)
 		bw = oi->interface->speed;
 	} else {
 		bw = oi->interface->bandwidth ? oi->interface->bandwidth
-			: OSPF6_INTERFACE_BANDWIDTH;
+					      : OSPF6_INTERFACE_BANDWIDTH;
 	}
 
 	refbw = ospf6 ? ospf6->ref_bandwidth : OSPF6_REFERENCE_BANDWIDTH;
@@ -1010,8 +1010,7 @@ DEFUN (show_ipv6_ospf6_interface,
 	return CMD_SUCCESS;
 }
 
-static int ospf6_interface_show_traffic(struct vty *vty,
-					uint32_t vrf_id,
+static int ospf6_interface_show_traffic(struct vty *vty, uint32_t vrf_id,
 					struct interface *intf_ifp,
 					int display_once)
 {
@@ -1023,13 +1022,14 @@ static int ospf6_interface_show_traffic(struct vty *vty,
 
 	if (!display_once) {
 		vty_out(vty, "\n");
-		vty_out(vty, "%-12s%-17s%-17s%-17s%-17s%-17s\n",
-			"Interface", "    HELLO", "    DB-Desc", "   LS-Req",
-			"   LS-Update", "   LS-Ack");
+		vty_out(vty, "%-12s%-17s%-17s%-17s%-17s%-17s\n", "Interface",
+			"    HELLO", "    DB-Desc", "   LS-Req", "   LS-Update",
+			"   LS-Ack");
 		vty_out(vty, "%-10s%-18s%-18s%-17s%-17s%-17s\n", "",
-			"      Rx/Tx", "     Rx/Tx", "    Rx/Tx", "    Rx/Tx", "    Rx/Tx");
+			"      Rx/Tx", "     Rx/Tx", "    Rx/Tx", "    Rx/Tx",
+			"    Rx/Tx");
 		vty_out(vty,
-		"--------------------------------------------------------------------------------------------\n");
+			"--------------------------------------------------------------------------------------------\n");
 	}
 
 	if (intf_ifp == NULL) {
@@ -1040,13 +1040,11 @@ static int ospf6_interface_show_traffic(struct vty *vty,
 				continue;
 
 			vty_out(vty,
-			"%-10s %8u/%-8u %7u/%-7u %7u/%-7u %7u/%-7u %7u/%-7u\n",
+				"%-10s %8u/%-8u %7u/%-7u %7u/%-7u %7u/%-7u %7u/%-7u\n",
 				oi->interface->name, oi->hello_in,
-				oi->hello_out,
-				oi->db_desc_in, oi->db_desc_out,
-				oi->ls_req_in, oi->ls_req_out,
-				oi->ls_upd_in, oi->ls_upd_out,
-				oi->ls_ack_in, oi->ls_ack_out);
+				oi->hello_out, oi->db_desc_in, oi->db_desc_out,
+				oi->ls_req_in, oi->ls_req_out, oi->ls_upd_in,
+				oi->ls_upd_out, oi->ls_ack_in, oi->ls_ack_out);
 		}
 	} else {
 		oi = intf_ifp->info;
@@ -1055,11 +1053,9 @@ static int ospf6_interface_show_traffic(struct vty *vty,
 
 		vty_out(vty,
 			"%-10s %8u/%-8u %7u/%-7u %7u/%-7u %7u/%-7u %7u/%-7u\n",
-			oi->interface->name, oi->hello_in,
-			oi->hello_out,
-			oi->db_desc_in, oi->db_desc_out,
-			oi->ls_req_in, oi->ls_req_out,
-			oi->ls_upd_in, oi->ls_upd_out,
+			oi->interface->name, oi->hello_in, oi->hello_out,
+			oi->db_desc_in, oi->db_desc_out, oi->ls_req_in,
+			oi->ls_req_out, oi->ls_upd_in, oi->ls_upd_out,
 			oi->ls_ack_in, oi->ls_ack_out);
 	}
 
@@ -1086,9 +1082,7 @@ DEFUN (show_ipv6_ospf6_interface_traffic,
 		intf_name = argv[idx_ifname]->arg;
 		ifp = if_lookup_by_name(intf_name, VRF_DEFAULT);
 		if (ifp == NULL) {
-			vty_out(vty,
-				"No such Interface: %s\n",
-				intf_name);
+			vty_out(vty, "No such Interface: %s\n", intf_name);
 			return CMD_WARNING;
 		}
 		if (ifp->info == NULL) {
@@ -1099,8 +1093,7 @@ DEFUN (show_ipv6_ospf6_interface_traffic,
 		}
 	}
 
-	ospf6_interface_show_traffic(vty, VRF_DEFAULT, ifp,
-				     display_once);
+	ospf6_interface_show_traffic(vty, VRF_DEFAULT, ifp, display_once);
 
 
 	return CMD_SUCCESS;
@@ -1940,8 +1933,7 @@ void ospf6_interface_init(void)
 	install_element(VIEW_NODE, &show_ipv6_ospf6_interface_ifname_cmd);
 	install_element(VIEW_NODE,
 			&show_ipv6_ospf6_interface_ifname_prefix_cmd);
-	install_element(VIEW_NODE,
-			&show_ipv6_ospf6_interface_traffic_cmd);
+	install_element(VIEW_NODE, &show_ipv6_ospf6_interface_traffic_cmd);
 
 	install_element(INTERFACE_NODE, &ipv6_ospf6_cost_cmd);
 	install_element(INTERFACE_NODE, &no_ipv6_ospf6_cost_cmd);