3 files changed, 9 insertions, 9 deletions
diff --git a/sbin/ifconfig/ifconfig.c b/sbin/ifconfig/ifconfig.c
index 53e2563..4e47cd5 100644
--- a/sbin/ifconfig/ifconfig.c
+++ b/sbin/ifconfig/ifconfig.c
@@ -280,7 +280,7 @@ struct	cmd {
 	{ "-nwkey",	0,		set80211wep },		/* NetBSD */
 #endif
 #ifdef USE_MAC
-	{ "mac",	NEXTARG,	setifmac },
+	{ "maclabel",	NEXTARG,	setifmaclabel },
 #endif
 	{ "rxcsum",	IFCAP_RXCSUM,	setifcap },
 	{ "-rxcsum",	-IFCAP_RXCSUM,	setifcap },
@@ -370,7 +370,7 @@ struct	afswtch {
 	{ "ieee80211", AF_UNSPEC, ieee80211_status, NULL, NULL, },  /* XXX not real!! */
 #endif
 #ifdef USE_MAC
-	{ "mac", AF_UNSPEC, mac_status, NULL, NULL, },
+	{ "maclabel", AF_UNSPEC, maclabel_status, NULL, NULL, },
 #endif
 #endif
 	{ 0,	0,	    0,		0 }
@@ -1152,8 +1152,8 @@ status(const struct afswtch *afp, int addrcount, struct	sockaddr_dl *sdl,
 		ieee80211_status(s, NULL);
 #endif
 #ifdef USE_MAC
-	if (allfamilies || afp->af_status == mac_status)
-		mac_status(s, NULL);
+	if (allfamilies || afp->af_status == maclabel_status)
+		maclabel_status(s, NULL);
 #endif
 	strncpy(ifs.ifs_name, name, sizeof ifs.ifs_name);
 	if (ioctl(s, SIOCGIFSTATUS, &ifs) == 0) 
diff --git a/sbin/ifconfig/ifconfig.h b/sbin/ifconfig/ifconfig.h
index c3eb6af..a3aa125 100644
--- a/sbin/ifconfig/ifconfig.h
+++ b/sbin/ifconfig/ifconfig.h
@@ -64,5 +64,5 @@ extern void set80211weptxkey(const char *, int, int, const struct afswtch *rafp)
 extern void set80211wepkey(const char *, int, int, const struct afswtch *rafp);
 extern void set80211nwkey(const char *, int, int, const struct afswtch *rafp);
 extern void ieee80211_status(int s, struct rt_addrinfo *);
-extern void mac_status(int s, struct rt_addrinfo *);
-extern void setifmac(const char *, int, int, const struct afswtch *rafp);
+extern void maclabel_status(int s, struct rt_addrinfo *);
+extern void setifmaclabel(const char *, int, int, const struct afswtch *rafp);
diff --git a/sbin/ifconfig/ifmac.c b/sbin/ifconfig/ifmac.c
index dd32a66..41b718b 100644
--- a/sbin/ifconfig/ifmac.c
+++ b/sbin/ifconfig/ifmac.c
@@ -50,7 +50,7 @@
 #include "ifconfig.h"
 
 void
-mac_status(int s, struct rt_addrinfo *info)
+maclabel_status(int s, struct rt_addrinfo *info)
 {
 	struct ifreq ifr;
 	mac_t label;
@@ -70,7 +70,7 @@ mac_status(int s, struct rt_addrinfo *info)
 		goto mac_free;
 
 	if (strlen(label_text) != 0)
-		printf("\tmac %s\n", label_text);
+		printf("\tmaclabel %s\n", label_text);
 	free(label_text);
 
 mac_free:
@@ -78,7 +78,7 @@ mac_free:
 }
 
 void
-setifmac(const char *val, int d, int s, const struct afswtch *rafp)
+setifmaclabel(const char *val, int d, int s, const struct afswtch *rafp)
 {
 	struct ifreq ifr;
 	mac_t label;