From e8f758bd046327b995157fb1aeb9237ac4a59f03 Mon Sep 17 00:00:00 2001
From: stephen hemminger <shemminger@vyatta.com>
Date: Tue, 22 May 2012 11:01:05 +0000
Subject: [PATCH] --- yaml --- r: 306949 b: refs/heads/master c:
 37c106d0a444bcb48648ed1366890333972e5990 h: refs/heads/master i:   306947:
 2484da513cd4eb2061ceedc1930ca7ad3563d9fc v: v3

---
 [refs]                       | 2 +-
 trunk/include/linux/if_arp.h | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 42b618cb3d14..532c8964c211 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 76648102cfabc586ce1e9d0c4ebba2000e7b1ca0
+refs/heads/master: 37c106d0a444bcb48648ed1366890333972e5990
diff --git a/trunk/include/linux/if_arp.h b/trunk/include/linux/if_arp.h
index 26cb3c2c5c71..f0e69c6e8208 100644
--- a/trunk/include/linux/if_arp.h
+++ b/trunk/include/linux/if_arp.h
@@ -82,7 +82,7 @@
 #define ARPHRD_FCPL	786		/* Fibrechannel public loop	*/
 #define ARPHRD_FCFABRIC	787		/* Fibrechannel fabric		*/
 	/* 787->799 reserved for fibrechannel media types */
-/* 800 used to be used for token ring */
+#define ARPHRD_IEEE802_TR 800		/* Magic type ident for TR	*/
 #define ARPHRD_IEEE80211 801		/* IEEE 802.11			*/
 #define ARPHRD_IEEE80211_PRISM 802	/* IEEE 802.11 + Prism2 header  */
 #define ARPHRD_IEEE80211_RADIOTAP 803	/* IEEE 802.11 + radiotap header */