From c7f5d607e2b88e38fd1cacefbadcb96d8408b13b Mon Sep 17 00:00:00 2001
From: Phil Blundell <philb@gnu.org>
Date: Sat, 11 Dec 1999 12:09:23 +0000
Subject: [PATCH] Support new token ring ARP type Patch from "Mike Phillips"
 <phillim@amtrak.com>

---
 lib/hw.c | 12 +++++++++++-
 lib/tr.c |  9 ++++++++-
 2 files changed, 19 insertions(+), 2 deletions(-)

diff --git a/lib/hw.c b/lib/hw.c
index 875197c..97f5025 100644
--- a/lib/hw.c
+++ b/lib/hw.c
@@ -2,7 +2,7 @@
  * lib/hw.c   This file contains the top-level part of the hardware
  *              support functions module.
  *
- * Version:     $Id: hw.c,v 1.14 1999/05/16 16:41:12 philip Exp $
+ * Version:     $Id: hw.c,v 1.15 1999/12/11 12:09:23 philip Exp $
  *
  * Maintainer:  Bernd 'eckes' Eckenfels, <net-tools@lina.inka.de>
  *
@@ -19,6 +19,7 @@
  */
 #include <sys/types.h>
 #include <sys/socket.h>
+#include <net/if_arp.h>
 #include <stdlib.h>
 #include <stdio.h>
 #include <errno.h>
@@ -43,6 +44,9 @@ extern struct hwtype ether_hwtype;
 extern struct hwtype fddi_hwtype;
 extern struct hwtype hippi_hwtype;
 extern struct hwtype tr_hwtype;
+#ifdef ARPHRD_IEEE802_TR
+extern struct hwtype tr_hwtype1;
+#endif
 
 extern struct hwtype ax25_hwtype;
 extern struct hwtype rose_hwtype;
@@ -87,6 +91,9 @@ static struct hwtype *hwtypes[] =
 #endif
 #if HAVE_HWTR
     &tr_hwtype,
+#ifdef ARPHRD_IEEE802_TR
+    &tr_hwtype1, 
+#endif
 #endif
 #if HAVE_HWAX25
     &ax25_hwtype,
@@ -192,6 +199,9 @@ void hwinit()
 #endif
 #if HAVE_HWTR
     tr_hwtype.title = _("16/4 Mbps Token Ring");
+#ifdef ARPHRD_IEEE802_TR
+    tr_hwtype1.title = _("16/4 Mbps Token Ring (New)") ; 
+#endif
 #endif
 #if HAVE_HWEC
     ec_hwtype.title = _("Econet");
diff --git a/lib/tr.c b/lib/tr.c
index be253e7..9dfe08f 100644
--- a/lib/tr.c
+++ b/lib/tr.c
@@ -2,7 +2,7 @@
  * lib/tr.c   This file contains an implementation of the "Tokenring"
  *              support functions.
  *
- * Version:     $Id: tr.c,v 1.6 1999/09/27 11:00:49 philip Exp $
+ * Version:     $Id: tr.c,v 1.7 1999/12/11 12:09:24 philip Exp $
  *
  * Author:      Fred N. van Kempen, <waltje@uwalt.nl.mugnet.org>
  *              Copyright 1993 MicroWalt Corporation
@@ -124,6 +124,13 @@ struct hwtype tr_hwtype =
     "tr", NULL /* "16/4 Mbps Token Ring" */, ARPHRD_IEEE802, TR_ALEN,
     pr_tr, in_tr, NULL
 };
+#ifdef ARPHRD_IEEE802_TR
+struct hwtype tr_hwtype1 =
+{
+    "tr", NULL /* "16/4 Mbps Token Ring" */, ARPHRD_IEEE802_TR, TR_ALEN,
+    pr_tr, pr_str, in_tr, NULL
+};
+#endif
 
 
 #endif				/* HAVE_HWTR */
-- 
2.7.4