diff options
Diffstat (limited to 'drivers/staging/vt6656')
-rw-r--r-- | drivers/staging/vt6656/rxtx.c | 4 | ||||
-rw-r--r-- | 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 b20cdc6bf85..eaead0cdae2 100644 --- a/drivers/staging/vt6656/rxtx.c +++ b/drivers/staging/vt6656/rxtx.c | |||
@@ -1466,7 +1466,7 @@ s_bPacketToWirelessUsb( | |||
1466 | memset(pTxBufHead, 0, sizeof(TX_BUFFER)); | 1466 | memset(pTxBufHead, 0, sizeof(TX_BUFFER)); |
1467 | 1467 | ||
1468 | // Get pkt type | 1468 | // Get pkt type |
1469 | if (ntohs(psEthHeader->wType) > MAX_DATA_LEN) { | 1469 | if (ntohs(psEthHeader->wType) > ETH_DATA_LEN) { |
1470 | if (pDevice->dwDiagRefCount == 0) { | 1470 | if (pDevice->dwDiagRefCount == 0) { |
1471 | cb802_1_H_len = 8; | 1471 | cb802_1_H_len = 8; |
1472 | } else { | 1472 | } else { |
@@ -1701,7 +1701,7 @@ s_bPacketToWirelessUsb( | |||
1701 | } | 1701 | } |
1702 | 1702 | ||
1703 | // 802.1H | 1703 | // 802.1H |
1704 | if (ntohs(psEthHeader->wType) > MAX_DATA_LEN) { | 1704 | if (ntohs(psEthHeader->wType) > ETH_DATA_LEN) { |
1705 | if (pDevice->dwDiagRefCount == 0) { | 1705 | if (pDevice->dwDiagRefCount == 0) { |
1706 | if ( (psEthHeader->wType == TYPE_PKT_IPX) || | 1706 | if ( (psEthHeader->wType == TYPE_PKT_IPX) || |
1707 | (psEthHeader->wType == cpu_to_le16(0xF380))) { | 1707 | (psEthHeader->wType == cpu_to_le16(0xF380))) { |
diff --git a/drivers/staging/vt6656/tether.h b/drivers/staging/vt6656/tether.h index fc46e516ff0..580f5bca1d1 100644 --- a/drivers/staging/vt6656/tether.h +++ b/drivers/staging/vt6656/tether.h | |||
@@ -40,12 +40,11 @@ | |||
40 | // Ethernet address string length | 40 | // Ethernet address string length |
41 | 41 | ||
42 | #define MIN_DATA_LEN 46 // min data length | 42 | #define MIN_DATA_LEN 46 // min data length |
43 | #define MAX_DATA_LEN 1500 // max data length | ||
44 | 43 | ||
45 | #define MIN_PACKET_LEN (MIN_DATA_LEN + ETH_HLEN) | 44 | #define MIN_PACKET_LEN (MIN_DATA_LEN + ETH_HLEN) |
46 | // 60 | 45 | // 60 |
47 | // min total packet length (tx) | 46 | // min total packet length (tx) |
48 | #define MAX_PACKET_LEN (MAX_DATA_LEN + ETH_HLEN) | 47 | #define MAX_PACKET_LEN (ETH_DATA_LEN + ETH_HLEN) |
49 | // 1514 | 48 | // 1514 |
50 | // max total packet length (tx) | 49 | // max total packet length (tx) |
51 | 50 | ||