diff options
| author | Andres More <more.andres@gmail.com> | 2010-08-04 19:12:34 -0300 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@suse.de> | 2010-08-31 11:31:25 -0700 |
| commit | 203e4615ee9d9fa8d3506b9d0ef30095e4d5bc90 (patch) | |
| tree | c3a50e0d6df304652a983972cbe1467ad195b491 /drivers/staging/vt6656/dpc.c | |
| parent | bd5dc30e3ee68f0aa6c1e282d88740f2d1fa909a (diff) | |
| download | kernel_samsung_smdk4412-203e4615ee9d9fa8d3506b9d0ef30095e4d5bc90.zip kernel_samsung_smdk4412-203e4615ee9d9fa8d3506b9d0ef30095e4d5bc90.tar.gz kernel_samsung_smdk4412-203e4615ee9d9fa8d3506b9d0ef30095e4d5bc90.tar.bz2 | |
staging: vt6656: removed custom definitions of Ethernet packet types
Removed some unused definitions of Ethernet packet types, also replaced
two of them with in-kernel counterparts from include/linux/if_ether.h
Signed-off-by: Andres More <more.andres@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'drivers/staging/vt6656/dpc.c')
| -rw-r--r-- | drivers/staging/vt6656/dpc.c | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/drivers/staging/vt6656/dpc.c b/drivers/staging/vt6656/dpc.c index 8ec0714..98158cc 100644 --- a/drivers/staging/vt6656/dpc.c +++ b/drivers/staging/vt6656/dpc.c @@ -200,10 +200,9 @@ s_vProcessRxMACHeader ( } else if (!compare_ether_addr(pbyRxBuffer, &pDevice->abySNAP_RFC1042[0])) { cbHeaderSize += 6; pwType = (PWORD) (pbyRxBufferAddr + cbHeaderSize); - if ((*pwType!= TYPE_PKT_IPX) && (*pwType != cpu_to_le16(0xF380))) { - } - else { - cbHeaderSize -= 8; + if ((*pwType == cpu_to_le16(ETH_P_IPX)) || + (*pwType == cpu_to_le16(0xF380))) { + cbHeaderSize -= 8; pwType = (PWORD) (pbyRxBufferAddr + cbHeaderSize); if (bIsWEP) { if (bExtIV) { |