mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-08-21 16:29:59 +00:00
staging: vt6656: [BUG] - Failed connection, incorrect endian.
Hi,
This patch fixes a bug with driver failing to negotiate a connection.
The bug was traced to commit
203e4615ee
staging: vt6656: removed custom definitions of Ethernet packet types
In that patch, definitions in include/linux/if_ether.h replaced ones
in tether.h which had both big and little endian definitions.
include/linux/if_ether.h only refers to big endian values, cpu_to_be16
should be used for the correct endian architectures.
Signed-off-by: Malcolm Priestley <tvboxspy@gmail.com>
Cc: stable <stable@vger.kernel.org> # 2.6.37+
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
parent
07732be2ef
commit
aa209eef3c
2 changed files with 20 additions and 20 deletions
|
@ -200,7 +200,7 @@ s_vProcessRxMACHeader (
|
|||
} else if (!compare_ether_addr(pbyRxBuffer, &pDevice->abySNAP_RFC1042[0])) {
|
||||
cbHeaderSize += 6;
|
||||
pwType = (PWORD) (pbyRxBufferAddr + cbHeaderSize);
|
||||
if ((*pwType == cpu_to_le16(ETH_P_IPX)) ||
|
||||
if ((*pwType == cpu_to_be16(ETH_P_IPX)) ||
|
||||
(*pwType == cpu_to_le16(0xF380))) {
|
||||
cbHeaderSize -= 8;
|
||||
pwType = (PWORD) (pbyRxBufferAddr + cbHeaderSize);
|
||||
|
|
|
@ -1699,7 +1699,7 @@ s_bPacketToWirelessUsb(
|
|||
// 802.1H
|
||||
if (ntohs(psEthHeader->wType) > ETH_DATA_LEN) {
|
||||
if (pDevice->dwDiagRefCount == 0) {
|
||||
if ((psEthHeader->wType == cpu_to_le16(ETH_P_IPX)) ||
|
||||
if ((psEthHeader->wType == cpu_to_be16(ETH_P_IPX)) ||
|
||||
(psEthHeader->wType == cpu_to_le16(0xF380))) {
|
||||
memcpy((PBYTE) (pbyPayloadHead),
|
||||
abySNAP_Bridgetunnel, 6);
|
||||
|
@ -2838,10 +2838,10 @@ int nsDMA_tx_packet(PSDevice pDevice, unsigned int uDMAIdx, struct sk_buff *skb)
|
|||
Packet_Type = skb->data[ETH_HLEN+1];
|
||||
Descriptor_type = skb->data[ETH_HLEN+1+1+2];
|
||||
Key_info = (skb->data[ETH_HLEN+1+1+2+1] << 8)|(skb->data[ETH_HLEN+1+1+2+2]);
|
||||
if (pDevice->sTxEthHeader.wType == cpu_to_le16(ETH_P_PAE)) {
|
||||
/* 802.1x OR eapol-key challenge frame transfer */
|
||||
if (((Protocol_Version == 1) || (Protocol_Version == 2)) &&
|
||||
(Packet_Type == 3)) {
|
||||
if (pDevice->sTxEthHeader.wType == cpu_to_be16(ETH_P_PAE)) {
|
||||
/* 802.1x OR eapol-key challenge frame transfer */
|
||||
if (((Protocol_Version == 1) || (Protocol_Version == 2)) &&
|
||||
(Packet_Type == 3)) {
|
||||
bTxeapol_key = TRUE;
|
||||
if(!(Key_info & BIT3) && //WPA or RSN group-key challenge
|
||||
(Key_info & BIT8) && (Key_info & BIT9)) { //send 2/2 key
|
||||
|
@ -2987,19 +2987,19 @@ int nsDMA_tx_packet(PSDevice pDevice, unsigned int uDMAIdx, struct sk_buff *skb)
|
|||
}
|
||||
}
|
||||
|
||||
if (pDevice->sTxEthHeader.wType == cpu_to_le16(ETH_P_PAE)) {
|
||||
if (pDevice->byBBType != BB_TYPE_11A) {
|
||||
pDevice->wCurrentRate = RATE_1M;
|
||||
pDevice->byACKRate = RATE_1M;
|
||||
pDevice->byTopCCKBasicRate = RATE_1M;
|
||||
pDevice->byTopOFDMBasicRate = RATE_6M;
|
||||
} else {
|
||||
pDevice->wCurrentRate = RATE_6M;
|
||||
pDevice->byACKRate = RATE_6M;
|
||||
pDevice->byTopCCKBasicRate = RATE_1M;
|
||||
pDevice->byTopOFDMBasicRate = RATE_6M;
|
||||
}
|
||||
}
|
||||
if (pDevice->sTxEthHeader.wType == cpu_to_be16(ETH_P_PAE)) {
|
||||
if (pDevice->byBBType != BB_TYPE_11A) {
|
||||
pDevice->wCurrentRate = RATE_1M;
|
||||
pDevice->byACKRate = RATE_1M;
|
||||
pDevice->byTopCCKBasicRate = RATE_1M;
|
||||
pDevice->byTopOFDMBasicRate = RATE_6M;
|
||||
} else {
|
||||
pDevice->wCurrentRate = RATE_6M;
|
||||
pDevice->byACKRate = RATE_6M;
|
||||
pDevice->byTopCCKBasicRate = RATE_1M;
|
||||
pDevice->byTopOFDMBasicRate = RATE_6M;
|
||||
}
|
||||
}
|
||||
|
||||
DBG_PRT(MSG_LEVEL_DEBUG,
|
||||
KERN_INFO "dma_tx: pDevice->wCurrentRate = %d\n",
|
||||
|
@ -3015,7 +3015,7 @@ int nsDMA_tx_packet(PSDevice pDevice, unsigned int uDMAIdx, struct sk_buff *skb)
|
|||
|
||||
if (bNeedEncryption == TRUE) {
|
||||
DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO"ntohs Pkt Type=%04x\n", ntohs(pDevice->sTxEthHeader.wType));
|
||||
if ((pDevice->sTxEthHeader.wType) == cpu_to_le16(ETH_P_PAE)) {
|
||||
if ((pDevice->sTxEthHeader.wType) == cpu_to_be16(ETH_P_PAE)) {
|
||||
bNeedEncryption = FALSE;
|
||||
DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO"Pkt Type=%04x\n", (pDevice->sTxEthHeader.wType));
|
||||
if ((pMgmt->eCurrMode == WMAC_MODE_ESS_STA) && (pMgmt->eCurrState == WMAC_STATE_ASSOC)) {
|
||||
|
|
Loading…
Reference in a new issue