From 6eecf9fffc2c0ef513e319d337a351ee512dfcda Mon Sep 17 00:00:00 2001 From: Andres More Date: Mon, 12 Jul 2010 16:45:58 -0300 Subject: [PATCH] --- yaml --- r: 205905 b: refs/heads/master c: 020c0a9a78f8d5215f09164f7e5c5252dea098f9 h: refs/heads/master i: 205903: d9cbe5ba7cfdbae0bb80c9b1524641fa0a1ac9d5 v: v3 --- [refs] | 2 +- trunk/drivers/staging/vt6656/rxtx.c | 4 ++-- trunk/drivers/staging/vt6656/tether.h | 3 +-- 3 files changed, 4 insertions(+), 5 deletions(-) diff --git a/[refs] b/[refs] index 11f1c680a669..2429dd6e3713 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: abad19d07627a8b67b441452b0450e178416d2d0 +refs/heads/master: 020c0a9a78f8d5215f09164f7e5c5252dea098f9 diff --git a/trunk/drivers/staging/vt6656/rxtx.c b/trunk/drivers/staging/vt6656/rxtx.c index b20cdc6bf851..eaead0cdae2a 100644 --- a/trunk/drivers/staging/vt6656/rxtx.c +++ b/trunk/drivers/staging/vt6656/rxtx.c @@ -1466,7 +1466,7 @@ s_bPacketToWirelessUsb( memset(pTxBufHead, 0, sizeof(TX_BUFFER)); // Get pkt type - if (ntohs(psEthHeader->wType) > MAX_DATA_LEN) { + if (ntohs(psEthHeader->wType) > ETH_DATA_LEN) { if (pDevice->dwDiagRefCount == 0) { cb802_1_H_len = 8; } else { @@ -1701,7 +1701,7 @@ s_bPacketToWirelessUsb( } // 802.1H - if (ntohs(psEthHeader->wType) > MAX_DATA_LEN) { + if (ntohs(psEthHeader->wType) > ETH_DATA_LEN) { if (pDevice->dwDiagRefCount == 0) { if ( (psEthHeader->wType == TYPE_PKT_IPX) || (psEthHeader->wType == cpu_to_le16(0xF380))) { diff --git a/trunk/drivers/staging/vt6656/tether.h b/trunk/drivers/staging/vt6656/tether.h index fc46e516ff03..580f5bca1d1a 100644 --- a/trunk/drivers/staging/vt6656/tether.h +++ b/trunk/drivers/staging/vt6656/tether.h @@ -40,12 +40,11 @@ // Ethernet address string length #define MIN_DATA_LEN 46 // min data length -#define MAX_DATA_LEN 1500 // max data length #define MIN_PACKET_LEN (MIN_DATA_LEN + ETH_HLEN) // 60 // min total packet length (tx) -#define MAX_PACKET_LEN (MAX_DATA_LEN + ETH_HLEN) +#define MAX_PACKET_LEN (ETH_DATA_LEN + ETH_HLEN) // 1514 // max total packet length (tx)