summaryrefslogtreecommitdiff
path: root/net/llc/llc_sap.c
diff options
context:
space:
mode:
authorDavid S. Miller <davem@davemloft.net>2010-05-10 15:59:07 +0400
committerDavid S. Miller <davem@davemloft.net>2010-05-10 15:59:07 +0400
commitf0ecde1466f21edf577b809735f4f35f354777a0 (patch)
treef901b890c53ec33f51e2eaa776f828fafede9759 /net/llc/llc_sap.c
parentbbd725435ddb1cac732f7a8c23c21ff67f24c60f (diff)
downloadlinux-f0ecde1466f21edf577b809735f4f35f354777a0.tar.xz
net: Fix FDDI and TR config checks in ipv4 arp and LLC.
Need to check both CONFIG_FOO and CONFIG_FOO_MODULE Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/llc/llc_sap.c')
-rw-r--r--net/llc/llc_sap.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/net/llc/llc_sap.c b/net/llc/llc_sap.c
index a432f0ec051c..94e7fca75b85 100644
--- a/net/llc/llc_sap.c
+++ b/net/llc/llc_sap.c
@@ -31,7 +31,7 @@ static int llc_mac_header_len(unsigned short devtype)
case ARPHRD_ETHER:
case ARPHRD_LOOPBACK:
return sizeof(struct ethhdr);
-#ifdef CONFIG_TR
+#if defined(CONFIG_TR) || defined(CONFIG_TR_MODULE)
case ARPHRD_IEEE802_TR:
return sizeof(struct trh_hdr);
#endif