From: Adrian Bunk <bunk@kernel.org>
Date: Mon, 27 Apr 2009 09:36:20 +0000 (-0700)
Subject: net: Fix LL_MAX_HEADER for CONFIG_TR_MODULE
X-Git-Tag: Ubuntu-5.0.0-8.9~27592^2~13
X-Git-Url: https://git.proxmox.com/?a=commitdiff_plain;h=c759a6b4e1cae6aff71f58c9c85404ebcd81b6e0;p=mirror_ubuntu-disco-kernel.git

net: Fix LL_MAX_HEADER for CONFIG_TR_MODULE

Unless I miss anything this should fix a bug.

Signed-off-by: Adrian Bunk <bunk@kernel.org>
Signed-off-by: David S. Miller <davem@davemloft.net>
---

diff --git a/include/linux/netdevice.h b/include/linux/netdevice.h
index 2e7783f4a755..453be9a674c0 100644
--- a/include/linux/netdevice.h
+++ b/include/linux/netdevice.h
@@ -104,7 +104,7 @@ struct wireless_dev;
 # else
 #  define LL_MAX_HEADER 96
 # endif
-#elif defined(CONFIG_TR)
+#elif defined(CONFIG_TR) || defined(CONFIG_TR_MODULE)
 # define LL_MAX_HEADER 48
 #else
 # define LL_MAX_HEADER 32