Fix special status reporting. Prior to the reorg there was

special-purpose code to display status for an interface for
state that was not address-oriented.  This status reporting
was merged in to the address-oriented status reporting but
did not work for link address reporting (as discovered with
fwip interfaces).  Correct this mis-merge and eliminate the
bogus kludge that was used for link-level address reporting.

o add an af_other_status method for an address family for
  reporting status of things like media, vlan, etc.
o call the af_other_status methods after reporting address
  status for an interface
o special-case link address status; when reporting all
  status for an interface invoke it specially prior to
  reporting af_other_status methods (since it requires the
  sockaddr_dl that is passed in to status separately from
  the rtmsg address state)
o correct the calling convention for link address status;
  don't cast types, construct the proper parameter

This fixes ifconfig on fwip interfaces.

1 files changed, 2 insertions, 2 deletions

diff --git a/sbin/ifconfig/ifmac.c b/sbin/ifconfig/ifmac.c
index 4e5de09..bb02106 100644
--- a/sbin/ifconfig/ifmac.c
+++ b/sbin/ifconfig/ifmac.c
@@ -50,7 +50,7 @@
 #include "ifconfig.h"
 
 static void
-maclabel_status(int s, const struct rt_addrinfo *info)
+maclabel_status(int s)
 {
 	struct ifreq ifr;
 	mac_t label;
@@ -105,7 +105,7 @@ static struct cmd mac_cmds[] = {
 static struct afswtch af_mac = {
 	.af_name	= "af_maclabel",
 	.af_af		= AF_UNSPEC,
-	.af_status	= maclabel_status,
+	.af_other_status = maclabel_status,
 };
 
 static __constructor void