projects
/
GitHub
/
MotorolaMobilityLLC
/
kernel-slsi.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
fbbdb8f
)
tokenring: delete last holdout of CONFIG_TR
author
Paul Bolle
<pebolle@tiscali.nl>
Wed, 27 Mar 2013 10:52:28 +0000
(10:52 +0000)
committer
David S. Miller
<davem@davemloft.net>
Thu, 28 Mar 2013 03:24:51 +0000
(23:24 -0400)
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>
include/linux/netdevice.h
patch
|
blob
|
blame
|
history
diff --git
a/include/linux/netdevice.h
b/include/linux/netdevice.h
index 56e3e0665272dafcb16017853ef0f3cfb17d7368..1dbb02c98946dd2b0f5b8b28721a74bbb444d001 100644
(file)
--- 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