diff options
| author | Greg Kroah-Hartman | 2012-09-17 02:17:25 +0200 |
|---|---|---|
| committer | Greg Kroah-Hartman | 2012-09-17 02:17:25 +0200 |
| commit | 6a2a2cdd57d11ee3117539b846a45df6efbd35b1 (patch) | |
| tree | b6ab218810666a75d6612bde4d4a224118c0834c /drivers/staging/vt6656/dpc.c | |
| parent | Staging: bcm: Fix udelay related compilation error (diff) | |
| parent | Linux 3.6-rc6 (diff) | |
| download | kernel-qcow2-linux-6a2a2cdd57d11ee3117539b846a45df6efbd35b1.tar.gz kernel-qcow2-linux-6a2a2cdd57d11ee3117539b846a45df6efbd35b1.tar.xz kernel-qcow2-linux-6a2a2cdd57d11ee3117539b846a45df6efbd35b1.zip | |
Merge 3.6-rc6 into staging-next
This pulls in the staging tree fixes in 3.6-rc6 into our branch to resolve the
merge issues.
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/staging/vt6656/dpc.c')
| -rw-r--r-- | drivers/staging/vt6656/dpc.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/staging/vt6656/dpc.c b/drivers/staging/vt6656/dpc.c index 220bec82ba0d..28edf9e7efcb 100644 --- a/drivers/staging/vt6656/dpc.c +++ b/drivers/staging/vt6656/dpc.c @@ -200,7 +200,7 @@ s_vProcessRxMACHeader ( } else if (!compare_ether_addr(pbyRxBuffer, &pDevice->abySNAP_RFC1042[0])) { cbHeaderSize += 6; pwType = (PWORD) (pbyRxBufferAddr + cbHeaderSize); - if ((*pwType == cpu_to_le16(ETH_P_IPX)) || + if ((*pwType == cpu_to_be16(ETH_P_IPX)) || (*pwType == cpu_to_le16(0xF380))) { cbHeaderSize -= 8; pwType = (PWORD) (pbyRxBufferAddr + cbHeaderSize); |