]> bbs.cooldavid.org Git - net-next-2.6.git/commitdiff
staging: vt6656: replaced U_CRC_LEN with ETH_FCS_LEN
authorAndres More <more.andres@gmail.com>
Mon, 12 Jul 2010 19:28:32 +0000 (16:28 -0300)
committerGreg Kroah-Hartman <gregkh@suse.de>
Thu, 22 Jul 2010 18:43:04 +0000 (11:43 -0700)
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 <more.andres@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
drivers/staging/vt6656/dpc.c
drivers/staging/vt6656/rxtx.c
drivers/staging/vt6656/tether.h

index 68c13aa56819e49af533842f69f535739ab4179b..bc663e8de3bc70a29256b8c8d60ddc834f87e762 100644 (file)
@@ -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)))
index 6461d55e159f69d08d789d2712f6b5f5812b0a7f..b20cdc6bf851531a823e391d16fadcd38594bda7 100644 (file)
@@ -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.
 
index c278ef3dc7414bf9913ef45d6671d77ddf10647b..fc46e516ff034ee6d6c723875223b9b669112a3d 100644 (file)
@@ -36,7 +36,6 @@
 //
 // constants
 //
-#define U_CRC_LEN           4           //
 #define U_ETHER_ADDR_STR_LEN (ETH_ALEN * 2 + 1)
                                         // Ethernet address string length