summaryrefslogtreecommitdiffstats
path: root/include
diff options
context:
space:
mode:
authorPaul Gortmaker <paul.gortmaker@windriver.com>2012-05-23 04:43:45 +0000
committerDavid S. Miller <davem@davemloft.net>2012-05-23 13:49:23 -0400
commitd0a24a3516fb36023bef28d2355fa34e7f32029f (patch)
treeeffd93d9af8c9f7876998d17f52a23f01091d76c /include
parent37c106d0a444bcb48648ed1366890333972e5990 (diff)
downloadlinux-stable-d0a24a3516fb36023bef28d2355fa34e7f32029f.tar.gz
linux-stable-d0a24a3516fb36023bef28d2355fa34e7f32029f.tar.bz2
linux-stable-d0a24a3516fb36023bef28d2355fa34e7f32029f.zip
ipx: restore token ring define to include/linux/ipx.h
Commit 211ed865108e24697b44bee5daac502ee6bdd4a4 "net: delete all instances of special processing for token ring" removed the define for IPX_FRAME_TR_8022. While it is unlikely, we can't be 100% sure that there aren't random userspace consumers of this value, so restore it. The only instance I could find was in ncpfs-2.2.6, and it was safe as-is, since it used #ifdef IPX_FRAME_TR_8022 around the two use cases it had, but there may be other userspace packages without similar ifdefs. Cc: Stephen Hemminger <shemminger@vyatta.com> Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'include')
-rw-r--r--include/linux/ipx.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/include/linux/ipx.h b/include/linux/ipx.h
index 8f0243982eb6..3d48014cdd71 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
-/* obsolete token ring was 5 */
+#define IPX_FRAME_TR_8022 5 /* obsolete */
unsigned char ipx_special;
#define IPX_SPECIAL_NONE 0
#define IPX_PRIMARY 1