aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorCharles Clément <caratorn@gmail.com>2010-05-18 14:30:20 -0400
committerGreg Kroah-Hartman <gregkh@suse.de>2010-05-18 18:00:02 -0400
commitf4a68b9388c7f647ba2fd43faf69cad26ca03206 (patch)
treea3ec08906bfb5ab1ed56d51cedcec5ac8e8df4a7
parent31c21b779181140e0b7eadadbd5e0f518e131488 (diff)
Staging: vt6655: use ETH_FRAME_LEN macro instead of custom one
Replace custom maximum packet lenght definition MAX_PACKET_LEN by ETH_FRAME_LEN from <linux/if_ether.h>. Signed-off-by: Charles Clément <caratorn@gmail.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
-rw-r--r--drivers/staging/vt6655/mib.c4
-rw-r--r--drivers/staging/vt6655/tether.h5
2 files changed, 3 insertions, 6 deletions
diff --git a/drivers/staging/vt6655/mib.c b/drivers/staging/vt6655/mib.c
index e5f06382e4f8..4ca7877075b2 100644
--- a/drivers/staging/vt6655/mib.c
+++ b/drivers/staging/vt6655/mib.c
@@ -359,9 +359,9 @@ void STAvUpdateRDStatCounter (PSStatCounter pStatistic,
359 else if ((512 <= cbFrameLength) && (cbFrameLength <= 1023)) { 359 else if ((512 <= cbFrameLength) && (cbFrameLength <= 1023)) {
360 pStatistic->dwRsrRxFrmLen512_1023++; 360 pStatistic->dwRsrRxFrmLen512_1023++;
361 } 361 }
362 else if ((1024 <= cbFrameLength) && (cbFrameLength <= MAX_PACKET_LEN + 4)) { 362 else if ((1024 <= cbFrameLength) && (cbFrameLength <= ETH_FRAME_LEN + 4)) {
363 pStatistic->dwRsrRxFrmLen1024_1518++; 363 pStatistic->dwRsrRxFrmLen1024_1518++;
364 } else if (cbFrameLength > MAX_PACKET_LEN + 4) { 364 } else if (cbFrameLength > ETH_FRAME_LEN + 4) {
365 pStatistic->dwRsrLong++; 365 pStatistic->dwRsrLong++;
366 } 366 }
367 367
diff --git a/drivers/staging/vt6655/tether.h b/drivers/staging/vt6655/tether.h
index 5ade9b6b51c3..3c9acd7903a8 100644
--- a/drivers/staging/vt6655/tether.h
+++ b/drivers/staging/vt6655/tether.h
@@ -44,11 +44,8 @@
44#define MIN_PACKET_LEN (MIN_DATA_LEN + ETH_HLEN) 44#define MIN_PACKET_LEN (MIN_DATA_LEN + ETH_HLEN)
45 // 60 45 // 60
46 // min total packet length (tx) 46 // min total packet length (tx)
47#define MAX_PACKET_LEN (ETH_DATA_LEN + ETH_HLEN)
48 // 1514
49 // max total packet length (tx)
50 47
51#define MAX_LOOKAHEAD_SIZE MAX_PACKET_LEN 48#define MAX_LOOKAHEAD_SIZE ETH_FRAME_LEN
52 49
53#define U_MULTI_ADDR_LEN 8 // multicast address length 50#define U_MULTI_ADDR_LEN 8 // multicast address length
54 51