From: Phil Blundell <philb@gnu.org>
Date: Thu, 5 Feb 1998 21:49:40 +0000 (+0000)
Subject: Some small Ash changes.
X-Git-Tag: v1.60~220
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=b1279cc68c387980090293ccba91afc5afaeabef;p=platform%2Fupstream%2Fnet-tools.git

Some small Ash changes.
---

diff --git a/ChangeLog b/ChangeLog
index 6484e2a..e21ea7c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+1998-02-05  Phil Blundell  <philb@gnu.org>
+
+	* lib/ash.c: Don't redefine ARPHRD constant.  Change it from
+ 	ARPHRD_ASH64 to just ARPHRD_ASH, since the encap is the same for
+ 	16Mbps.
+	* lib/hw.c: Print just `Ash', not `64Mbps Ash'.
+
 1998-01-31  Phil Blundell  <philb@gnu.org>
 
 	* lib/inet6_gr.c (rprint_fib6): Reinstate the "U" flag, although it
diff --git a/lib/ash.c b/lib/ash.c
index a5a0a8a..ff531b8 100644
--- a/lib/ash.c
+++ b/lib/ash.c
@@ -21,8 +21,10 @@
 #define  EXTERN
 #include "net-locale.h"
 
-#undef ARPHRD_ASH64
-#define ARPHRD_ASH64		517
+#ifndef ARPHRD_ASH
+#error Your C library does not support Ash
+#endif
+
 #define ASH_ALEN		32
 
 extern struct hwtype ash_hwtype;
@@ -95,7 +97,7 @@ in_ash(char *bufp, struct sockaddr *sap)
 
 
 struct hwtype ash_hwtype = {
-  "ash",	NULL, 		ARPHRD_ASH64,	ASH_ALEN,
+  "ash",	NULL, 		ARPHRD_ASH,	ASH_ALEN,
   pr_ash,	pr_sash,	in_ash,		NULL
 };
 
diff --git a/lib/hw.c b/lib/hw.c
index 3876dc0..ab4fb64 100644
--- a/lib/hw.c
+++ b/lib/hw.c
@@ -128,7 +128,7 @@ void hwinit ()
   ether_hwtype.title = NLS_CATSAVE (catfd, etherSet, ether_ether, "Ethernet");
 #endif
 #if HAVE_HWASH
-  ash_hwtype.title = NLS_CATSAVE (catfd, ashSet, ash_hw, "64Mbps Ash");
+  ash_hwtype.title = NLS_CATSAVE (catfd, ashSet, ash_hw, "Ash");
 #endif
 #if HAVE_HWFDDI
   fddi_hwtype.title = NLS_CATSAVE (catfd, fddiSet, fddi_fddi, "Fiber Distributed Data Interface");