From bfbe8581066fc3cf94cf9a9e0be4826347d1f45c Mon Sep 17 00:00:00 2001 From: Andres More Date: Mon, 12 Jul 2010 16:28:32 -0300 Subject: [PATCH] --- yaml --- r: 205904 b: refs/heads/master c: abad19d07627a8b67b441452b0450e178416d2d0 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/staging/vt6656/dpc.c | 4 ++-- trunk/drivers/staging/vt6656/rxtx.c | 3 ++- trunk/drivers/staging/vt6656/tether.h | 1 - 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/[refs] b/[refs] index 2b712df4fd75..11f1c680a669 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 8efe1ab3a969cdaff4b9aefb9f67efda4e6e979d +refs/heads/master: abad19d07627a8b67b441452b0450e178416d2d0 diff --git a/trunk/drivers/staging/vt6656/dpc.c b/trunk/drivers/staging/vt6656/dpc.c index 68c13aa56819..bc663e8de3bc 100644 --- a/trunk/drivers/staging/vt6656/dpc.c +++ b/trunk/drivers/staging/vt6656/dpc.c @@ -563,8 +563,8 @@ RXbBulkInProcessData ( // // RX OK // - //remove the CRC length - FrameSize -= U_CRC_LEN; + /* remove the FCS/CRC length */ + FrameSize -= ETH_FCS_LEN; if ( !(*pbyRsr & (RSR_ADDRBROAD | RSR_ADDRMULTI)) && // unicast address (IS_FRAGMENT_PKT((pbyFrame))) diff --git a/trunk/drivers/staging/vt6656/rxtx.c b/trunk/drivers/staging/vt6656/rxtx.c index 6461d55e159f..b20cdc6bf851 100644 --- a/trunk/drivers/staging/vt6656/rxtx.c +++ b/trunk/drivers/staging/vt6656/rxtx.c @@ -3235,7 +3235,8 @@ bRelayPacketSend ( if (pDevice->wCurrentRate <= RATE_11M) byPktType = PK_TYPE_11B; - BytesToWrite = uDataLen + U_CRC_LEN; + BytesToWrite = uDataLen + ETH_FCS_LEN; + // Convert the packet to an usb frame and copy into our buffer // and send the irp. diff --git a/trunk/drivers/staging/vt6656/tether.h b/trunk/drivers/staging/vt6656/tether.h index c278ef3dc741..fc46e516ff03 100644 --- a/trunk/drivers/staging/vt6656/tether.h +++ b/trunk/drivers/staging/vt6656/tether.h @@ -36,7 +36,6 @@ // // constants // -#define U_CRC_LEN 4 // #define U_ETHER_ADDR_STR_LEN (ETH_ALEN * 2 + 1) // Ethernet address string length