summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorstephen hemminger <shemminger@vyatta.com>2012-05-22 11:01:05 +0000
committerDavid S. Miller <davem@davemloft.net>2012-05-22 17:13:11 -0400
commit37c106d0a444bcb48648ed1366890333972e5990 (patch)
treea6c1abbfaa781c7d9453b9c298f13d9d0f9f580d
parent76648102cfabc586ce1e9d0c4ebba2000e7b1ca0 (diff)
if: restore token ring ARP type to header
Recent removal of Token Ring breaks the build of iproute2. Even though Token Ring support is gone from the kernel, it is worth keeping the the definition of the TR ARP type to avoid breaking userspace programs that use this file. Signed-off-by: Stephen Hemminger <shemminger@vyatta.com> Signed-off-by: David S. Miller <davem@davemloft.net>
-rw-r--r--include/linux/if_arp.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/include/linux/if_arp.h b/include/linux/if_arp.h
index 26cb3c2c5c7..f0e69c6e820 100644
--- a/include/linux/if_arp.h
+++ b/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 */