diff options
| author | David S. Miller <davem@davemloft.net> | 2010-05-12 03:05:35 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2010-05-12 03:05:35 -0400 |
| commit | 278554bd6579206921f5d8a523649a7a57f8850d (patch) | |
| tree | 4e6c527daf0910e455b3aa72e2c96b0479e430be /net/llc | |
| parent | 5a147e8bf982f9dd414c1dd751fe02c1942506b2 (diff) | |
| parent | cea0d767c29669bf89f86e4aee46ef462d2ebae8 (diff) | |
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
Conflicts:
Documentation/feature-removal-schedule.txt
drivers/net/wireless/ath/ar9170/usb.c
drivers/scsi/iscsi_tcp.c
net/ipv4/ipmr.c
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) | |||
| 31 | case ARPHRD_ETHER: | 31 | case ARPHRD_ETHER: |
| 32 | case ARPHRD_LOOPBACK: | 32 | case ARPHRD_LOOPBACK: |
| 33 | return sizeof(struct ethhdr); | 33 | return sizeof(struct ethhdr); |
| 34 | #ifdef CONFIG_TR | 34 | #if defined(CONFIG_TR) || defined(CONFIG_TR_MODULE) |
| 35 | case ARPHRD_IEEE802_TR: | 35 | case ARPHRD_IEEE802_TR: |
| 36 | return sizeof(struct trh_hdr); | 36 | return sizeof(struct trh_hdr); |
| 37 | #endif | 37 | #endif |