diff options
| author | Paul Bolle <pebolle@tiscali.nl> | 2013-03-27 06:52:28 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2013-03-27 23:24:51 -0400 |
| commit | f3d4039242af92a9d93dee2fd9ae47066b20ca29 (patch) | |
| tree | c6d841b45268cb820e263af6794db6a0477e0308 /include/linux/netdevice.h | |
| parent | fbbdb8f096e0e5d8244e1ffa46e364146ab9a440 (diff) | |
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>
Diffstat (limited to 'include/linux/netdevice.h')
| -rw-r--r-- | include/linux/netdevice.h | 2 |
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) | |||
| 144 | # else | 144 | # else |
| 145 | # define LL_MAX_HEADER 96 | 145 | # define LL_MAX_HEADER 96 |
| 146 | # endif | 146 | # endif |
| 147 | #elif IS_ENABLED(CONFIG_TR) | ||
| 148 | # define LL_MAX_HEADER 48 | ||
| 149 | #else | 147 | #else |
| 150 | # define LL_MAX_HEADER 32 | 148 | # define LL_MAX_HEADER 32 |
| 151 | #endif | 149 | #endif |