Index: ifconfig.c
===================================================================
RCS file: /cvs/src/sbin/ifconfig/ifconfig.c,v
retrieving revision 1.405
diff -u -p -r1.405 ifconfig.c
--- ifconfig.c	24 Jul 2019 01:48:53 -0000	1.405
+++ ifconfig.c	24 Jul 2019 06:05:09 -0000
@@ -4509,12 +4509,7 @@ trunk_status(void)
 		for (i = 0; i < ra.ra_ports; i++) {
 			lp = (struct lacp_opreq *)&(rpbuf[i].rp_lacpreq);
 			if (ra.ra_proto == TRUNK_PROTO_LACP) {
-				printf("\t\ttrunkport %s lacp_state actor ",
-				    rpbuf[i].rp_portname);
-				printb_status(lp->actor_state,
-				    LACP_STATE_BITS);
-				putchar('\n');
-				printf("\t\ttrunkport %s lacp_state actor "
+				printf("\t\t%s lacp actor "
 				    "system pri 0x%x mac %s, key 0x%x, "
 				    "port pri 0x%x number 0x%x\n",
 				    rpbuf[i].rp_portname,
@@ -4523,12 +4518,13 @@ trunk_status(void)
 				     lp->actor_mac),
 				    lp->actor_key,
 				    lp->actor_portprio, lp->actor_portno);
-				printf("\t\ttrunkport %s lacp_state partner ",
+				printf("\t\t%s lacp actor state ",
 				    rpbuf[i].rp_portname);
-				printb_status(lp->partner_state,
+				printb_status(lp->actor_state,
 				    LACP_STATE_BITS);
 				putchar('\n');
-				printf("\t\ttrunkport %s lacp_state partner "
+
+				printf("\t\t%s lacp partner "
 				    "system pri 0x%x mac %s, key 0x%x, "
 				    "port pri 0x%x number 0x%x\n",
 				    rpbuf[i].rp_portname,
@@ -4537,9 +4533,14 @@ trunk_status(void)
 				     lp->partner_mac),
 				    lp->partner_key,
 				    lp->partner_portprio, lp->partner_portno);
+				printf("\t\t%s lacp partner state ",
+				    rpbuf[i].rp_portname);
+				printb_status(lp->partner_state,
+				    LACP_STATE_BITS);
+				putchar('\n');
 			}
 
-			printf("\t\ttrunkport %s ", rpbuf[i].rp_portname);
+			printf("\t\t%s port ", rpbuf[i].rp_portname);
 			printb_status(rpbuf[i].rp_flags, TRUNK_PORT_BITS);
 			putchar('\n');
 		}