From 020c0a9a78f8d5215f09164f7e5c5252dea098f9 Mon Sep 17 00:00:00 2001 From: Andres More Date: Mon, 12 Jul 2010 16:45:58 -0300 Subject: [PATCH 362/524] staging: vt6656: replaced MAX_DATA_LEN with ETH_DATA_LEN Removed custom macro with one from include/linux/if_ether.h. Signed-off-by: Andres More Signed-off-by: Greg Kroah-Hartman --- drivers/staging/vt6656/rxtx.c | 4 ++-- drivers/staging/vt6656/tether.h | 3 +-- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/drivers/staging/vt6656/rxtx.c b/drivers/staging/vt6656/rxtx.c index b20cdc6..eaead0c 100644 --- a/drivers/staging/vt6656/rxtx.c +++ b/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/drivers/staging/vt6656/tether.h b/drivers/staging/vt6656/tether.h index fc46e51..580f5bc 100644 --- a/drivers/staging/vt6656/tether.h +++ b/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) -- 1.7.1