Staging: vt665x: 64bit compile fixes Part 2
Fix compile problems with 64bit. These issues could cause corrupted address crashes. Cleanup definition use to use more portable kernel typedefs etc. Signed-off-by: Jim Lieb <lieb@canonical.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
This commit is contained in:
parent
db6cb9036b
commit
d899d40386
|
@ -1300,7 +1300,7 @@ if((pMgmt->eCurrState!=WMAC_STATE_ASSOC) &&
|
||||||
wpahdr->req_ie_len = 0;
|
wpahdr->req_ie_len = 0;
|
||||||
skb_put(pDevice->skb, sizeof(viawget_wpa_header));
|
skb_put(pDevice->skb, sizeof(viawget_wpa_header));
|
||||||
pDevice->skb->dev = pDevice->wpadev;
|
pDevice->skb->dev = pDevice->wpadev;
|
||||||
pDevice->skb->mac_header = pDevice->skb->data;
|
skb_reset_mac_header(pDevice->skb);
|
||||||
pDevice->skb->pkt_type = PACKET_HOST;
|
pDevice->skb->pkt_type = PACKET_HOST;
|
||||||
pDevice->skb->protocol = htons(ETH_P_802_2);
|
pDevice->skb->protocol = htons(ETH_P_802_2);
|
||||||
memset(pDevice->skb->cb, 0, sizeof(pDevice->skb->cb));
|
memset(pDevice->skb->cb, 0, sizeof(pDevice->skb->cb));
|
||||||
|
@ -1340,7 +1340,7 @@ DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO "bIsRoaming %d, !\n", pDevice->bIsRoaming );
|
||||||
wpahdr->req_ie_len = 0;
|
wpahdr->req_ie_len = 0;
|
||||||
skb_put(pDevice->skb, sizeof(viawget_wpa_header));
|
skb_put(pDevice->skb, sizeof(viawget_wpa_header));
|
||||||
pDevice->skb->dev = pDevice->wpadev;
|
pDevice->skb->dev = pDevice->wpadev;
|
||||||
pDevice->skb->mac_header = pDevice->skb->data;
|
skb_reset_mac_header(pDevice->skb);
|
||||||
pDevice->skb->pkt_type = PACKET_HOST;
|
pDevice->skb->pkt_type = PACKET_HOST;
|
||||||
pDevice->skb->protocol = htons(ETH_P_802_2);
|
pDevice->skb->protocol = htons(ETH_P_802_2);
|
||||||
memset(pDevice->skb->cb, 0, sizeof(pDevice->skb->cb));
|
memset(pDevice->skb->cb, 0, sizeof(pDevice->skb->cb));
|
||||||
|
|
|
@ -674,7 +674,7 @@ RXbBulkInProcessData (
|
||||||
skb->data += 8;
|
skb->data += 8;
|
||||||
skb->tail += 8;
|
skb->tail += 8;
|
||||||
skb_put(skb, FrameSize);
|
skb_put(skb, FrameSize);
|
||||||
skb->mac_header = skb->data;
|
skb_reset_mac_header(skb);
|
||||||
skb->pkt_type = PACKET_OTHERHOST;
|
skb->pkt_type = PACKET_OTHERHOST;
|
||||||
skb->protocol = htons(ETH_P_802_2);
|
skb->protocol = htons(ETH_P_802_2);
|
||||||
memset(skb->cb, 0, sizeof(skb->cb));
|
memset(skb->cb, 0, sizeof(skb->cb));
|
||||||
|
@ -831,7 +831,7 @@ RXbBulkInProcessData (
|
||||||
skb->data += (cbIVOffset + 8);
|
skb->data += (cbIVOffset + 8);
|
||||||
skb->tail += (cbIVOffset + 8);
|
skb->tail += (cbIVOffset + 8);
|
||||||
skb_put(skb, FrameSize);
|
skb_put(skb, FrameSize);
|
||||||
skb->mac_header = skb->data;
|
skb_reset_mac_header(skb);
|
||||||
skb->pkt_type = PACKET_OTHERHOST;
|
skb->pkt_type = PACKET_OTHERHOST;
|
||||||
skb->protocol = htons(ETH_P_802_2);
|
skb->protocol = htons(ETH_P_802_2);
|
||||||
memset(skb->cb, 0, sizeof(skb->cb));
|
memset(skb->cb, 0, sizeof(skb->cb));
|
||||||
|
@ -951,7 +951,7 @@ RXbBulkInProcessData (
|
||||||
wpahdr->req_ie_len = 0;
|
wpahdr->req_ie_len = 0;
|
||||||
skb_put(pDevice->skb, sizeof(viawget_wpa_header));
|
skb_put(pDevice->skb, sizeof(viawget_wpa_header));
|
||||||
pDevice->skb->dev = pDevice->wpadev;
|
pDevice->skb->dev = pDevice->wpadev;
|
||||||
pDevice->skb->mac_header = pDevice->skb->data;
|
skb_reset_mac_header(pDevice->skb);
|
||||||
pDevice->skb->pkt_type = PACKET_HOST;
|
pDevice->skb->pkt_type = PACKET_HOST;
|
||||||
pDevice->skb->protocol = htons(ETH_P_802_2);
|
pDevice->skb->protocol = htons(ETH_P_802_2);
|
||||||
memset(pDevice->skb->cb, 0, sizeof(pDevice->skb->cb));
|
memset(pDevice->skb->cb, 0, sizeof(pDevice->skb->cb));
|
||||||
|
|
|
@ -812,7 +812,7 @@ FIRMWAREbDownload(
|
||||||
&(pBuffer[ii])
|
&(pBuffer[ii])
|
||||||
);
|
);
|
||||||
|
|
||||||
DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO"Download firmware...%d %d\n", ii, sizeof(abyFirmware));
|
DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO"Download firmware...%d %ld\n", ii, sizeof(abyFirmware));
|
||||||
if (NdisStatus != STATUS_SUCCESS) {
|
if (NdisStatus != STATUS_SUCCESS) {
|
||||||
if (pBuffer)
|
if (pBuffer)
|
||||||
kfree(pBuffer);
|
kfree(pBuffer);
|
||||||
|
|
|
@ -106,6 +106,9 @@ static int hostap_enable_hostapd(PSDevice pDevice, int rtnl_locked)
|
||||||
PSDevice apdev_priv;
|
PSDevice apdev_priv;
|
||||||
struct net_device *dev = pDevice->dev;
|
struct net_device *dev = pDevice->dev;
|
||||||
int ret;
|
int ret;
|
||||||
|
const struct net_device_ops apdev_netdev_ops = {
|
||||||
|
.ndo_start_xmit = pDevice->tx_80211,
|
||||||
|
};
|
||||||
|
|
||||||
DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO "%s: Enabling hostapd mode\n", dev->name);
|
DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO "%s: Enabling hostapd mode\n", dev->name);
|
||||||
|
|
||||||
|
@ -118,9 +121,6 @@ static int hostap_enable_hostapd(PSDevice pDevice, int rtnl_locked)
|
||||||
*apdev_priv = *pDevice;
|
*apdev_priv = *pDevice;
|
||||||
memcpy(pDevice->apdev->dev_addr, dev->dev_addr, ETH_ALEN);
|
memcpy(pDevice->apdev->dev_addr, dev->dev_addr, ETH_ALEN);
|
||||||
|
|
||||||
const struct net_device_ops apdev_netdev_ops = {
|
|
||||||
.ndo_start_xmit = pDevice->tx_80211,
|
|
||||||
};
|
|
||||||
pDevice->apdev->netdev_ops = &apdev_netdev_ops;
|
pDevice->apdev->netdev_ops = &apdev_netdev_ops;
|
||||||
|
|
||||||
pDevice->apdev->type = ARPHRD_IEEE80211;
|
pDevice->apdev->type = ARPHRD_IEEE80211;
|
||||||
|
|
|
@ -753,7 +753,7 @@ static BOOL device_release_WPADEV(PSDevice pDevice)
|
||||||
wpahdr->req_ie_len = 0;
|
wpahdr->req_ie_len = 0;
|
||||||
skb_put(pDevice->skb, sizeof(viawget_wpa_header));
|
skb_put(pDevice->skb, sizeof(viawget_wpa_header));
|
||||||
pDevice->skb->dev = pDevice->wpadev;
|
pDevice->skb->dev = pDevice->wpadev;
|
||||||
pDevice->skb->mac_header = pDevice->skb->data;
|
skb_reset_mac_header(pDevice->skb);
|
||||||
pDevice->skb->pkt_type = PACKET_HOST;
|
pDevice->skb->pkt_type = PACKET_HOST;
|
||||||
pDevice->skb->protocol = htons(ETH_P_802_2);
|
pDevice->skb->protocol = htons(ETH_P_802_2);
|
||||||
memset(pDevice->skb->cb, 0, sizeof(pDevice->skb->cb));
|
memset(pDevice->skb->cb, 0, sizeof(pDevice->skb->cb));
|
||||||
|
|
|
@ -117,10 +117,6 @@
|
||||||
|
|
||||||
/****** Misc macros ********************************************************/
|
/****** Misc macros ********************************************************/
|
||||||
|
|
||||||
// get the field offset in the type(struct, class, ...)
|
|
||||||
#define OFFSET(type, field) ((int)(&((type NEAR*)1)->field)-1)
|
|
||||||
|
|
||||||
|
|
||||||
/* string equality shorthand */
|
/* string equality shorthand */
|
||||||
#define STR_EQ(x, y) (strcmp(x, y) == 0)
|
#define STR_EQ(x, y) (strcmp(x, y) == 0)
|
||||||
#define STR_NE(x, y) (strcmp(x, y) != 0)
|
#define STR_NE(x, y) (strcmp(x, y) != 0)
|
||||||
|
|
|
@ -1053,7 +1053,7 @@ s_vMgrRxAssocResponse(
|
||||||
);
|
);
|
||||||
skb_put(pDevice->skb, sizeof(viawget_wpa_header) + wpahdr->resp_ie_len + wpahdr->req_ie_len);
|
skb_put(pDevice->skb, sizeof(viawget_wpa_header) + wpahdr->resp_ie_len + wpahdr->req_ie_len);
|
||||||
pDevice->skb->dev = pDevice->wpadev;
|
pDevice->skb->dev = pDevice->wpadev;
|
||||||
pDevice->skb->mac_header = pDevice->skb->data;
|
skb_reset_mac_header(pDevice->skb);
|
||||||
pDevice->skb->pkt_type = PACKET_HOST;
|
pDevice->skb->pkt_type = PACKET_HOST;
|
||||||
pDevice->skb->protocol = htons(ETH_P_802_2);
|
pDevice->skb->protocol = htons(ETH_P_802_2);
|
||||||
memset(pDevice->skb->cb, 0, sizeof(pDevice->skb->cb));
|
memset(pDevice->skb->cb, 0, sizeof(pDevice->skb->cb));
|
||||||
|
@ -1692,7 +1692,7 @@ s_vMgrRxDisassociation(
|
||||||
wpahdr->req_ie_len = 0;
|
wpahdr->req_ie_len = 0;
|
||||||
skb_put(pDevice->skb, sizeof(viawget_wpa_header));
|
skb_put(pDevice->skb, sizeof(viawget_wpa_header));
|
||||||
pDevice->skb->dev = pDevice->wpadev;
|
pDevice->skb->dev = pDevice->wpadev;
|
||||||
pDevice->skb->mac_header = pDevice->skb->data;
|
skb_reset_mac_header(pDevice->skb);
|
||||||
pDevice->skb->pkt_type = PACKET_HOST;
|
pDevice->skb->pkt_type = PACKET_HOST;
|
||||||
pDevice->skb->protocol = htons(ETH_P_802_2);
|
pDevice->skb->protocol = htons(ETH_P_802_2);
|
||||||
memset(pDevice->skb->cb, 0, sizeof(pDevice->skb->cb));
|
memset(pDevice->skb->cb, 0, sizeof(pDevice->skb->cb));
|
||||||
|
@ -1795,7 +1795,7 @@ s_vMgrRxDeauthentication(
|
||||||
wpahdr->req_ie_len = 0;
|
wpahdr->req_ie_len = 0;
|
||||||
skb_put(pDevice->skb, sizeof(viawget_wpa_header));
|
skb_put(pDevice->skb, sizeof(viawget_wpa_header));
|
||||||
pDevice->skb->dev = pDevice->wpadev;
|
pDevice->skb->dev = pDevice->wpadev;
|
||||||
pDevice->skb->mac_header = pDevice->skb->data;
|
skb_reset_mac_header(pDevice->skb);
|
||||||
pDevice->skb->pkt_type = PACKET_HOST;
|
pDevice->skb->pkt_type = PACKET_HOST;
|
||||||
pDevice->skb->protocol = htons(ETH_P_802_2);
|
pDevice->skb->protocol = htons(ETH_P_802_2);
|
||||||
memset(pDevice->skb->cb, 0, sizeof(pDevice->skb->cb));
|
memset(pDevice->skb->cb, 0, sizeof(pDevice->skb->cb));
|
||||||
|
|
|
@ -170,7 +170,7 @@ WPA_ParseRSN (
|
||||||
if (pRSN->len >= 12) //oui1(4)+ver(2)+GKS(4)+PKSCnt(2)
|
if (pRSN->len >= 12) //oui1(4)+ver(2)+GKS(4)+PKSCnt(2)
|
||||||
{
|
{
|
||||||
j = 0;
|
j = 0;
|
||||||
DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO"wPKCount: %d, sizeof(pBSSList->abyPKType): %d\n", pRSN->wPKCount, sizeof(pBSSList->abyPKType));
|
DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO"wPKCount: %d, sizeof(pBSSList->abyPKType): %ld\n", pRSN->wPKCount, sizeof(pBSSList->abyPKType));
|
||||||
for(i = 0; (i < pRSN->wPKCount) && (j < sizeof(pBSSList->abyPKType)/sizeof(BYTE)); i++) {
|
for(i = 0; (i < pRSN->wPKCount) && (j < sizeof(pBSSList->abyPKType)/sizeof(BYTE)); i++) {
|
||||||
if(pRSN->len >= 12+i*4+4) { //oui1(4)+ver(2)+GKS(4)+PKSCnt(2)+PKS(4*i)
|
if(pRSN->len >= 12+i*4+4) { //oui1(4)+ver(2)+GKS(4)+PKSCnt(2)+PKS(4*i)
|
||||||
if (MEMEqualMemory(pRSN->PKSList[i].abyOUI, abyOUI00, 4))
|
if (MEMEqualMemory(pRSN->PKSList[i].abyOUI, abyOUI00, 4))
|
||||||
|
@ -201,7 +201,7 @@ WPA_ParseRSN (
|
||||||
// overlay IE_RSN_Auth structure into correct place
|
// overlay IE_RSN_Auth structure into correct place
|
||||||
pIE_RSN_Auth = (PWLAN_IE_RSN_AUTH) pRSN->PKSList[m].abyOUI;
|
pIE_RSN_Auth = (PWLAN_IE_RSN_AUTH) pRSN->PKSList[m].abyOUI;
|
||||||
j = 0;
|
j = 0;
|
||||||
DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO"wAuthCount: %d, sizeof(pBSSList->abyAuthType): %d\n",
|
DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO"wAuthCount: %d, sizeof(pBSSList->abyAuthType): %ld\n",
|
||||||
pIE_RSN_Auth->wAuthCount, sizeof(pBSSList->abyAuthType));
|
pIE_RSN_Auth->wAuthCount, sizeof(pBSSList->abyAuthType));
|
||||||
for(i = 0; (i < pIE_RSN_Auth->wAuthCount) && (j < sizeof(pBSSList->abyAuthType)/sizeof(BYTE)); i++) {
|
for(i = 0; (i < pIE_RSN_Auth->wAuthCount) && (j < sizeof(pBSSList->abyAuthType)/sizeof(BYTE)); i++) {
|
||||||
if(pRSN->len >= 14+4+(m+i)*4) { //oui1(4)+ver(2)+GKS(4)+PKSCnt(2)+PKS(4*m)+AKC(2)+AKS(4*i)
|
if(pRSN->len >= 14+4+(m+i)*4) { //oui1(4)+ver(2)+GKS(4)+PKSCnt(2)+PKS(4*m)+AKC(2)+AKS(4*i)
|
||||||
|
|
Loading…
Reference in a new issue