Commit 020c0a9a authored Jul 12, 2010 by Andres More Committed by Greg Kroah-Hartman Jul 22, 2010

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 <more.andres@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>

parent abad19d0

drivers/staging/vt6656/rxtx.c

+2 −2

Original line number	Diff line number	Diff line
		@@ -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))) {

drivers/staging/vt6656/tether.h

+1 −2

Original line number	Diff line number	Diff line
		@@ -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)