From: Paul Bolle <pebolle@tiscali.nl>
Date: Wed, 27 Mar 2013 10:52:28 +0000 (+0000)
Subject: tokenring: delete last holdout of CONFIG_TR
X-Git-Tag: MMI-PSA29.97-13-9~14469^2~298
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=f3d4039242af92a9d93dee2fd9ae47066b20ca29;p=GitHub%2FMotorolaMobilityLLC%2Fkernel-slsi.git

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>
---

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