]> bbs.cooldavid.org Git - net-next-2.6.git/commitdiff
staging: vt6656: replaced MAX_PACKET_LEN with ETH_FRAME_LEN
authorAndres More <more.andres@gmail.com>
Mon, 12 Jul 2010 21:28:49 +0000 (18:28 -0300)
committerGreg Kroah-Hartman <gregkh@suse.de>
Thu, 22 Jul 2010 18:43:05 +0000 (11:43 -0700)
Replaced custom macro with one from include/linux/if_ether.h.
Also removed MAX_LOOKAHEAD_SIZE as it is not used elsewhere.

Signed-off-by: Andres More <more.andres@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
drivers/staging/vt6656/mib.c
drivers/staging/vt6656/tether.h

index b31333af77889c5c51b7fce0cc037f32a146cc63..9e64bad504eb434dd8c2cc004f03931e7eb40742 100644 (file)
@@ -363,17 +363,14 @@ void STAvUpdateRDStatCounter(PSStatCounter pStatistic,
     }
     else if ((512 <= cbFrameLength) && (cbFrameLength <= 1023)) {
         pStatistic->dwRsrRxFrmLen512_1023++;
-    }
-    else if ((1024 <= cbFrameLength) && (cbFrameLength <= MAX_PACKET_LEN + 4)) {
+    } else if ((1024 <= cbFrameLength) &&
+              (cbFrameLength <= ETH_FRAME_LEN + 4)) {
         pStatistic->dwRsrRxFrmLen1024_1518++;
-    } else if (cbFrameLength > MAX_PACKET_LEN + 4) {
+    } else if (cbFrameLength > ETH_FRAME_LEN + 4) {
         pStatistic->dwRsrLong++;
     }
-
 }
 
-
-
 /*
  * Description: Update Rx Statistic Counter and copy Rx buffer
  *
index 09d40a4c57acd420813a1d7cc7d9bca50411a6d4..be87020d53237fa8071c5d76b172062a24424bb4 100644 (file)
 //
 #define U_ETHER_ADDR_STR_LEN (ETH_ALEN * 2 + 1)
                                         // Ethernet address string length
-
-#define MAX_PACKET_LEN      (ETH_DATA_LEN + ETH_HLEN)
-                                        // 1514
-                                        // max total packet length (tx)
-
-#define MAX_LOOKAHEAD_SIZE  MAX_PACKET_LEN
-
 #define U_MULTI_ADDR_LEN    8           // multicast address length
 
-
 #ifdef __BIG_ENDIAN
 
 #define TYPE_PKT_IP         0x0800      //