summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPaul Bolle <pebolle@tiscali.nl>2013-03-27 10:52:28 +0000
committerDavid S. Miller <davem@davemloft.net>2013-03-27 23:24:51 -0400
commitf3d4039242af92a9d93dee2fd9ae47066b20ca29 (patch)
treec6d841b45268cb820e263af6794db6a0477e0308
parentfbbdb8f096e0e5d8244e1ffa46e364146ab9a440 (diff)
downloadlinux-f3d4039242af92a9d93dee2fd9ae47066b20ca29.tar.bz2
tokenring: delete last holdout of CONFIG_TR
Tokenring support was deleted in v3.5. One last holdout of the macro CONFIG_TR escaped that fate. Until now. Signed-off-by: Paul Bolle <pebolle@tiscali.nl> Signed-off-by: David S. Miller <davem@davemloft.net>
-rw-r--r--include/linux/netdevice.h2
1 files changed, 0 insertions, 2 deletions
diff --git a/include/linux/netdevice.h b/include/linux/netdevice.h
index 56e3e0665272..1dbb02c98946 100644
--- a/include/linux/netdevice.h
+++ b/include/linux/netdevice.h
@@ -144,8 +144,6 @@ static inline bool dev_xmit_complete(int rc)
# else
# define LL_MAX_HEADER 96
# endif
-#elif IS_ENABLED(CONFIG_TR)
-# define LL_MAX_HEADER 48
#else
# define LL_MAX_HEADER 32
#endif