diff --git a/[refs] b/[refs] index 809f5aae456e..f0fe7fe08671 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 31c21b779181140e0b7eadadbd5e0f518e131488 +refs/heads/master: f4a68b9388c7f647ba2fd43faf69cad26ca03206 diff --git a/trunk/drivers/staging/vt6655/mib.c b/trunk/drivers/staging/vt6655/mib.c index e5f06382e4f8..4ca7877075b2 100644 --- a/trunk/drivers/staging/vt6655/mib.c +++ b/trunk/drivers/staging/vt6655/mib.c @@ -359,9 +359,9 @@ 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++; } diff --git a/trunk/drivers/staging/vt6655/tether.h b/trunk/drivers/staging/vt6655/tether.h index 5ade9b6b51c3..3c9acd7903a8 100644 --- a/trunk/drivers/staging/vt6655/tether.h +++ b/trunk/drivers/staging/vt6655/tether.h @@ -44,11 +44,8 @@ #define MIN_PACKET_LEN (MIN_DATA_LEN + ETH_HLEN) // 60 // min total packet length (tx) -#define MAX_PACKET_LEN (ETH_DATA_LEN + ETH_HLEN) - // 1514 - // max total packet length (tx) -#define MAX_LOOKAHEAD_SIZE MAX_PACKET_LEN +#define MAX_LOOKAHEAD_SIZE ETH_FRAME_LEN #define U_MULTI_ADDR_LEN 8 // multicast address length