diff options
author | Paul Gortmaker <paul.gortmaker@windriver.com> | 2012-05-10 17:14:35 -0400 |
---|---|---|
committer | Paul Gortmaker <paul.gortmaker@windriver.com> | 2012-05-15 20:14:35 -0400 |
commit | 211ed865108e24697b44bee5daac502ee6bdd4a4 (patch) | |
tree | 2a902c914f96298f265ef52cba5e463c5c8dea32 /include/linux | |
parent | 60eea6cf2964beea6c38d9050bc3823a93db97e0 (diff) | |
download | linux-211ed865108e24697b44bee5daac502ee6bdd4a4.tar.gz linux-211ed865108e24697b44bee5daac502ee6bdd4a4.tar.bz2 linux-211ed865108e24697b44bee5daac502ee6bdd4a4.zip |
net: delete all instances of special processing for token ring
We are going to delete the Token ring support. This removes any
special processing in the core networking for token ring, (aside
from net/tr.c itself), leaving the drivers and remaining tokenring
support present but inert.
The mass removal of the drivers and net/tr.c will be in a separate
commit, so that the history of these files that we still care
about won't have the giant deletion tied into their history.
Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
Diffstat (limited to 'include/linux')
-rw-r--r-- | include/linux/if_arp.h | 2 | ||||
-rw-r--r-- | include/linux/ipx.h | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/include/linux/if_arp.h b/include/linux/if_arp.h index 6d722f41ee7c..3718acf40a09 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 */ -#define ARPHRD_IEEE802_TR 800 /* Magic type ident for TR */ +/* 800 used to be used for token ring */ #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 */ diff --git a/include/linux/ipx.h b/include/linux/ipx.h index 3d48014cdd71..8f0243982eb6 100644 --- a/include/linux/ipx.h +++ b/include/linux/ipx.h @@ -38,7 +38,7 @@ struct ipx_interface_definition { #define IPX_FRAME_8022 2 #define IPX_FRAME_ETHERII 3 #define IPX_FRAME_8023 4 -#define IPX_FRAME_TR_8022 5 /* obsolete */ +/* obsolete token ring was 5 */ unsigned char ipx_special; #define IPX_SPECIAL_NONE 0 #define IPX_PRIMARY 1 |