staging: vt6655: Add missing blank lines after declarations
This patch fixes the missing blank lines after declarations in vt6655 reported by checkpatch. Signed-off-by: Guillaume Clement <gclement@baobob.org> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
Родитель
fe802546ce
Коммит
6b7112719f
|
@ -546,6 +546,7 @@ vMgrDecodeReassocRequest(
|
||||||
)
|
)
|
||||||
{
|
{
|
||||||
PWLAN_IE pItem;
|
PWLAN_IE pItem;
|
||||||
|
|
||||||
pFrame->pHdr = (PUWLAN_80211HDR)pFrame->pBuf;
|
pFrame->pHdr = (PUWLAN_80211HDR)pFrame->pBuf;
|
||||||
|
|
||||||
/* Fixed Fields */
|
/* Fixed Fields */
|
||||||
|
|
|
@ -2289,6 +2289,7 @@ void BBvReadAllRegs(void __iomem *dwIoBase, unsigned char *pbyBBRegs)
|
||||||
{
|
{
|
||||||
int ii;
|
int ii;
|
||||||
unsigned char byBase = 1;
|
unsigned char byBase = 1;
|
||||||
|
|
||||||
for (ii = 0; ii < BB_MAX_CONTEXT_SIZE; ii++) {
|
for (ii = 0; ii < BB_MAX_CONTEXT_SIZE; ii++) {
|
||||||
BBbReadEmbedded(dwIoBase, (unsigned char)(ii*byBase), pbyBBRegs);
|
BBbReadEmbedded(dwIoBase, (unsigned char)(ii*byBase), pbyBBRegs);
|
||||||
pbyBBRegs += byBase;
|
pbyBBRegs += byBase;
|
||||||
|
|
|
@ -422,6 +422,7 @@ BSSbInsertToBSSList(
|
||||||
|
|
||||||
if (pRSN != NULL) {
|
if (pRSN != NULL) {
|
||||||
unsigned int uLen = pRSN->len + 2;
|
unsigned int uLen = pRSN->len + 2;
|
||||||
|
|
||||||
if (uLen <= (uIELength - (unsigned int)((unsigned char *)pRSN - pbyIEs))) {
|
if (uLen <= (uIELength - (unsigned int)((unsigned char *)pRSN - pbyIEs))) {
|
||||||
pBSSList->wRSNLen = uLen;
|
pBSSList->wRSNLen = uLen;
|
||||||
memcpy(pBSSList->byRSNIE, pRSN, uLen);
|
memcpy(pBSSList->byRSNIE, pRSN, uLen);
|
||||||
|
@ -598,6 +599,7 @@ BSSbUpdateToBSSList(
|
||||||
|
|
||||||
if (pRSNWPA != NULL) {
|
if (pRSNWPA != NULL) {
|
||||||
unsigned int uLen = pRSNWPA->len + 2;
|
unsigned int uLen = pRSNWPA->len + 2;
|
||||||
|
|
||||||
if (uLen <= (uIELength - (unsigned int)((unsigned char *)pRSNWPA - pbyIEs))) {
|
if (uLen <= (uIELength - (unsigned int)((unsigned char *)pRSNWPA - pbyIEs))) {
|
||||||
pBSSList->wWPALen = uLen;
|
pBSSList->wWPALen = uLen;
|
||||||
memcpy(pBSSList->byWPAIE, pRSNWPA, uLen);
|
memcpy(pBSSList->byWPAIE, pRSNWPA, uLen);
|
||||||
|
@ -609,6 +611,7 @@ BSSbUpdateToBSSList(
|
||||||
|
|
||||||
if (pRSN != NULL) {
|
if (pRSN != NULL) {
|
||||||
unsigned int uLen = pRSN->len + 2;
|
unsigned int uLen = pRSN->len + 2;
|
||||||
|
|
||||||
if (uLen <= (uIELength - (unsigned int)((unsigned char *)pRSN - pbyIEs))) {
|
if (uLen <= (uIELength - (unsigned int)((unsigned char *)pRSN - pbyIEs))) {
|
||||||
pBSSList->wRSNLen = uLen;
|
pBSSList->wRSNLen = uLen;
|
||||||
memcpy(pBSSList->byRSNIE, pRSN, uLen);
|
memcpy(pBSSList->byRSNIE, pRSN, uLen);
|
||||||
|
@ -988,6 +991,7 @@ start:
|
||||||
#ifdef WPA_SUPPLICANT_DRIVER_WEXT_SUPPORT
|
#ifdef WPA_SUPPLICANT_DRIVER_WEXT_SUPPORT
|
||||||
{
|
{
|
||||||
union iwreq_data wrqu;
|
union iwreq_data wrqu;
|
||||||
|
|
||||||
memset(&wrqu, 0, sizeof(wrqu));
|
memset(&wrqu, 0, sizeof(wrqu));
|
||||||
wrqu.ap_addr.sa_family = ARPHRD_ETHER;
|
wrqu.ap_addr.sa_family = ARPHRD_ETHER;
|
||||||
PRINT_K("wireless_send_event--->SIOCGIWAP(disassociated)\n");
|
PRINT_K("wireless_send_event--->SIOCGIWAP(disassociated)\n");
|
||||||
|
@ -1167,6 +1171,7 @@ start:
|
||||||
#ifdef WPA_SUPPLICANT_DRIVER_WEXT_SUPPORT
|
#ifdef WPA_SUPPLICANT_DRIVER_WEXT_SUPPORT
|
||||||
{
|
{
|
||||||
union iwreq_data wrqu;
|
union iwreq_data wrqu;
|
||||||
|
|
||||||
memset(&wrqu, 0, sizeof(wrqu));
|
memset(&wrqu, 0, sizeof(wrqu));
|
||||||
wrqu.ap_addr.sa_family = ARPHRD_ETHER;
|
wrqu.ap_addr.sa_family = ARPHRD_ETHER;
|
||||||
PRINT_K("wireless_send_event--->SIOCGIWAP(disassociated)\n");
|
PRINT_K("wireless_send_event--->SIOCGIWAP(disassociated)\n");
|
||||||
|
@ -1267,6 +1272,7 @@ BSSvUpdateNodeTxCounter(
|
||||||
unsigned short wFallBackRate = RATE_1M;
|
unsigned short wFallBackRate = RATE_1M;
|
||||||
unsigned char byFallBack;
|
unsigned char byFallBack;
|
||||||
unsigned int ii;
|
unsigned int ii;
|
||||||
|
|
||||||
pTxBufHead = (PSTxBufHead) pbyBuffer;
|
pTxBufHead = (PSTxBufHead) pbyBuffer;
|
||||||
if (pTxBufHead->wFIFOCtl & FIFOCTL_AUTO_FB_0)
|
if (pTxBufHead->wFIFOCtl & FIFOCTL_AUTO_FB_0)
|
||||||
byFallBack = AUTO_FB_0;
|
byFallBack = AUTO_FB_0;
|
||||||
|
@ -1451,6 +1457,7 @@ void s_vCheckSensitivity(
|
||||||
/* Update BB Reg if RSSI is too strong */
|
/* Update BB Reg if RSSI is too strong */
|
||||||
long LocalldBmAverage = 0;
|
long LocalldBmAverage = 0;
|
||||||
long uNumofdBm = 0;
|
long uNumofdBm = 0;
|
||||||
|
|
||||||
for (ii = 0; ii < RSSI_STAT_COUNT; ii++) {
|
for (ii = 0; ii < RSSI_STAT_COUNT; ii++) {
|
||||||
if (pBSSList->ldBmAverage[ii] != 0) {
|
if (pBSSList->ldBmAverage[ii] != 0) {
|
||||||
uNumofdBm++;
|
uNumofdBm++;
|
||||||
|
|
|
@ -1770,6 +1770,7 @@ void vUpdateIFS(void *pDeviceHandler)
|
||||||
PSDevice pDevice = (PSDevice) pDeviceHandler;
|
PSDevice pDevice = (PSDevice) pDeviceHandler;
|
||||||
|
|
||||||
unsigned char byMaxMin = 0;
|
unsigned char byMaxMin = 0;
|
||||||
|
|
||||||
if (pDevice->byPacketType == PK_TYPE_11A) {//0000 0000 0000 0000,11a
|
if (pDevice->byPacketType == PK_TYPE_11A) {//0000 0000 0000 0000,11a
|
||||||
pDevice->uSlot = C_SLOT_SHORT;
|
pDevice->uSlot = C_SLOT_SHORT;
|
||||||
pDevice->uSIFS = C_SIFS_A;
|
pDevice->uSIFS = C_SIFS_A;
|
||||||
|
|
|
@ -786,6 +786,7 @@ inline static void EnQueue(PSDevice pDevice, PSRxMgmtPacket pRxMgmtPacket)
|
||||||
inline static PSRxMgmtPacket DeQueue(PSDevice pDevice)
|
inline static PSRxMgmtPacket DeQueue(PSDevice pDevice)
|
||||||
{
|
{
|
||||||
PSRxMgmtPacket pRxMgmtPacket;
|
PSRxMgmtPacket pRxMgmtPacket;
|
||||||
|
|
||||||
if (pDevice->rxManeQueue.tail == pDevice->rxManeQueue.head) {
|
if (pDevice->rxManeQueue.tail == pDevice->rxManeQueue.head) {
|
||||||
printk("Queue is Empty\n");
|
printk("Queue is Empty\n");
|
||||||
return NULL;
|
return NULL;
|
||||||
|
|
|
@ -326,6 +326,7 @@ static int Config_FileGetParameter(unsigned char *string,
|
||||||
static char *get_chip_name(int chip_id)
|
static char *get_chip_name(int chip_id)
|
||||||
{
|
{
|
||||||
int i;
|
int i;
|
||||||
|
|
||||||
for (i = 0; chip_info_table[i].name != NULL; i++)
|
for (i = 0; chip_info_table[i].name != NULL; i++)
|
||||||
if (chip_info_table[i].chip_id == chip_id)
|
if (chip_info_table[i].chip_id == chip_id)
|
||||||
break;
|
break;
|
||||||
|
@ -464,6 +465,7 @@ static void device_init_registers(PSDevice pDevice, DEVICE_INIT_TYPE InitType)
|
||||||
unsigned char byOFDMPwrdBm = 0;
|
unsigned char byOFDMPwrdBm = 0;
|
||||||
int zonetype = 0;
|
int zonetype = 0;
|
||||||
PSMgmtObject pMgmt = &(pDevice->sMgmtObj);
|
PSMgmtObject pMgmt = &(pDevice->sMgmtObj);
|
||||||
|
|
||||||
MACbShutdown(pDevice->PortOffset);
|
MACbShutdown(pDevice->PortOffset);
|
||||||
BBvSoftwareReset(pDevice->PortOffset);
|
BBvSoftwareReset(pDevice->PortOffset);
|
||||||
|
|
||||||
|
@ -1006,6 +1008,7 @@ static bool device_get_pci_info(PSDevice pDevice, struct pci_dev *pcid) {
|
||||||
unsigned char value = 0x00;
|
unsigned char value = 0x00;
|
||||||
int ii, j;
|
int ii, j;
|
||||||
u16 max_lat = 0x0000;
|
u16 max_lat = 0x0000;
|
||||||
|
|
||||||
memset(pci_config, 0x00, 256);
|
memset(pci_config, 0x00, 256);
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
@ -1358,6 +1361,7 @@ static void device_init_td1_ring(PSDevice pDevice) {
|
||||||
|
|
||||||
static void device_free_td0_ring(PSDevice pDevice) {
|
static void device_free_td0_ring(PSDevice pDevice) {
|
||||||
int i;
|
int i;
|
||||||
|
|
||||||
for (i = 0; i < pDevice->sOpts.nTxDescs[0]; i++) {
|
for (i = 0; i < pDevice->sOpts.nTxDescs[0]; i++) {
|
||||||
PSTxDesc pDesc = &(pDevice->apTD0Rings[i]);
|
PSTxDesc pDesc = &(pDevice->apTD0Rings[i]);
|
||||||
PDEVICE_TD_INFO pTDInfo = pDesc->pTDInfo;
|
PDEVICE_TD_INFO pTDInfo = pDesc->pTDInfo;
|
||||||
|
@ -2278,6 +2282,7 @@ static int device_xmit(struct sk_buff *skb, struct net_device *dev) {
|
||||||
unsigned char Descriptor_type;
|
unsigned char Descriptor_type;
|
||||||
unsigned short Key_info;
|
unsigned short Key_info;
|
||||||
bool bTxeapol_key = false;
|
bool bTxeapol_key = false;
|
||||||
|
|
||||||
Protocol_Version = skb->data[ETH_HLEN];
|
Protocol_Version = skb->data[ETH_HLEN];
|
||||||
Packet_Type = skb->data[ETH_HLEN+1];
|
Packet_Type = skb->data[ETH_HLEN+1];
|
||||||
Descriptor_type = skb->data[ETH_HLEN+1+1+2];
|
Descriptor_type = skb->data[ETH_HLEN+1+1+2];
|
||||||
|
@ -2576,6 +2581,7 @@ static inline u32 ether_crc(int length, unsigned char *data)
|
||||||
while (--length >= 0) {
|
while (--length >= 0) {
|
||||||
unsigned char current_octet = *data++;
|
unsigned char current_octet = *data++;
|
||||||
int bit;
|
int bit;
|
||||||
|
|
||||||
for (bit = 0; bit < 8; bit++, current_octet >>= 1) {
|
for (bit = 0; bit < 8; bit++, current_octet >>= 1) {
|
||||||
crc = (crc << 1) ^
|
crc = (crc << 1) ^
|
||||||
((crc < 0) ^ (current_octet & 1) ? ethernet_polynomial : 0);
|
((crc < 0) ^ (current_octet & 1) ? ethernet_polynomial : 0);
|
||||||
|
@ -2671,6 +2677,7 @@ static void device_set_multi(struct net_device *dev) {
|
||||||
memset(mc_filter, 0, sizeof(mc_filter));
|
memset(mc_filter, 0, sizeof(mc_filter));
|
||||||
netdev_for_each_mc_addr(ha, dev) {
|
netdev_for_each_mc_addr(ha, dev) {
|
||||||
int bit_nr = ether_crc(ETH_ALEN, ha->addr) >> 26;
|
int bit_nr = ether_crc(ETH_ALEN, ha->addr) >> 26;
|
||||||
|
|
||||||
mc_filter[bit_nr >> 5] |= cpu_to_le32(1 << (bit_nr & 31));
|
mc_filter[bit_nr >> 5] |= cpu_to_le32(1 << (bit_nr & 31));
|
||||||
}
|
}
|
||||||
MACvSelectPage1(pDevice->PortOffset);
|
MACvSelectPage1(pDevice->PortOffset);
|
||||||
|
@ -2734,6 +2741,7 @@ static int device_ioctl(struct net_device *dev, struct ifreq *rq, int cmd) {
|
||||||
|
|
||||||
{
|
{
|
||||||
char essid[IW_ESSID_MAX_SIZE+1];
|
char essid[IW_ESSID_MAX_SIZE+1];
|
||||||
|
|
||||||
if (wrq->u.essid.length > IW_ESSID_MAX_SIZE) {
|
if (wrq->u.essid.length > IW_ESSID_MAX_SIZE) {
|
||||||
rc = -E2BIG;
|
rc = -E2BIG;
|
||||||
break;
|
break;
|
||||||
|
@ -2753,6 +2761,7 @@ static int device_ioctl(struct net_device *dev, struct ifreq *rq, int cmd) {
|
||||||
|
|
||||||
{
|
{
|
||||||
char essid[IW_ESSID_MAX_SIZE+1];
|
char essid[IW_ESSID_MAX_SIZE+1];
|
||||||
|
|
||||||
if (wrq->u.essid.pointer)
|
if (wrq->u.essid.pointer)
|
||||||
rc = iwctl_giwessid(dev, NULL,
|
rc = iwctl_giwessid(dev, NULL,
|
||||||
&(wrq->u.essid), essid);
|
&(wrq->u.essid), essid);
|
||||||
|
@ -3115,6 +3124,7 @@ static int ethtool_ioctl(struct net_device *dev, void __user *useraddr)
|
||||||
switch (ethcmd) {
|
switch (ethcmd) {
|
||||||
case ETHTOOL_GDRVINFO: {
|
case ETHTOOL_GDRVINFO: {
|
||||||
struct ethtool_drvinfo info = {ETHTOOL_GDRVINFO};
|
struct ethtool_drvinfo info = {ETHTOOL_GDRVINFO};
|
||||||
|
|
||||||
strncpy(info.driver, DEVICE_NAME, sizeof(info.driver)-1);
|
strncpy(info.driver, DEVICE_NAME, sizeof(info.driver)-1);
|
||||||
strncpy(info.version, DEVICE_VERSION, sizeof(info.version)-1);
|
strncpy(info.version, DEVICE_VERSION, sizeof(info.version)-1);
|
||||||
if (copy_to_user(useraddr, &info, sizeof(info)))
|
if (copy_to_user(useraddr, &info, sizeof(info)))
|
||||||
|
@ -3171,6 +3181,7 @@ static int
|
||||||
device_notify_reboot(struct notifier_block *nb, unsigned long event, void *p)
|
device_notify_reboot(struct notifier_block *nb, unsigned long event, void *p)
|
||||||
{
|
{
|
||||||
struct pci_dev *pdev = NULL;
|
struct pci_dev *pdev = NULL;
|
||||||
|
|
||||||
switch (event) {
|
switch (event) {
|
||||||
case SYS_DOWN:
|
case SYS_DOWN:
|
||||||
case SYS_HALT:
|
case SYS_HALT:
|
||||||
|
|
|
@ -604,6 +604,7 @@ device_receive_frame(
|
||||||
{
|
{
|
||||||
unsigned char Protocol_Version; //802.1x Authentication
|
unsigned char Protocol_Version; //802.1x Authentication
|
||||||
unsigned char Packet_Type; //802.1x Authentication
|
unsigned char Packet_Type; //802.1x Authentication
|
||||||
|
|
||||||
if (bIsWEP)
|
if (bIsWEP)
|
||||||
cbIVOffset = 8;
|
cbIVOffset = 8;
|
||||||
else
|
else
|
||||||
|
@ -761,6 +762,7 @@ device_receive_frame(
|
||||||
union iwreq_data wrqu;
|
union iwreq_data wrqu;
|
||||||
struct iw_michaelmicfailure ev;
|
struct iw_michaelmicfailure ev;
|
||||||
int keyidx = pbyFrame[cbHeaderSize+3] >> 6; //top two-bits
|
int keyidx = pbyFrame[cbHeaderSize+3] >> 6; //top two-bits
|
||||||
|
|
||||||
memset(&ev, 0, sizeof(ev));
|
memset(&ev, 0, sizeof(ev));
|
||||||
ev.flags = keyidx & IW_MICFAILURE_KEY_ID;
|
ev.flags = keyidx & IW_MICFAILURE_KEY_ID;
|
||||||
if ((pMgmt->eCurrMode == WMAC_MODE_ESS_STA) &&
|
if ((pMgmt->eCurrMode == WMAC_MODE_ESS_STA) &&
|
||||||
|
@ -1114,6 +1116,7 @@ static bool s_bHandleRxEncryption(
|
||||||
// Software TKIP
|
// Software TKIP
|
||||||
// 1. 3253 A
|
// 1. 3253 A
|
||||||
PS802_11Header pMACHeader = (PS802_11Header)(pbyFrame);
|
PS802_11Header pMACHeader = (PS802_11Header)(pbyFrame);
|
||||||
|
|
||||||
TKIPvMixKey(pKey->abyKey, pMACHeader->abyAddr2, *pwRxTSC15_0, *pdwRxTSC47_16, pDevice->abyPRNG);
|
TKIPvMixKey(pKey->abyKey, pMACHeader->abyAddr2, *pwRxTSC15_0, *pdwRxTSC47_16, pDevice->abyPRNG);
|
||||||
rc4_init(&pDevice->SBox, pDevice->abyPRNG, TKIP_KEY_LEN);
|
rc4_init(&pDevice->SBox, pDevice->abyPRNG, TKIP_KEY_LEN);
|
||||||
rc4_encrypt(&pDevice->SBox, pbyIV+8, pbyIV+8, PayloadLen);
|
rc4_encrypt(&pDevice->SBox, pbyIV+8, pbyIV+8, PayloadLen);
|
||||||
|
|
|
@ -139,11 +139,13 @@ static int iwctl_siwscan(struct net_device *dev,
|
||||||
struct iw_scan_req *req = (struct iw_scan_req *)extra;
|
struct iw_scan_req *req = (struct iw_scan_req *)extra;
|
||||||
unsigned char abyScanSSID[WLAN_IEHDR_LEN + WLAN_SSID_MAXLEN + 1];
|
unsigned char abyScanSSID[WLAN_IEHDR_LEN + WLAN_SSID_MAXLEN + 1];
|
||||||
PWLAN_IE_SSID pItemSSID = NULL;
|
PWLAN_IE_SSID pItemSSID = NULL;
|
||||||
|
|
||||||
DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO " SIOCSIWSCAN \n");
|
DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO " SIOCSIWSCAN \n");
|
||||||
|
|
||||||
if (pDevice->byReAssocCount > 0) { //reject scan when re-associating!
|
if (pDevice->byReAssocCount > 0) { //reject scan when re-associating!
|
||||||
//send scan event to wpa_Supplicant
|
//send scan event to wpa_Supplicant
|
||||||
union iwreq_data wrqu;
|
union iwreq_data wrqu;
|
||||||
|
|
||||||
PRINT_K("wireless_send_event--->SIOCGIWSCAN(scan done)\n");
|
PRINT_K("wireless_send_event--->SIOCGIWSCAN(scan done)\n");
|
||||||
memset(&wrqu, 0, sizeof(wrqu));
|
memset(&wrqu, 0, sizeof(wrqu));
|
||||||
wireless_send_event(pDevice->dev, SIOCGIWSCAN, &wrqu, NULL);
|
wireless_send_event(pDevice->dev, SIOCGIWSCAN, &wrqu, NULL);
|
||||||
|
@ -255,6 +257,7 @@ static int iwctl_giwscan(struct net_device *dev,
|
||||||
//2008-0409-04, <Add> by Einsn Liu
|
//2008-0409-04, <Add> by Einsn Liu
|
||||||
{
|
{
|
||||||
int f = (int)pBSS->uChannel - 1;
|
int f = (int)pBSS->uChannel - 1;
|
||||||
|
|
||||||
if (f < 0)f = 0;
|
if (f < 0)f = 0;
|
||||||
iwe.u.freq.m = frequency_list[f] * 100000;
|
iwe.u.freq.m = frequency_list[f] * 100000;
|
||||||
iwe.u.freq.e = 1;
|
iwe.u.freq.e = 1;
|
||||||
|
@ -358,6 +361,7 @@ int iwctl_siwfreq(struct net_device *dev,
|
||||||
(wrq->m <= (int) 2.487e8)) {
|
(wrq->m <= (int) 2.487e8)) {
|
||||||
int f = wrq->m / 100000;
|
int f = wrq->m / 100000;
|
||||||
int c = 0;
|
int c = 0;
|
||||||
|
|
||||||
while ((c < 14) && (f != frequency_list[c]))
|
while ((c < 14) && (f != frequency_list[c]))
|
||||||
c++;
|
c++;
|
||||||
wrq->e = 0;
|
wrq->e = 0;
|
||||||
|
@ -368,6 +372,7 @@ int iwctl_siwfreq(struct net_device *dev,
|
||||||
rc = -EOPNOTSUPP;
|
rc = -EOPNOTSUPP;
|
||||||
else {
|
else {
|
||||||
int channel = wrq->m;
|
int channel = wrq->m;
|
||||||
|
|
||||||
if ((channel < 1) || (channel > 14)) {
|
if ((channel < 1) || (channel > 14)) {
|
||||||
DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO "%s: New channel value of %d is invalid!\n", dev->name, wrq->m);
|
DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO "%s: New channel value of %d is invalid!\n", dev->name, wrq->m);
|
||||||
rc = -EINVAL;
|
rc = -EINVAL;
|
||||||
|
@ -404,6 +409,7 @@ int iwctl_giwfreq(struct net_device *dev,
|
||||||
#else
|
#else
|
||||||
{
|
{
|
||||||
int f = (int)pMgmt->uCurrChannel - 1;
|
int f = (int)pMgmt->uCurrChannel - 1;
|
||||||
|
|
||||||
if (f < 0)
|
if (f < 0)
|
||||||
f = 0;
|
f = 0;
|
||||||
wrq->m = frequency_list[f] * 100000;
|
wrq->m = frequency_list[f] * 100000;
|
||||||
|
@ -658,6 +664,7 @@ int iwctl_siwap(struct net_device *dev,
|
||||||
// then ignore,because you don't known which one to be connect with??
|
// then ignore,because you don't known which one to be connect with??
|
||||||
{
|
{
|
||||||
unsigned int ii, uSameBssidNum = 0;
|
unsigned int ii, uSameBssidNum = 0;
|
||||||
|
|
||||||
for (ii = 0; ii < MAX_BSS_NUM; ii++) {
|
for (ii = 0; ii < MAX_BSS_NUM; ii++) {
|
||||||
if (pMgmt->sBSSList[ii].bActive &&
|
if (pMgmt->sBSSList[ii].bActive &&
|
||||||
ether_addr_equal(pMgmt->sBSSList[ii].abyBSSID,
|
ether_addr_equal(pMgmt->sBSSList[ii].abyBSSID,
|
||||||
|
@ -1059,6 +1066,7 @@ int iwctl_siwrts(struct net_device *dev,
|
||||||
|
|
||||||
{
|
{
|
||||||
int rthr = wrq->value;
|
int rthr = wrq->value;
|
||||||
|
|
||||||
if (wrq->disabled)
|
if (wrq->disabled)
|
||||||
rthr = 2312;
|
rthr = 2312;
|
||||||
|
|
||||||
|
|
|
@ -82,6 +82,7 @@ void rc4_encrypt(PRC4Ext pRC4, unsigned char *pbyDest,
|
||||||
unsigned char *pbySrc, unsigned int cbData_len)
|
unsigned char *pbySrc, unsigned int cbData_len)
|
||||||
{
|
{
|
||||||
unsigned int ii;
|
unsigned int ii;
|
||||||
|
|
||||||
for (ii = 0; ii < cbData_len; ii++)
|
for (ii = 0; ii < cbData_len; ii++)
|
||||||
pbyDest[ii] = (unsigned char)(pbySrc[ii] ^ rc4_byte(pRC4));
|
pbyDest[ii] = (unsigned char)(pbySrc[ii] ^ rc4_byte(pRC4));
|
||||||
}
|
}
|
||||||
|
|
|
@ -750,6 +750,7 @@ bool RFbInit(
|
||||||
)
|
)
|
||||||
{
|
{
|
||||||
bool bResult = true;
|
bool bResult = true;
|
||||||
|
|
||||||
switch (pDevice->byRFType) {
|
switch (pDevice->byRFType) {
|
||||||
case RF_AIROHA:
|
case RF_AIROHA:
|
||||||
case RF_AL2230S:
|
case RF_AL2230S:
|
||||||
|
@ -786,6 +787,7 @@ bool RFbInit(
|
||||||
bool RFbSelectChannel(void __iomem *dwIoBase, unsigned char byRFType, unsigned char byChannel)
|
bool RFbSelectChannel(void __iomem *dwIoBase, unsigned char byRFType, unsigned char byChannel)
|
||||||
{
|
{
|
||||||
bool bResult = true;
|
bool bResult = true;
|
||||||
|
|
||||||
switch (byRFType) {
|
switch (byRFType) {
|
||||||
case RF_AIROHA:
|
case RF_AIROHA:
|
||||||
case RF_AL2230S:
|
case RF_AL2230S:
|
||||||
|
|
|
@ -1084,6 +1084,7 @@ s_vGenerateTxParameter(
|
||||||
unsigned char byFBOption = AUTO_FB_NONE;
|
unsigned char byFBOption = AUTO_FB_NONE;
|
||||||
|
|
||||||
PSTxBufHead pFifoHead = (PSTxBufHead)pTxBufHead;
|
PSTxBufHead pFifoHead = (PSTxBufHead)pTxBufHead;
|
||||||
|
|
||||||
pFifoHead->wReserved = wCurrentRate;
|
pFifoHead->wReserved = wCurrentRate;
|
||||||
wFifoCtl = pFifoHead->wFIFOCtl;
|
wFifoCtl = pFifoHead->wFIFOCtl;
|
||||||
|
|
||||||
|
@ -1103,6 +1104,7 @@ s_vGenerateTxParameter(
|
||||||
//Fill RsvTime
|
//Fill RsvTime
|
||||||
if (pvRrvTime) {
|
if (pvRrvTime) {
|
||||||
PSRrvTime_gRTS pBuf = (PSRrvTime_gRTS)pvRrvTime;
|
PSRrvTime_gRTS pBuf = (PSRrvTime_gRTS)pvRrvTime;
|
||||||
|
|
||||||
pBuf->wRTSTxRrvTime_aa = cpu_to_le16((unsigned short)s_uGetRTSCTSRsvTime(pDevice, 2, byPktType, cbFrameSize, wCurrentRate));//2:RTSTxRrvTime_aa, 1:2.4GHz
|
pBuf->wRTSTxRrvTime_aa = cpu_to_le16((unsigned short)s_uGetRTSCTSRsvTime(pDevice, 2, byPktType, cbFrameSize, wCurrentRate));//2:RTSTxRrvTime_aa, 1:2.4GHz
|
||||||
pBuf->wRTSTxRrvTime_ba = cpu_to_le16((unsigned short)s_uGetRTSCTSRsvTime(pDevice, 1, byPktType, cbFrameSize, wCurrentRate));//1:RTSTxRrvTime_ba, 1:2.4GHz
|
pBuf->wRTSTxRrvTime_ba = cpu_to_le16((unsigned short)s_uGetRTSCTSRsvTime(pDevice, 1, byPktType, cbFrameSize, wCurrentRate));//1:RTSTxRrvTime_ba, 1:2.4GHz
|
||||||
pBuf->wRTSTxRrvTime_bb = cpu_to_le16((unsigned short)s_uGetRTSCTSRsvTime(pDevice, 0, byPktType, cbFrameSize, wCurrentRate));//0:RTSTxRrvTime_bb, 1:2.4GHz
|
pBuf->wRTSTxRrvTime_bb = cpu_to_le16((unsigned short)s_uGetRTSCTSRsvTime(pDevice, 0, byPktType, cbFrameSize, wCurrentRate));//0:RTSTxRrvTime_bb, 1:2.4GHz
|
||||||
|
@ -1116,6 +1118,7 @@ s_vGenerateTxParameter(
|
||||||
//Fill RsvTime
|
//Fill RsvTime
|
||||||
if (pvRrvTime) {
|
if (pvRrvTime) {
|
||||||
PSRrvTime_gCTS pBuf = (PSRrvTime_gCTS)pvRrvTime;
|
PSRrvTime_gCTS pBuf = (PSRrvTime_gCTS)pvRrvTime;
|
||||||
|
|
||||||
pBuf->wTxRrvTime_a = cpu_to_le16((unsigned short)s_uGetTxRsvTime(pDevice, byPktType, cbFrameSize, wCurrentRate, bNeedACK));//2.4G OFDM
|
pBuf->wTxRrvTime_a = cpu_to_le16((unsigned short)s_uGetTxRsvTime(pDevice, byPktType, cbFrameSize, wCurrentRate, bNeedACK));//2.4G OFDM
|
||||||
pBuf->wTxRrvTime_b = cpu_to_le16((unsigned short)s_uGetTxRsvTime(pDevice, PK_TYPE_11B, cbFrameSize, pDevice->byTopCCKBasicRate, bNeedACK));//1:CCK
|
pBuf->wTxRrvTime_b = cpu_to_le16((unsigned short)s_uGetTxRsvTime(pDevice, PK_TYPE_11B, cbFrameSize, pDevice->byTopCCKBasicRate, bNeedACK));//1:CCK
|
||||||
pBuf->wCTSTxRrvTime_ba = cpu_to_le16((unsigned short)s_uGetRTSCTSRsvTime(pDevice, 3, byPktType, cbFrameSize, wCurrentRate));//3:CTSTxRrvTime_Ba, 1:2.4GHz
|
pBuf->wCTSTxRrvTime_ba = cpu_to_le16((unsigned short)s_uGetRTSCTSRsvTime(pDevice, 3, byPktType, cbFrameSize, wCurrentRate));//3:CTSTxRrvTime_Ba, 1:2.4GHz
|
||||||
|
@ -1129,6 +1132,7 @@ s_vGenerateTxParameter(
|
||||||
//Fill RsvTime
|
//Fill RsvTime
|
||||||
if (pvRrvTime) {
|
if (pvRrvTime) {
|
||||||
PSRrvTime_ab pBuf = (PSRrvTime_ab)pvRrvTime;
|
PSRrvTime_ab pBuf = (PSRrvTime_ab)pvRrvTime;
|
||||||
|
|
||||||
pBuf->wRTSTxRrvTime = cpu_to_le16((unsigned short)s_uGetRTSCTSRsvTime(pDevice, 2, byPktType, cbFrameSize, wCurrentRate));//2:RTSTxRrvTime_aa, 0:5GHz
|
pBuf->wRTSTxRrvTime = cpu_to_le16((unsigned short)s_uGetRTSCTSRsvTime(pDevice, 2, byPktType, cbFrameSize, wCurrentRate));//2:RTSTxRrvTime_aa, 0:5GHz
|
||||||
pBuf->wTxRrvTime = cpu_to_le16((unsigned short)s_uGetTxRsvTime(pDevice, byPktType, cbFrameSize, wCurrentRate, bNeedACK));//0:OFDM
|
pBuf->wTxRrvTime = cpu_to_le16((unsigned short)s_uGetTxRsvTime(pDevice, byPktType, cbFrameSize, wCurrentRate, bNeedACK));//0:OFDM
|
||||||
}
|
}
|
||||||
|
@ -1138,6 +1142,7 @@ s_vGenerateTxParameter(
|
||||||
//Fill RsvTime
|
//Fill RsvTime
|
||||||
if (pvRrvTime) {
|
if (pvRrvTime) {
|
||||||
PSRrvTime_ab pBuf = (PSRrvTime_ab)pvRrvTime;
|
PSRrvTime_ab pBuf = (PSRrvTime_ab)pvRrvTime;
|
||||||
|
|
||||||
pBuf->wTxRrvTime = cpu_to_le16((unsigned short)s_uGetTxRsvTime(pDevice, PK_TYPE_11A, cbFrameSize, wCurrentRate, bNeedACK)); //0:OFDM
|
pBuf->wTxRrvTime = cpu_to_le16((unsigned short)s_uGetTxRsvTime(pDevice, PK_TYPE_11A, cbFrameSize, wCurrentRate, bNeedACK)); //0:OFDM
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -1146,6 +1151,7 @@ s_vGenerateTxParameter(
|
||||||
//Fill RsvTime
|
//Fill RsvTime
|
||||||
if (pvRrvTime) {
|
if (pvRrvTime) {
|
||||||
PSRrvTime_ab pBuf = (PSRrvTime_ab)pvRrvTime;
|
PSRrvTime_ab pBuf = (PSRrvTime_ab)pvRrvTime;
|
||||||
|
|
||||||
pBuf->wRTSTxRrvTime = cpu_to_le16((unsigned short)s_uGetRTSCTSRsvTime(pDevice, 0, byPktType, cbFrameSize, wCurrentRate));//0:RTSTxRrvTime_bb, 1:2.4GHz
|
pBuf->wRTSTxRrvTime = cpu_to_le16((unsigned short)s_uGetRTSCTSRsvTime(pDevice, 0, byPktType, cbFrameSize, wCurrentRate));//0:RTSTxRrvTime_bb, 1:2.4GHz
|
||||||
pBuf->wTxRrvTime = cpu_to_le16((unsigned short)s_uGetTxRsvTime(pDevice, PK_TYPE_11B, cbFrameSize, wCurrentRate, bNeedACK));//1:CCK
|
pBuf->wTxRrvTime = cpu_to_le16((unsigned short)s_uGetTxRsvTime(pDevice, PK_TYPE_11B, cbFrameSize, wCurrentRate, bNeedACK));//1:CCK
|
||||||
}
|
}
|
||||||
|
@ -1155,6 +1161,7 @@ s_vGenerateTxParameter(
|
||||||
//Fill RsvTime
|
//Fill RsvTime
|
||||||
if (pvRrvTime) {
|
if (pvRrvTime) {
|
||||||
PSRrvTime_ab pBuf = (PSRrvTime_ab)pvRrvTime;
|
PSRrvTime_ab pBuf = (PSRrvTime_ab)pvRrvTime;
|
||||||
|
|
||||||
pBuf->wTxRrvTime = cpu_to_le16((unsigned short)s_uGetTxRsvTime(pDevice, PK_TYPE_11B, cbFrameSize, wCurrentRate, bNeedACK)); //1:CCK
|
pBuf->wTxRrvTime = cpu_to_le16((unsigned short)s_uGetTxRsvTime(pDevice, PK_TYPE_11B, cbFrameSize, wCurrentRate, bNeedACK)); //1:CCK
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -2025,6 +2032,7 @@ vGenerateMACHeader(
|
||||||
|
|
||||||
if (pDevice->bLongHeader) {
|
if (pDevice->bLongHeader) {
|
||||||
PWLAN_80211HDR_A4 pMACA4Header = (PWLAN_80211HDR_A4) pbyBufferAddr;
|
PWLAN_80211HDR_A4 pMACA4Header = (PWLAN_80211HDR_A4) pbyBufferAddr;
|
||||||
|
|
||||||
pMACHeader->wFrameCtl |= (FC_TODS | FC_FROMDS);
|
pMACHeader->wFrameCtl |= (FC_TODS | FC_FROMDS);
|
||||||
memcpy(pMACA4Header->abyAddr4, pDevice->abyBSSID, WLAN_ADDR_LEN);
|
memcpy(pMACA4Header->abyAddr4, pDevice->abyBSSID, WLAN_ADDR_LEN);
|
||||||
}
|
}
|
||||||
|
|
|
@ -128,6 +128,7 @@ VNTWIFIpGetCurrentSSID(
|
||||||
)
|
)
|
||||||
{
|
{
|
||||||
PSMgmtObject pMgmt = (PSMgmtObject)pMgmtHandle;
|
PSMgmtObject pMgmt = (PSMgmtObject)pMgmtHandle;
|
||||||
|
|
||||||
return (PWLAN_IE_SSID) pMgmt->abyCurrSSID;
|
return (PWLAN_IE_SSID) pMgmt->abyCurrSSID;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -151,6 +152,7 @@ VNTWIFIpGetCurrentChannel(
|
||||||
)
|
)
|
||||||
{
|
{
|
||||||
PSMgmtObject pMgmt = (PSMgmtObject)pMgmtHandle;
|
PSMgmtObject pMgmt = (PSMgmtObject)pMgmtHandle;
|
||||||
|
|
||||||
if (pMgmtHandle != NULL)
|
if (pMgmtHandle != NULL)
|
||||||
return pMgmt->uCurrChannel;
|
return pMgmt->uCurrChannel;
|
||||||
|
|
||||||
|
@ -177,6 +179,7 @@ VNTWIFIwGetAssocID(
|
||||||
)
|
)
|
||||||
{
|
{
|
||||||
PSMgmtObject pMgmt = (PSMgmtObject)pMgmtHandle;
|
PSMgmtObject pMgmt = (PSMgmtObject)pMgmtHandle;
|
||||||
|
|
||||||
return pMgmt->wCurrAID;
|
return pMgmt->wCurrAID;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -990,6 +990,7 @@ BSSvSecondTxData(
|
||||||
{
|
{
|
||||||
PSDevice pDevice = (PSDevice)hDeviceContext;
|
PSDevice pDevice = (PSDevice)hDeviceContext;
|
||||||
PSMgmtObject pMgmt = &(pDevice->sMgmtObj);
|
PSMgmtObject pMgmt = &(pDevice->sMgmtObj);
|
||||||
|
|
||||||
pDevice->nTxDataTimeCout++;
|
pDevice->nTxDataTimeCout++;
|
||||||
|
|
||||||
if (pDevice->nTxDataTimeCout < 4) //don't tx data if timer less than 40s
|
if (pDevice->nTxDataTimeCout < 4) //don't tx data if timer less than 40s
|
||||||
|
|
|
@ -1649,6 +1649,7 @@ s_vMgrRxDeauthentication(
|
||||||
#ifdef WPA_SUPPLICANT_DRIVER_WEXT_SUPPORT
|
#ifdef WPA_SUPPLICANT_DRIVER_WEXT_SUPPORT
|
||||||
{
|
{
|
||||||
union iwreq_data wrqu;
|
union iwreq_data wrqu;
|
||||||
|
|
||||||
memset(&wrqu, 0, sizeof(wrqu));
|
memset(&wrqu, 0, sizeof(wrqu));
|
||||||
wrqu.ap_addr.sa_family = ARPHRD_ETHER;
|
wrqu.ap_addr.sa_family = ARPHRD_ETHER;
|
||||||
PRINT_K("wireless_send_event--->SIOCGIWAP(disauthen)\n");
|
PRINT_K("wireless_send_event--->SIOCGIWAP(disauthen)\n");
|
||||||
|
@ -2541,6 +2542,7 @@ vMgrJoinBSSBegin(
|
||||||
// This should only works for WPA2 BSS, and WPA2 BSS check must be done before.
|
// This should only works for WPA2 BSS, and WPA2 BSS check must be done before.
|
||||||
if (pMgmt->eAuthenMode == WMAC_AUTH_WPA2) {
|
if (pMgmt->eAuthenMode == WMAC_AUTH_WPA2) {
|
||||||
bool bResult = bAdd_PMKID_Candidate((void *)pDevice, pMgmt->abyCurrBSSID, &pCurr->sRSNCapObj);
|
bool bResult = bAdd_PMKID_Candidate((void *)pDevice, pMgmt->abyCurrBSSID, &pCurr->sRSNCapObj);
|
||||||
|
|
||||||
DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO "bAdd_PMKID_Candidate: 1(%d)\n", bResult);
|
DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO "bAdd_PMKID_Candidate: 1(%d)\n", bResult);
|
||||||
if (!bResult) {
|
if (!bResult) {
|
||||||
vFlush_PMKID_Candidate((void *)pDevice);
|
vFlush_PMKID_Candidate((void *)pDevice);
|
||||||
|
|
|
@ -73,6 +73,7 @@ WPA_ClearRSN(
|
||||||
)
|
)
|
||||||
{
|
{
|
||||||
int ii;
|
int ii;
|
||||||
|
|
||||||
pBSSList->byGKType = WPA_TKIP;
|
pBSSList->byGKType = WPA_TKIP;
|
||||||
for (ii = 0; ii < 4; ii++)
|
for (ii = 0; ii < 4; ii++)
|
||||||
pBSSList->abyPKType[ii] = WPA_TKIP;
|
pBSSList->abyPKType[ii] = WPA_TKIP;
|
||||||
|
|
|
@ -766,6 +766,7 @@ static int wpa_set_associate(PSDevice pDevice,
|
||||||
/*******search if ap_scan=2 ,which is associating request in hidden ssid mode ****/
|
/*******search if ap_scan=2 ,which is associating request in hidden ssid mode ****/
|
||||||
{
|
{
|
||||||
PKnownBSS pCurr = NULL;
|
PKnownBSS pCurr = NULL;
|
||||||
|
|
||||||
pCurr = BSSpSearchBSSList(pDevice,
|
pCurr = BSSpSearchBSSList(pDevice,
|
||||||
pMgmt->abyDesireBSSID,
|
pMgmt->abyDesireBSSID,
|
||||||
pMgmt->abyDesireSSID,
|
pMgmt->abyDesireSSID,
|
||||||
|
|
Загрузка…
Ссылка в новой задаче