aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/staging/vt6656
diff options
context:
space:
mode:
authorAndres More <more.andres@gmail.com>2010-07-12 17:17:08 -0400
committerGreg Kroah-Hartman <gregkh@suse.de>2010-07-22 14:43:05 -0400
commit5e03f73fe8c01e301fdf38954297a1237be1ab26 (patch)
tree6902bfcca808c6bc3adbc4420c7672fe5e767201 /drivers/staging/vt6656
parent020c0a9a78f8d5215f09164f7e5c5252dea098f9 (diff)
staging: vt6656: replaced MIN_PACKET_LEN with ETH_ZLEN
Removed custom macro with one from include/linux/if_ether.h. Also removed MIN_DATA_LEN as it is not used elsewhere. Signed-off-by: Andres More <more.andres@gmail.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'drivers/staging/vt6656')
-rw-r--r--drivers/staging/vt6656/mib.c5
-rw-r--r--drivers/staging/vt6656/tether.h5
2 files changed, 2 insertions, 8 deletions
diff --git a/drivers/staging/vt6656/mib.c b/drivers/staging/vt6656/mib.c
index f5a0647886b..b31333af778 100644
--- a/drivers/staging/vt6656/mib.c
+++ b/drivers/staging/vt6656/mib.c
@@ -347,10 +347,9 @@ void STAvUpdateRDStatCounter(PSStatCounter pStatistic,
347 if (WLAN_GET_FC_MOREFRAG(pHeader->wFrameCtl)) 347 if (WLAN_GET_FC_MOREFRAG(pHeader->wFrameCtl))
348 pStatistic->dwRsrRxFragment++; 348 pStatistic->dwRsrRxFragment++;
349 349
350 if (cbFrameLength < MIN_PACKET_LEN + 4) { 350 if (cbFrameLength < ETH_ZLEN + 4) {
351 pStatistic->dwRsrRunt++; 351 pStatistic->dwRsrRunt++;
352 } 352 } else if (cbFrameLength == ETH_ZLEN + 4) {
353 else if (cbFrameLength == MIN_PACKET_LEN + 4) {
354 pStatistic->dwRsrRxFrmLen64++; 353 pStatistic->dwRsrRxFrmLen64++;
355 } 354 }
356 else if ((65 <= cbFrameLength) && (cbFrameLength <= 127)) { 355 else if ((65 <= cbFrameLength) && (cbFrameLength <= 127)) {
diff --git a/drivers/staging/vt6656/tether.h b/drivers/staging/vt6656/tether.h
index 580f5bca1d1..09d40a4c57a 100644
--- a/drivers/staging/vt6656/tether.h
+++ b/drivers/staging/vt6656/tether.h
@@ -39,11 +39,6 @@
39#define U_ETHER_ADDR_STR_LEN (ETH_ALEN * 2 + 1) 39#define U_ETHER_ADDR_STR_LEN (ETH_ALEN * 2 + 1)
40 // Ethernet address string length 40 // Ethernet address string length
41 41
42#define MIN_DATA_LEN 46 // min data length
43
44#define MIN_PACKET_LEN (MIN_DATA_LEN + ETH_HLEN)
45 // 60
46 // min total packet length (tx)
47#define MAX_PACKET_LEN (ETH_DATA_LEN + ETH_HLEN) 42#define MAX_PACKET_LEN (ETH_DATA_LEN + ETH_HLEN)
48 // 1514 43 // 1514
49 // max total packet length (tx) 44 // max total packet length (tx)