projects
/
linux-drm-fsl-dcu.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'docs-next' of git://git.lwn.net/linux-2.6
[linux-drm-fsl-dcu.git]
/
net
/
llc
/
llc_sap.c
diff --git
a/net/llc/llc_sap.c
b/net/llc/llc_sap.c
index a432f0ec051cb25a000d11e2e7e868cd8ff5dc3b..94e7fca75b851762623a5e536abfc233810f8920 100644
(file)
--- 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);
-#if
def CONFIG_TR
+#if
defined(CONFIG_TR) || defined(CONFIG_TR_MODULE)
case ARPHRD_IEEE802_TR:
return sizeof(struct trh_hdr);
#endif