---

yaml --- r: 306949 b: refs/heads/master c: 37c106d h: refs/heads/master i: 306947: 2484da5 v: v3
git-mirror · May 22, 2012 · e8f758b · e8f758b
1 parent 68eab2e
commit e8f758b
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git 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
@@ -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 */