From ef3abbe88a963bb81c15721bb53cf319ffdc3fb4 Mon Sep 17 00:00:00 2001
From: Gleb Smirnoff <glebius@FreeBSD.org>
Date: Tue, 22 Feb 2005 14:07:47 +0000
Subject: [PATCH] Use afswch->af_other_status for carp_status() and
 pfsync_status().

Sponsored by:	Rambler
---
 sbin/ifconfig/ifcarp.c   | 6 +++---
 sbin/ifconfig/ifpfsync.c | 6 +++---
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/sbin/ifconfig/ifcarp.c b/sbin/ifconfig/ifcarp.c
index ab6d152d9bb0..36f1bb6a47b7 100644
--- a/sbin/ifconfig/ifcarp.c
+++ b/sbin/ifconfig/ifcarp.c
@@ -52,14 +52,14 @@
 
 static const char *carp_states[] = { CARP_STATES };
 
-void carp_status(int s, const struct rt_addrinfo *);
+void carp_status(int s);
 void setcarp_advbase(const char *,int, int, const struct afswtch *rafp);
 void setcarp_advskew(const char *, int, int, const struct afswtch *rafp);
 void setcarp_passwd(const char *, int, int, const struct afswtch *rafp);
 void setcarp_vhid(const char *, int, int, const struct afswtch *rafp);
 
 void
-carp_status(int s, const struct rt_addrinfo *info __unused)
+carp_status(int s)
 {
 	const char *state;
 	struct carpreq carpr;
@@ -183,7 +183,7 @@ static struct cmd carp_cmds[] = {
 static struct afswtch af_carp = {
 	.af_name	= "af_carp",
 	.af_af		= AF_UNSPEC,
-	.af_status	= carp_status,
+	.af_other_status = carp_status,
 };
 
 static __constructor void
diff --git a/sbin/ifconfig/ifpfsync.c b/sbin/ifconfig/ifpfsync.c
index 7ca9883519a8..70c12dc05fbd 100644
--- a/sbin/ifconfig/ifpfsync.c
+++ b/sbin/ifconfig/ifpfsync.c
@@ -47,7 +47,7 @@
 void setpfsync_syncif(const char *, int, int, const struct afswtch *rafp);
 void unsetpfsync_syncif(const char *, int, int, const struct afswtch *rafp);
 void setpfsync_maxupd(const char *, int, int, const struct afswtch *rafp);
-void pfsync_status(int, const struct rt_addrinfo *);
+void pfsync_status(int);
 
 void
 setpfsync_syncif(const char *val, int d, int s, const struct afswtch *rafp)
@@ -104,7 +104,7 @@ setpfsync_maxupd(const char *val, int d, int s, const struct afswtch *rafp)
 }
 
 void
-pfsync_status(int s, const struct rt_addrinfo *info __unused)
+pfsync_status(int s)
 {
 	struct pfsyncreq preq;
 
@@ -128,7 +128,7 @@ static struct cmd pfsync_cmds[] = {
 static struct afswtch af_pfsync = {
 	.af_name	= "af_pfsync",
 	.af_af		= AF_UNSPEC,
-	.af_status	= pfsync_status,
+	.af_other_status = pfsync_status,
 };
 
 static __constructor void