diff options
| author | David S. Miller <davem@davemloft.net> | 2010-05-10 04:59:07 -0700 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2010-05-10 04:59:07 -0700 |
| commit | f0ecde1466f21edf577b809735f4f35f354777a0 (patch) | |
| tree | f901b890c53ec33f51e2eaa776f828fafede9759 /net/llc | |
| parent | bbd725435ddb1cac732f7a8c23c21ff67f24c60f (diff) | |
| download | blackbird-op-linux-f0ecde1466f21edf577b809735f4f35f354777a0.tar.gz blackbird-op-linux-f0ecde1466f21edf577b809735f4f35f354777a0.zip | |
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')
| -rw-r--r-- | net/llc/llc_sap.c | 2 |
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 |
