| Message ID | 1364417548.1345.38.camel@x61.thuisdomein |
|---|---|
| State | Accepted, archived |
| Delegated to: | David Miller |
| Headers | show |
From: Paul Bolle <pebolle@tiscali.nl> Date: Wed, 27 Mar 2013 21:52:28 +0100 > 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> Applied to net-next, thanks. -- To unsubscribe from this list: send the line "unsubscribe netdev" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
diff --git a/include/linux/netdevice.h b/include/linux/netdevice.h index b3d00fa..05d142f 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
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> --- Untested. include/linux/netdevice.h | 2 -- 1 file changed, 2 deletions(-)