diff options
author | Charles Clément <caratorn@gmail.com> | 2010-05-14 22:37:33 -0400 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@suse.de> | 2010-05-17 19:28:00 -0400 |
commit | 96fe9ee2c2dfe3268961f3873ea6098b9b9f27c2 (patch) | |
tree | dfe1c43975d442f5948ceb31d3d3e36201ec3504 /drivers/staging/vt6655 | |
parent | 078b078f662a8e21d5a6fee81007b5337ab962cd (diff) |
Staging: vt6655: use ETH_HLEN macro instead of custom one
Replaced custom header length definition U_HEADER_LEN by ETH_HLEN
from <linux/if_ether.h>. Also remove unused U_TYPE_LEN.
Signed-off-by: Charles Clément <caratorn@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'drivers/staging/vt6655')
-rw-r--r-- | drivers/staging/vt6655/device_main.c | 16 | ||||
-rw-r--r-- | drivers/staging/vt6655/tether.h | 6 | ||||
-rw-r--r-- | drivers/staging/vt6655/wroute.c | 4 |
3 files changed, 12 insertions, 14 deletions
diff --git a/drivers/staging/vt6655/device_main.c b/drivers/staging/vt6655/device_main.c index 301efc5cbe0..25894a201b2 100644 --- a/drivers/staging/vt6655/device_main.c +++ b/drivers/staging/vt6655/device_main.c | |||
@@ -2152,8 +2152,8 @@ BOOL device_dma0_xmit(PSDevice pDevice, struct sk_buff *skb, UINT uNodeIndex) { | |||
2152 | 2152 | ||
2153 | pHeadTD->m_td1TD1.byTCR = (TCR_EDP|TCR_STP); | 2153 | pHeadTD->m_td1TD1.byTCR = (TCR_EDP|TCR_STP); |
2154 | 2154 | ||
2155 | memcpy(pDevice->sTxEthHeader.abyDstAddr, (PBYTE)(skb->data), U_HEADER_LEN); | 2155 | memcpy(pDevice->sTxEthHeader.abyDstAddr, (PBYTE)(skb->data), ETH_HLEN); |
2156 | cbFrameBodySize = skb->len - U_HEADER_LEN; | 2156 | cbFrameBodySize = skb->len - ETH_HLEN; |
2157 | 2157 | ||
2158 | // 802.1H | 2158 | // 802.1H |
2159 | if (ntohs(pDevice->sTxEthHeader.wType) > MAX_DATA_LEN) { | 2159 | if (ntohs(pDevice->sTxEthHeader.wType) > MAX_DATA_LEN) { |
@@ -2356,8 +2356,8 @@ static int device_xmit(struct sk_buff *skb, struct net_device *dev) { | |||
2356 | pHeadTD->m_td1TD1.byTCR = (TCR_EDP|TCR_STP); | 2356 | pHeadTD->m_td1TD1.byTCR = (TCR_EDP|TCR_STP); |
2357 | 2357 | ||
2358 | 2358 | ||
2359 | memcpy(pDevice->sTxEthHeader.abyDstAddr, (PBYTE)(skb->data), U_HEADER_LEN); | 2359 | memcpy(pDevice->sTxEthHeader.abyDstAddr, (PBYTE)(skb->data), ETH_HLEN); |
2360 | cbFrameBodySize = skb->len - U_HEADER_LEN; | 2360 | cbFrameBodySize = skb->len - ETH_HLEN; |
2361 | // 802.1H | 2361 | // 802.1H |
2362 | if (ntohs(pDevice->sTxEthHeader.wType) > MAX_DATA_LEN) { | 2362 | if (ntohs(pDevice->sTxEthHeader.wType) > MAX_DATA_LEN) { |
2363 | cbFrameBodySize += 8; | 2363 | cbFrameBodySize += 8; |
@@ -2636,10 +2636,10 @@ pDevice->byTopCCKBasicRate,pDevice->byTopOFDMBasicRate); | |||
2636 | BYTE Descriptor_type; | 2636 | BYTE Descriptor_type; |
2637 | WORD Key_info; | 2637 | WORD Key_info; |
2638 | BOOL bTxeapol_key = FALSE; | 2638 | BOOL bTxeapol_key = FALSE; |
2639 | Protocol_Version = skb->data[U_HEADER_LEN]; | 2639 | Protocol_Version = skb->data[ETH_HLEN]; |
2640 | Packet_Type = skb->data[U_HEADER_LEN+1]; | 2640 | Packet_Type = skb->data[ETH_HLEN+1]; |
2641 | Descriptor_type = skb->data[U_HEADER_LEN+1+1+2]; | 2641 | Descriptor_type = skb->data[ETH_HLEN+1+1+2]; |
2642 | Key_info = (skb->data[U_HEADER_LEN+1+1+2+1] << 8)|(skb->data[U_HEADER_LEN+1+1+2+2]); | 2642 | Key_info = (skb->data[ETH_HLEN+1+1+2+1] << 8)|(skb->data[ETH_HLEN+1+1+2+2]); |
2643 | if (pDevice->sTxEthHeader.wType == TYPE_PKT_802_1x) { | 2643 | if (pDevice->sTxEthHeader.wType == TYPE_PKT_802_1x) { |
2644 | if(((Protocol_Version==1) ||(Protocol_Version==2)) && | 2644 | if(((Protocol_Version==1) ||(Protocol_Version==2)) && |
2645 | (Packet_Type==3)) { //802.1x OR eapol-key challenge frame transfer | 2645 | (Packet_Type==3)) { //802.1x OR eapol-key challenge frame transfer |
diff --git a/drivers/staging/vt6655/tether.h b/drivers/staging/vt6655/tether.h index af119dd82b2..4f2af359c06 100644 --- a/drivers/staging/vt6655/tether.h +++ b/drivers/staging/vt6655/tether.h | |||
@@ -36,19 +36,17 @@ | |||
36 | // | 36 | // |
37 | // constants | 37 | // constants |
38 | // | 38 | // |
39 | #define U_TYPE_LEN 2 // | ||
40 | #define U_CRC_LEN 4 // | 39 | #define U_CRC_LEN 4 // |
41 | #define U_HEADER_LEN (ETH_ALEN * 2 + U_TYPE_LEN) | ||
42 | #define U_ETHER_ADDR_STR_LEN (ETH_ALEN * 2 + 1) | 40 | #define U_ETHER_ADDR_STR_LEN (ETH_ALEN * 2 + 1) |
43 | // Ethernet address string length | 41 | // Ethernet address string length |
44 | 42 | ||
45 | #define MIN_DATA_LEN 46 // min data length | 43 | #define MIN_DATA_LEN 46 // min data length |
46 | #define MAX_DATA_LEN 1500 // max data length | 44 | #define MAX_DATA_LEN 1500 // max data length |
47 | 45 | ||
48 | #define MIN_PACKET_LEN (MIN_DATA_LEN + U_HEADER_LEN) | 46 | #define MIN_PACKET_LEN (MIN_DATA_LEN + ETH_HLEN) |
49 | // 60 | 47 | // 60 |
50 | // min total packet length (tx) | 48 | // min total packet length (tx) |
51 | #define MAX_PACKET_LEN (MAX_DATA_LEN + U_HEADER_LEN) | 49 | #define MAX_PACKET_LEN (MAX_DATA_LEN + ETH_HLEN) |
52 | // 1514 | 50 | // 1514 |
53 | // max total packet length (tx) | 51 | // max total packet length (tx) |
54 | 52 | ||
diff --git a/drivers/staging/vt6655/wroute.c b/drivers/staging/vt6655/wroute.c index 1d02040e80e..485e105b0af 100644 --- a/drivers/staging/vt6655/wroute.c +++ b/drivers/staging/vt6655/wroute.c | |||
@@ -91,9 +91,9 @@ BOOL ROUTEbRelay (PSDevice pDevice, PBYTE pbySkbData, UINT uDataLen, UINT uNodeI | |||
91 | 91 | ||
92 | pHeadTD->m_td1TD1.byTCR = (TCR_EDP|TCR_STP); | 92 | pHeadTD->m_td1TD1.byTCR = (TCR_EDP|TCR_STP); |
93 | 93 | ||
94 | memcpy(pDevice->sTxEthHeader.abyDstAddr, (PBYTE)pbySkbData, U_HEADER_LEN); | 94 | memcpy(pDevice->sTxEthHeader.abyDstAddr, (PBYTE)pbySkbData, ETH_HLEN); |
95 | 95 | ||
96 | cbFrameBodySize = uDataLen - U_HEADER_LEN; | 96 | cbFrameBodySize = uDataLen - ETH_HLEN; |
97 | 97 | ||
98 | if (ntohs(pDevice->sTxEthHeader.wType) > MAX_DATA_LEN) { | 98 | if (ntohs(pDevice->sTxEthHeader.wType) > MAX_DATA_LEN) { |
99 | cbFrameBodySize += 8; | 99 | cbFrameBodySize += 8; |