From abad19d07627a8b67b441452b0450e178416d2d0 Mon Sep 17 00:00:00 2001 From: Andres More Date: Mon, 12 Jul 2010 16:28:32 -0300 Subject: [PATCH 361/524] staging: vt6656: replaced U_CRC_LEN with ETH_FCS_LEN Removed custom macro with one from include/linux/if_ether.h. FCS is an Ethernet field that holds the CRC value. Signed-off-by: Andres More Signed-off-by: Greg Kroah-Hartman --- drivers/staging/vt6656/dpc.c | 4 ++-- drivers/staging/vt6656/rxtx.c | 3 ++- drivers/staging/vt6656/tether.h | 1 - 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/drivers/staging/vt6656/dpc.c b/drivers/staging/vt6656/dpc.c index 68c13aa..bc663e8 100644 --- a/drivers/staging/vt6656/dpc.c +++ b/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/drivers/staging/vt6656/rxtx.c b/drivers/staging/vt6656/rxtx.c index 6461d55..b20cdc6 100644 --- a/drivers/staging/vt6656/rxtx.c +++ b/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/drivers/staging/vt6656/tether.h b/drivers/staging/vt6656/tether.h index c278ef3..fc46e51 100644 --- a/drivers/staging/vt6656/tether.h +++ b/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 -- 1.7.1