aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/staging/otus
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/staging/otus')
-rw-r--r--drivers/staging/otus/80211core/ccmd.c4
-rw-r--r--drivers/staging/otus/80211core/cmm.c4
-rw-r--r--drivers/staging/otus/80211core/cmmsta.c4
-rw-r--r--drivers/staging/otus/80211core/ctxrx.c2
-rw-r--r--drivers/staging/otus/80211core/pub_zfi.h4
-rw-r--r--drivers/staging/otus/apdbg.c667
-rw-r--r--drivers/staging/otus/athr_common.h10
-rw-r--r--drivers/staging/otus/oal_dt.h10
-rw-r--r--drivers/staging/otus/oal_marc.h84
-rw-r--r--drivers/staging/otus/usbdrv.c35
-rw-r--r--drivers/staging/otus/usbdrv.h140
-rw-r--r--drivers/staging/otus/wrap_buf.c20
-rw-r--r--drivers/staging/otus/wrap_dbg.c61
-rw-r--r--drivers/staging/otus/wrap_ev.c350
-rw-r--r--drivers/staging/otus/wrap_mem.c90
-rw-r--r--drivers/staging/otus/wrap_mis.c61
-rw-r--r--drivers/staging/otus/wrap_pkt.c210
-rw-r--r--drivers/staging/otus/wrap_sec.c123
-rw-r--r--drivers/staging/otus/wrap_usb.c213
-rw-r--r--drivers/staging/otus/zdcompat.h2
-rw-r--r--drivers/staging/otus/zdusb.h4
21 files changed, 1022 insertions, 1076 deletions
diff --git a/drivers/staging/otus/80211core/ccmd.c b/drivers/staging/otus/80211core/ccmd.c
index 83dd8ba1328c..8da28eee7fb0 100644
--- a/drivers/staging/otus/80211core/ccmd.c
+++ b/drivers/staging/otus/80211core/ccmd.c
@@ -899,7 +899,7 @@ u16_t zfiWlanDisable(zdev_t *dev, u8_t ResetKeyCache)
zfStaDisableSWEncryption(dev);
}
- /* Improve WEP/TKIP performace with HT AP,
+ /* Improve WEP/TKIP performance with HT AP,
detail information please look bug#32495 */
/* zfHpSetTTSIFSTime(dev, 0x8); */
@@ -1407,7 +1407,7 @@ u16_t zfWlanReset(zdev_t *dev)
zfStaDisableSWEncryption(dev);
}
- /* Improve WEP/TKIP performace with HT AP,
+ /* Improve WEP/TKIP performance with HT AP,
detail information please look bug#32495
*/
/* zfHpSetTTSIFSTime(dev, 0x8); */
diff --git a/drivers/staging/otus/80211core/cmm.c b/drivers/staging/otus/80211core/cmm.c
index bed16b581a5f..a6c1b41ba848 100644
--- a/drivers/staging/otus/80211core/cmm.c
+++ b/drivers/staging/otus/80211core/cmm.c
@@ -1428,7 +1428,7 @@ void zfProcessManagement(zdev_t* dev, zbuf_t* buf, struct zsAdditionInfo* AddInf
{
/* Beacon */
case ZM_WLAN_FRAME_TYPE_BEACON :
- /* if enable 802.11h and current chanel is silent but receive beacon from other AP */
+ /* if enable 802.11h and current channel is silent but receive beacon from other AP */
if (((wd->regulationTable.allowChannel[wd->regulationTable.CurChIndex].channelFlags
& ZM_REG_FLAG_CHANNEL_CSA) != 0) && wd->sta.DFSEnable)
{
@@ -1469,7 +1469,7 @@ void zfProcessManagement(zdev_t* dev, zbuf_t* buf, struct zsAdditionInfo* AddInf
break;
/* Probe response */
case ZM_WLAN_FRAME_TYPE_PROBERSP :
- /* if enable 802.11h and current chanel is silent but receive probe response from other AP */
+ /* if enable 802.11h and current channel is silent but receive probe response from other AP */
if (((wd->regulationTable.allowChannel[wd->regulationTable.CurChIndex].channelFlags
& ZM_REG_FLAG_CHANNEL_CSA) != 0) && wd->sta.DFSEnable)
{
diff --git a/drivers/staging/otus/80211core/cmmsta.c b/drivers/staging/otus/80211core/cmmsta.c
index b28a4e25e107..a11d559167b1 100644
--- a/drivers/staging/otus/80211core/cmmsta.c
+++ b/drivers/staging/otus/80211core/cmmsta.c
@@ -216,7 +216,7 @@ void zfStaConnectFail(zdev_t* dev, u16_t reason, u16_t* bssid, u8_t weight)
/* Change internal state */
zfChangeAdapterState(dev, ZM_STA_STATE_DISCONNECT);
- /* Improve WEP/TKIP performace with HT AP, detail information please look bug#32495 */
+ /* Improve WEP/TKIP performance with HT AP, detail information please look bug#32495 */
//zfHpSetTTSIFSTime(dev, 0x8);
/* Notify wrapper of connection status changes */
@@ -4148,7 +4148,7 @@ void zfInfraConnectNetwork(zdev_t* dev)
wd->sta.bIsSharedKey = 0;
}
- /* Improve WEP/TKIP performace with HT AP, detail information please look bug#32495 */
+ /* Improve WEP/TKIP performance with HT AP, detail information please look bug#32495 */
/*
if ( (pBssInfo->broadcomHTAp == 1)
&& (wd->sta.SWEncryptEnable != 0) )
diff --git a/drivers/staging/otus/80211core/ctxrx.c b/drivers/staging/otus/80211core/ctxrx.c
index e258a7df5363..ac54d5a636b0 100644
--- a/drivers/staging/otus/80211core/ctxrx.c
+++ b/drivers/staging/otus/80211core/ctxrx.c
@@ -3093,7 +3093,7 @@ u16_t zfWlanRxFilter(zdev_t* dev, zbuf_t* buf)
frameType = zmw_rx_buf_readh(dev, buf, offset);
- // Don't divide 2^4 because we don't want the fragementation pkt to be treated as
+ // Don't divide 2^4 because we don't want the fragmentation pkt to be treated as
// duplicated frames
seq = zmw_rx_buf_readh(dev, buf, offset+22);
dst0 = zmw_rx_buf_readh(dev, buf, offset+4);
diff --git a/drivers/staging/otus/80211core/pub_zfi.h b/drivers/staging/otus/80211core/pub_zfi.h
index a35bd5d41d2c..b7b7f455f357 100644
--- a/drivers/staging/otus/80211core/pub_zfi.h
+++ b/drivers/staging/otus/80211core/pub_zfi.h
@@ -20,7 +20,7 @@
#include "../oal_dt.h"
/***** Section 1 : Tunable Parameters *****/
-/* The defintions in this section are tunabel parameters */
+/* The definitions in this section are tunabel parameters */
/* Maximum number of BSS that could be scaned */
#define ZM_MAX_BSS 128
@@ -782,7 +782,7 @@ extern void zfiWlanSetDynamicSIFSParam(zdev_t* dev, u8_t val);
/***** End of section 2 *****/
-/***** section 3 performace evaluation *****/
+/***** section 3 performance evaluation *****/
#ifdef ZM_ENABLE_PERFORMANCE_EVALUATION
extern void zfiTxPerformanceMSDU(zdev_t* dev, u32_t tick);
extern void zfiRxPerformanceMPDU(zdev_t* dev, zbuf_t* buf);
diff --git a/drivers/staging/otus/apdbg.c b/drivers/staging/otus/apdbg.c
index d3e2f6224196..0eb93f19958a 100644
--- a/drivers/staging/otus/apdbg.c
+++ b/drivers/staging/otus/apdbg.c
@@ -38,39 +38,39 @@
#include <linux/sockios.h>
-#define ZM_IOCTL_REG_READ 0x01
-#define ZM_IOCTL_REG_WRITE 0x02
-#define ZM_IOCTL_MEM_DUMP 0x03
-#define ZM_IOCTL_REG_DUMP 0x05
-#define ZM_IOCTL_TXD_DUMP 0x06
-#define ZM_IOCTL_RXD_DUMP 0x07
-#define ZM_IOCTL_MEM_READ 0x0B
-#define ZM_IOCTL_MEM_WRITE 0x0C
-#define ZM_IOCTL_DMA_TEST 0x10
-#define ZM_IOCTL_REG_TEST 0x11
-#define ZM_IOCTL_TEST 0x80
-#define ZM_IOCTL_TALLY 0x81 //CWYang(+)
-#define ZM_IOCTL_RTS 0xA0
-#define ZM_IOCTL_MIX_MODE 0xA1
-#define ZM_IOCTL_FRAG 0xA2
-#define ZM_IOCTL_SCAN 0xA3
-#define ZM_IOCTL_KEY 0xA4
-#define ZM_IOCTL_RATE 0xA5
-#define ZM_IOCTL_ENCRYPTION_MODE 0xA6
-#define ZM_IOCTL_GET_TXCNT 0xA7
-#define ZM_IOCTL_GET_DEAGG_CNT 0xA8
-#define ZM_IOCTL_DURATION_MODE 0xA9
-#define ZM_IOCTL_SET_AES_KEY 0xAA
-#define ZM_IOCTL_SET_AES_MODE 0xAB
-#define ZM_IOCTL_SIGNAL_STRENGTH 0xAC //CWYang(+)
-#define ZM_IOCTL_SIGNAL_QUALITY 0xAD //CWYang(+)
-#define ZM_IOCTL_SET_PIBSS_MODE 0xAE
-#define ZDAPIOCTL SIOCDEVPRIVATE
+#define ZM_IOCTL_REG_READ 0x01
+#define ZM_IOCTL_REG_WRITE 0x02
+#define ZM_IOCTL_MEM_DUMP 0x03
+#define ZM_IOCTL_REG_DUMP 0x05
+#define ZM_IOCTL_TXD_DUMP 0x06
+#define ZM_IOCTL_RXD_DUMP 0x07
+#define ZM_IOCTL_MEM_READ 0x0B
+#define ZM_IOCTL_MEM_WRITE 0x0C
+#define ZM_IOCTL_DMA_TEST 0x10
+#define ZM_IOCTL_REG_TEST 0x11
+#define ZM_IOCTL_TEST 0x80
+#define ZM_IOCTL_TALLY 0x81 /* CWYang(+) */
+#define ZM_IOCTL_RTS 0xA0
+#define ZM_IOCTL_MIX_MODE 0xA1
+#define ZM_IOCTL_FRAG 0xA2
+#define ZM_IOCTL_SCAN 0xA3
+#define ZM_IOCTL_KEY 0xA4
+#define ZM_IOCTL_RATE 0xA5
+#define ZM_IOCTL_ENCRYPTION_MODE 0xA6
+#define ZM_IOCTL_GET_TXCNT 0xA7
+#define ZM_IOCTL_GET_DEAGG_CNT 0xA8
+#define ZM_IOCTL_DURATION_MODE 0xA9
+#define ZM_IOCTL_SET_AES_KEY 0xAA
+#define ZM_IOCTL_SET_AES_MODE 0xAB
+#define ZM_IOCTL_SIGNAL_STRENGTH 0xAC /* CWYang(+) */
+#define ZM_IOCTL_SIGNAL_QUALITY 0xAD /* CWYang(+) */
+#define ZM_IOCTL_SET_PIBSS_MODE 0xAE
+#define ZDAPIOCTL SIOCDEVPRIVATE
struct zdap_ioctl {
- unsigned short cmd; /* Command to run */
- unsigned int addr; /* Length of the data buffer */
- unsigned int value; /* Pointer to the data buffer */
+ unsigned short cmd; /* Command to run */
+ unsigned int addr; /* Length of the data buffer */
+ unsigned int value; /* Pointer to the data buffer */
unsigned char data[0x100];
};
@@ -79,13 +79,13 @@ struct zdap_ioctl {
#if 0
#define SKIP_ELEM { \
- while(isxdigit(*p)) \
- p++; \
+ while (isxdigit(*p)) \
+ p++; \
}
#define SKIP_DELIMETER { \
- if(*p == ':' || *p == ' ') \
- p++; \
+ if (*p == ':' || *p == ' ') \
+ p++; \
}
#endif
@@ -97,361 +97,308 @@ char *prgname;
int set_ioctl(int sock, struct ifreq *req)
{
- if (ioctl(sock, ZDAPIOCTL, req) < 0) {
- fprintf(stderr, "%s: ioctl(SIOCGIFMAP): %s\n",
- prgname, strerror(errno));
- return -1;
- }
+ if (ioctl(sock, ZDAPIOCTL, req) < 0) {
+ fprintf(stderr, "%s: ioctl(SIOCGIFMAP): %s\n",
+ prgname, strerror(errno));
+ return -1;
+ }
- return 0;
+ return 0;
}
int read_reg(int sock, struct ifreq *req)
{
- struct zdap_ioctl *zdreq = 0;
+ struct zdap_ioctl *zdreq = 0;
- if (!set_ioctl(sock, req))
- return -1;
+ if (!set_ioctl(sock, req))
+ return -1;
- //zdreq = (struct zdap_ioctl *)req->ifr_data;
- //printf( "reg = %4x, value = %4x\n", zdreq->addr, zdreq->value);
+ /*
+ * zdreq = (struct zdap_ioctl *)req->ifr_data;
+ * printf( "reg = %4x, value = %4x\n", zdreq->addr, zdreq->value);
+ */
- return 0;
+ return 0;
}
int read_mem(int sock, struct ifreq *req)
{
- struct zdap_ioctl *zdreq = 0;
- int i;
-
- if (!set_ioctl(sock, req))
- return -1;
-
- /*zdreq = (struct zdap_ioctl *)req->ifr_data;
- printf( "dump mem from %x, length = %x\n", zdreq->addr, zdreq->value);
-
- for (i=0; i<zdreq->value; i++) {
- printf("%02x", zdreq->data[i]);
- printf(" ");
-
- if ((i>0) && ((i+1)%16 == 0))
- printf("\n");
- }*/
-
- return 0;
+ struct zdap_ioctl *zdreq = 0;
+ int i;
+
+ if (!set_ioctl(sock, req))
+ return -1;
+
+ /*
+ * zdreq = (struct zdap_ioctl *)req->ifr_data;
+ * printf("dump mem from %x, length = %x\n", zdreq->addr, zdreq->value);
+ *
+ * for (i=0; i<zdreq->value; i++) {
+ * printf("%02x", zdreq->data[i]);
+ * printf(" ");
+ *
+ * if ((i>0) && ((i+1)%16 == 0))
+ * printf("\n");
+ * }
+ */
+
+ return 0;
}
int main(int argc, char **argv)
{
- int sock;
- int addr, value;
- struct ifreq req;
- char *action = NULL;
- struct zdap_ioctl zdreq;
-
- prgname = argv[0];
-
- if (argc < 3) {
- fprintf(stderr,"%s: usage is \"%s <ifname> <operation> [<address>] [<value>]\"\n",
- prgname, prgname);
- fprintf(stderr,"valid operation: read, write, mem, reg,\n");
- fprintf(stderr," : txd, rxd, rmem, wmem\n");
- fprintf(stderr," : dmat, regt, test\n");
-
- fprintf(stderr," scan, Channel Scan\n");
- fprintf(stderr," rts <decimal>, Set RTS Threshold\n");
- fprintf(stderr," frag <decimal>, Set Fragment Threshold\n");
- fprintf(stderr," rate <0-28>, 0:AUTO, 1-4:CCK, 5-12:OFDM, 13-28:HT\n");
- fprintf(stderr," TBD mix <0 or 1>, Set 1 to enable mixed mode\n");
- fprintf(stderr," enc, <0-3>, 0=>OPEN, 1=>WEP64, 2=>WEP128, 3=>WEP256\n");
- fprintf(stderr," skey <key>, Set WEP key\n");
- fprintf(stderr," txcnt, Get TxQ Cnt\n");
- fprintf(stderr," dagcnt, Get Deaggregate Cnt\n");
- fprintf(stderr," durmode <mode>, Set Duration Mode 0=>HW, 1=>SW\n");
- fprintf(stderr," aeskey <user> <key>\n");
- fprintf(stderr," aesmode <mode>\n");
- fprintf(stderr," wlanmode <0,1> 0:Station mode, 1:PIBSS mode\n");
- fprintf(stderr," tal <0,1>, Get Current Tally Info, 0=>read, 1=>read and reset\n");
-
- exit(1);
- }
-
- strcpy(req.ifr_name, argv[1]);
- zdreq.addr = 0;
- zdreq.value = 0;
-
- /* a silly raw socket just for ioctl()ling it */
- sock = socket(AF_INET, SOCK_RAW, IPPROTO_RAW);
- if (sock < 0) {
- fprintf(stderr, "%s: socket(): %s\n", argv[0], strerror(errno));
- exit(1);
- }
-
- if (argc >= 4)
- {
- sscanf(argv[3], "%x", &addr);
- }
-
- if (argc >= 5)
- {
- sscanf(argv[4], "%x", &value);
- }
-
- zdreq.addr = addr;
- zdreq.value = value;
-
- if (!strcmp(argv[2], "read"))
- {
- zdreq.cmd = ZM_IOCTL_REG_READ;
- }
- else if (!strcmp(argv[2], "mem"))
- {
- zdreq.cmd = ZM_IOCTL_MEM_DUMP;
- }
- else if (!strcmp(argv[2], "write"))
- {
- zdreq.cmd = ZM_IOCTL_REG_WRITE;
- }
- else if (!strcmp(argv[2], "reg"))
- {
- zdreq.cmd = ZM_IOCTL_REG_DUMP;
- }
- else if (!strcmp(argv[2], "txd"))
- {
- zdreq.cmd = ZM_IOCTL_TXD_DUMP;
- }
- else if (!strcmp(argv[2], "rxd"))
- {
- zdreq.cmd = ZM_IOCTL_RXD_DUMP;
- }
- else if (!strcmp(argv[2], "rmem"))
- {
- zdreq.cmd = ZM_IOCTL_MEM_READ;
- }
- else if (!strcmp(argv[2], "wmem"))
- {
- zdreq.cmd = ZM_IOCTL_MEM_WRITE;
- }
- else if (!strcmp(argv[2], "dmat"))
- {
- zdreq.cmd = ZM_IOCTL_DMA_TEST;
- }
- else if (!strcmp(argv[2], "regt"))
- {
- zdreq.cmd = ZM_IOCTL_REG_TEST;
- }
- else if (!strcmp(argv[2], "test"))
- {
- zdreq.cmd = ZM_IOCTL_TEST;
- }
- else if (!strcmp(argv[2], "tal"))
- {
- sscanf(argv[3], "%d", &addr);
- zdreq.addr = addr;
- zdreq.cmd = ZM_IOCTL_TALLY;
- }
- else if (!strcmp(argv[2], "rts"))
- {
- sscanf(argv[3], "%d", &addr);
- zdreq.addr = addr;
- zdreq.cmd = ZM_IOCTL_RTS;
- }
- else if (!strcmp(argv[2], "mix"))
- {
- zdreq.cmd = ZM_IOCTL_MIX_MODE;
- }
- else if (!strcmp(argv[2], "frag"))
- {
- sscanf(argv[3], "%d", &addr);
- zdreq.addr = addr;
- zdreq.cmd = ZM_IOCTL_FRAG;
- }
- else if (!strcmp(argv[2], "scan"))
- {
- zdreq.cmd = ZM_IOCTL_SCAN;
- }
- else if (!strcmp(argv[2], "skey"))
- {
- zdreq.cmd = ZM_IOCTL_KEY;
-
- if (argc >= 4)
- {
- unsigned char temp[29];
- int i;
- int keyLen;
- int encType;
-
- keyLen = strlen(argv[3]);
-
- if (keyLen == 10)
- {
- sscanf(argv[3], "%02x%02x%02x%02x%02x", &temp[0], &temp[1],
- &temp[2], &temp[3], &temp[4]);
- }
- else if (keyLen == 26)
- {
- sscanf(argv[3], "%02x%02x%02x%02x%02x%02x%02x%02x%02x%02x%02x%02x%02x",
- &temp[0], &temp[1], &temp[2], &temp[3], &temp[4],
- &temp[5], &temp[6], &temp[7], &temp[8], &temp[9],
- &temp[10], &temp[11], &temp[12]);
- }
- else if (keyLen == 58)
- {
- sscanf(argv[3], "%02x%02x%02x%02x%02x%02x%02x%02x%02x%02x%02x%02x%02x%02x%02x%02x%02x%02x%02x%02x%02x%02x%02x%02x%02x%02x%02x%02x%02x",
- &temp[0], &temp[1], &temp[2], &temp[3], &temp[4],
- &temp[5], &temp[6], &temp[7], &temp[8], &temp[9],
- &temp[10], &temp[11], &temp[12], &temp[13], &temp[14],
- &temp[15], &temp[16], &temp[17], &temp[18], &temp[19],
- &temp[20], &temp[21], &temp[22], &temp[23], &temp[24],
- &temp[25], &temp[26], &temp[27], &temp[28]);
- }
- else
- {
- fprintf(stderr, "Invalid key length\n");
- exit(1);
- }
- zdreq.addr = keyLen/2;
-
- for(i=0; i<zdreq.addr; i++)
- {
- zdreq.data[i] = temp[i];
- }
- }
- else
- {
- printf("Error : Key required!\n");
- }
- }
- else if (!strcmp(argv[2], "rate"))
- {
- sscanf(argv[3], "%d", &addr);
-
- if (addr > 28)
- {
- fprintf(stderr, "Invalid rate, range:0~28\n");
- exit(1);
- }
- zdreq.addr = addr;
- zdreq.cmd = ZM_IOCTL_RATE;
- }
- else if (!strcmp(argv[2], "enc"))
- {
- sscanf(argv[3], "%d", &addr);
-
- if (addr > 3)
- {
- fprintf(stderr, "Invalid encryption mode, range:0~3\n");
- exit(1);
- }
-
- if (addr == 2)
- {
- addr = 5;
- }
- else if (addr == 3)
- {
- addr = 6;
- }
-
- zdreq.addr = addr;
- zdreq.cmd = ZM_IOCTL_ENCRYPTION_MODE;
- }
- else if (!strcmp(argv[2], "txcnt"))
- {
- zdreq.cmd = ZM_IOCTL_GET_TXCNT;
- }
- else if (!strcmp(argv[2], "dagcnt"))
- {
- sscanf(argv[3], "%d", &addr);
-
- if (addr != 0 && addr != 1)
- {
- fprintf(stderr, "The value should be 0 or 1\n");
- exit(0);
- }
-
- zdreq.addr = addr;
- zdreq.cmd = ZM_IOCTL_GET_DEAGG_CNT;
- }
- else if (!strcmp(argv[2], "durmode"))
- {
- sscanf(argv[3], "%d", &addr);
-
- if (addr != 0 && addr != 1)
- {
- fprintf(stderr, "The Duration mode should be 0 or 1\n");
- exit(0);
- }
-
- zdreq.addr = addr;
- zdreq.cmd = ZM_IOCTL_DURATION_MODE;
- }
- else if (!strcmp(argv[2], "aeskey"))
- {
- unsigned char temp[16];
- int i;
-
- sscanf(argv[3], "%d", &addr);
-
- sscanf(argv[4], "%02x%02x%02x%02x%02x%02x%02x%02x%02x%02x%02x%02x%02x%02x%02x%02x", &temp[0], &temp[1], &temp[2], &temp[3], &temp[4], &temp[5], &temp[6], &temp[7], &temp[8], &temp[9], &temp[10], &temp[11], &temp[12], &temp[13], &temp[14], &temp[15]);
-
- for(i = 0; i < 16; i++)
- {
- zdreq.data[i] = temp[i];
- }
-
- zdreq.addr = addr;
- zdreq.cmd = ZM_IOCTL_SET_AES_KEY;
- }
- else if (!strcmp(argv[2], "aesmode"))
- {
- sscanf(argv[3], "%d", &addr);
-
- zdreq.addr = addr;
- zdreq.cmd = ZM_IOCTL_SET_AES_MODE;
- }
- else if (!strcmp(argv[2], "wlanmode"))
- {
- sscanf(argv[3], "%d", &addr);
-
- zdreq.addr = addr;
- zdreq.cmd = ZM_IOCTL_SET_PIBSS_MODE;
- }
- else
- {
- fprintf(stderr, "error action\n");
- exit(1);
- }
-
- req.ifr_data = (char *)&zdreq;
- set_ioctl(sock, &req);
+ int sock;
+ int addr, value;
+ struct ifreq req;
+ char *action = NULL;
+ struct zdap_ioctl zdreq;
+
+ prgname = argv[0];
+
+ if (argc < 3) {
+ fprintf(stderr, "%s: usage is \"%s <ifname> <operation>"
+ "[<address>] [<value>]\"\n", prgname, prgname);
+ fprintf(stderr, "valid operation : read, write, mem, reg, \n");
+ fprintf(stderr, " : txd, rxd, rmem, wmem\n");
+ fprintf(stderr, " : dmat, regt, test\n");
+
+ fprintf(stderr, " scan, Channel Scan\n");
+ fprintf(stderr, " rts <decimal>, Set RTS Threshold\n");
+ fprintf(stderr, " frag <decimal>, Set Fragment"
+ " Threshold\n");
+ fprintf(stderr, " rate <0-28>, 0:AUTO, 1-4:CCK,"
+ " 5-12:OFDM, 13-28:HT\n");
+ fprintf(stderr, " TBD mix <0 or 1>, Set 1 to enable"
+ " mixed mode\n");
+ fprintf(stderr, " enc, <0-3>, 0=>OPEN, 1=>WEP64, "
+ "2=>WEP128, 3=>WEP256\n");
+ fprintf(stderr, " skey <key>, Set WEP key\n");
+ fprintf(stderr, " txcnt, Get TxQ Cnt\n");
+ fprintf(stderr, " dagcnt, Get Deaggregate Cnt\n");
+ fprintf(stderr, " durmode <mode>, Set Duration Mode "
+ "0=>HW, 1=>SW\n");
+ fprintf(stderr, " aeskey <user> <key>\n");
+ fprintf(stderr, " aesmode <mode>\n");
+ fprintf(stderr, " wlanmode <0,1> 0:Station mode, "
+ "1:PIBSS mode\n");
+ fprintf(stderr, " tal <0,1>, Get Current Tally Info, "
+ "0=>read, 1=>read and reset\n");
+
+ exit(1);
+ }
+
+ strcpy(req.ifr_name, argv[1]);
+ zdreq.addr = 0;
+ zdreq.value = 0;
+
+ /* a silly raw socket just for ioctl()ling it */
+ sock = socket(AF_INET, SOCK_RAW, IPPROTO_RAW);
+ if (sock < 0) {
+ fprintf(stderr, "%s: socket(): %s\n", argv[0], strerror(errno));
+ exit(1);
+ }
+
+ if (argc >= 4)
+ sscanf(argv[3], "%x", &addr);
+
+ if (argc >= 5)
+ sscanf(argv[4], "%x", &value);
+
+ zdreq.addr = addr;
+ zdreq.value = value;
+
+ if (!strcmp(argv[2], "read"))
+ zdreq.cmd = ZM_IOCTL_REG_READ;
+ else if (!strcmp(argv[2], "mem"))
+ zdreq.cmd = ZM_IOCTL_MEM_DUMP;
+ else if (!strcmp(argv[2], "write"))
+ zdreq.cmd = ZM_IOCTL_REG_WRITE;
+ else if (!strcmp(argv[2], "reg"))
+ zdreq.cmd = ZM_IOCTL_REG_DUMP;
+ else if (!strcmp(argv[2], "txd"))
+ zdreq.cmd = ZM_IOCTL_TXD_DUMP;
+ else if (!strcmp(argv[2], "rxd"))
+ zdreq.cmd = ZM_IOCTL_RXD_DUMP;
+ else if (!strcmp(argv[2], "rmem"))
+ zdreq.cmd = ZM_IOCTL_MEM_READ;
+ else if (!strcmp(argv[2], "wmem"))
+ zdreq.cmd = ZM_IOCTL_MEM_WRITE;
+ else if (!strcmp(argv[2], "dmat"))
+ zdreq.cmd = ZM_IOCTL_DMA_TEST;
+ else if (!strcmp(argv[2], "regt"))
+ zdreq.cmd = ZM_IOCTL_REG_TEST;
+ else if (!strcmp(argv[2], "test"))
+ zdreq.cmd = ZM_IOCTL_TEST;
+ else if (!strcmp(argv[2], "tal")) {
+ sscanf(argv[3], "%d", &addr);
+ zdreq.addr = addr;
+ zdreq.cmd = ZM_IOCTL_TALLY;
+ } else if (!strcmp(argv[2], "rts")) {
+ sscanf(argv[3], "%d", &addr);
+ zdreq.addr = addr;
+ zdreq.cmd = ZM_IOCTL_RTS;
+ } else if (!strcmp(argv[2], "mix")) {
+ zdreq.cmd = ZM_IOCTL_MIX_MODE;
+ } else if (!strcmp(argv[2], "frag")) {
+ sscanf(argv[3], "%d", &addr);
+ zdreq.addr = addr;
+ zdreq.cmd = ZM_IOCTL_FRAG;
+ } else if (!strcmp(argv[2], "scan")) {
+ zdreq.cmd = ZM_IOCTL_SCAN;
+ } else if (!strcmp(argv[2], "skey")) {
+ zdreq.cmd = ZM_IOCTL_KEY;
+
+ if (argc >= 4) {
+ unsigned char temp[29];
+ int i;
+ int keyLen;
+ int encType;
+
+ keyLen = strlen(argv[3]);
+
+ if (keyLen == 10)
+ sscanf(argv[3], "%02x%02x%02x%02x%02x",
+ &temp[0], &temp[1], &temp[2], &temp[3],
+ &temp[4]);
+ else if (keyLen == 26)
+ sscanf(argv[3], "%02x%02x%02x%02x%02x%02x"
+ "%02x%02x%02x%02x%02x%02x%02x",
+ &temp[0], &temp[1], &temp[2], &temp[3],
+ &temp[4], &temp[5], &temp[6], &temp[7],
+ &temp[8], &temp[9], &temp[10],
+ &temp[11], &temp[12]);
+ else if (keyLen == 58)
+ sscanf(argv[3], "%02x%02x%02x%02x%02x%02x"
+ "%02x%02x%02x%02x%02x%02x%02x%02x%02x"
+ "%02x%02x%02x%02x%02x%02x%02x%02x%02x"
+ "%02x%02x%02x%02x%02x",
+ &temp[0], &temp[1], &temp[2], &temp[3],
+ &temp[4], &temp[5], &temp[6], &temp[7],
+ &temp[8], &temp[9], &temp[10],
+ &temp[11], &temp[12], &temp[13],
+ &temp[14], &temp[15], &temp[16],
+ &temp[17], &temp[18], &temp[19],
+ &temp[20], &temp[21], &temp[22],
+ &temp[23], &temp[24], &temp[25],
+ &temp[26], &temp[27], &temp[28]);
+ else {
+ fprintf(stderr, "Invalid key length\n");
+ exit(1);
+ }
+ zdreq.addr = keyLen/2;
+
+ for (i = 0; i < zdreq.addr; i++)
+ zdreq.data[i] = temp[i];
+ } else {
+ printf("Error : Key required!\n");
+ }
+ } else if (!strcmp(argv[2], "rate")) {
+ sscanf(argv[3], "%d", &addr);
+
+ if (addr > 28) {
+ fprintf(stderr, "Invalid rate, range:0~28\n");
+ exit(1);
+ }
+ zdreq.addr = addr;
+ zdreq.cmd = ZM_IOCTL_RATE;
+ } else if (!strcmp(argv[2], "enc")) {
+ sscanf(argv[3], "%d", &addr);
+
+ if (addr > 3) {
+ fprintf(stderr, "Invalid encryption mode, range:0~3\n");
+ exit(1);
+ }
+
+ if (addr == 2)
+ addr = 5;
+ else if (addr == 3)
+ addr = 6;
+
+ zdreq.addr = addr;
+ zdreq.cmd = ZM_IOCTL_ENCRYPTION_MODE;
+ } else if (!strcmp(argv[2], "txcnt")) {
+ zdreq.cmd = ZM_IOCTL_GET_TXCNT;
+ } else if (!strcmp(argv[2], "dagcnt")) {
+ sscanf(argv[3], "%d", &addr);
+
+ if (addr != 0 && addr != 1) {
+ fprintf(stderr, "The value should be 0 or 1\n");
+ exit(0);
+ }
+
+ zdreq.addr = addr;
+ zdreq.cmd = ZM_IOCTL_GET_DEAGG_CNT;
+ } else if (!strcmp(argv[2], "durmode")) {
+ sscanf(argv[3], "%d", &addr);
+
+ if (addr != 0 && addr != 1) {
+ fprintf(stderr, "The Duration mode should be 0 or 1\n");
+ exit(0);
+ }
+
+ zdreq.addr = addr;
+ zdreq.cmd = ZM_IOCTL_DURATION_MODE;
+ } else if (!strcmp(argv[2], "aeskey")) {
+ unsigned char temp[16];
+ int i;
+
+ sscanf(argv[3], "%d", &addr);
+
+ sscanf(argv[4], "%02x%02x%02x%02x%02x%02x%02x%02x%02x%02x"
+ "%02x%02x%02x%02x%02x%02x", &temp[0], &temp[1],
+ &temp[2], &temp[3], &temp[4], &temp[5], &temp[6],
+ &temp[7], &temp[8], &temp[9], &temp[10], &temp[11],
+ &temp[12], &temp[13], &temp[14], &temp[15]);
+
+ for (i = 0; i < 16; i++)
+ zdreq.data[i] = temp[i];
+
+ zdreq.addr = addr;
+ zdreq.cmd = ZM_IOCTL_SET_AES_KEY;
+ } else if (!strcmp(argv[2], "aesmode")) {
+ sscanf(argv[3], "%d", &addr);
+
+ zdreq.addr = addr;
+ zdreq.cmd = ZM_IOCTL_SET_AES_MODE;
+ } else if (!strcmp(argv[2], "wlanmode")) {
+ sscanf(argv[3], "%d", &addr);
+
+ zdreq.addr = addr;
+ zdreq.cmd = ZM_IOCTL_SET_PIBSS_MODE;
+ } else {
+ fprintf(stderr, "error action\n");
+ exit(1);
+ }
+
+ req.ifr_data = (char *)&zdreq;
+ set_ioctl(sock, &req);
fail:
- exit(0);
+ exit(0);
}
unsigned char asctohex(char *str)
{
- unsigned char value;
+ unsigned char value;
- value = hex(*str) & 0x0f;
- value = value << 4;
- str++;
- value |= hex(*str) & 0x0f;
+ value = hex(*str) & 0x0f;
+ value = value << 4;
+ str++;
+ value |= hex(*str) & 0x0f;
- return value;
+ return value;
}
char hex(char v)
{
- if(isdigit(v))
- return v - '0';
- else if(isxdigit(v))
- return (tolower(v) - 'a' + 10);
- else
- return 0;
+ if (isdigit(v))
+ return v - '0';
+ else if (isxdigit(v))
+ return tolower(v) - 'a' + 10;
+ else
+ return 0;
}
diff --git a/drivers/staging/otus/athr_common.h b/drivers/staging/otus/athr_common.h
index 620f78a41d5f..3e32f5b4ac68 100644
--- a/drivers/staging/otus/athr_common.h
+++ b/drivers/staging/otus/athr_common.h
@@ -68,7 +68,7 @@
#define ZM_WAPI_KEY_SIZE 32
#define ZM_WAPI_IV_LEN 16
-#endif //ZM_ENALBE_WAPI
+#endif /* ZM_ENALBE_WAPI */
/* structure definition */
struct athr_wlan_param {
@@ -123,7 +123,7 @@ struct athr_wapi_param {
u8 key[ZM_WAPI_KEY_SIZE];
} crypt;
struct {
- u8 wapi_policy;
+ u8 wapi_policy;
} info;
} u;
};
@@ -132,10 +132,10 @@ struct athr_wapi_sta_info
{
u16 msg_type;
u16 datalen;
- u8 sta_mac[ETH_ALEN];
+ u8 sta_mac[ETH_ALEN];
u8 reserve_data[2];
- u8 gsn[ZM_WAPI_IV_LEN];
+ u8 gsn[ZM_WAPI_IV_LEN];
u8 wie[256];
};
-#endif //ZM_ENALBE_WAPI
+#endif /* ZM_ENALBE_WAPI */
#endif
diff --git a/drivers/staging/otus/oal_dt.h b/drivers/staging/otus/oal_dt.h
index e82b9770fca1..fb6d11a99cc5 100644
--- a/drivers/staging/otus/oal_dt.h
+++ b/drivers/staging/otus/oal_dt.h
@@ -39,15 +39,15 @@ typedef long s32_t;
typedef short s16_t;
typedef char s8_t;
-#ifndef TRUE
-#define TRUE (1==1)
+#ifndef TRUE
+#define TRUE (1 == 1)
#endif
-#ifndef FALSE
-#define FALSE (1==0)
+#ifndef FALSE
+#define FALSE (1 == 0)
#endif
-#ifndef NULL
+#ifndef NULL
#define NULL 0
#endif
diff --git a/drivers/staging/otus/oal_marc.h b/drivers/staging/otus/oal_marc.h
index 206111616a03..e7a9081b1a7c 100644
--- a/drivers/staging/otus/oal_marc.h
+++ b/drivers/staging/otus/oal_marc.h
@@ -34,17 +34,19 @@
/***** Critical section *****/
/* Declare for critical section */
#ifndef ZM_HALPLUS_LOCK
-#define zmw_get_wlan_dev(dev) struct zsWlanDev *wd = (struct zsWlanDev*) ((((struct usbdrv_private*)dev->priv)->wd))
+#define zmw_get_wlan_dev(dev) struct zsWlanDev *wd = (struct zsWlanDev *) \
+ ((((struct usbdrv_private *)dev->priv)->wd))
#define zmw_declare_for_critical_section() unsigned long irqFlag;
/* Enter critical section */
-#define zmw_enter_critical_section(dev) \
- spin_lock_irqsave(&(((struct usbdrv_private *)(dev->priv))->cs_lock), irqFlag);
+#define zmw_enter_critical_section(dev) spin_lock_irqsave( \
+ &(((struct usbdrv_private *)(dev->priv))->cs_lock), irqFlag);
/* leave critical section */
#define zmw_leave_critical_section(dev) \
- spin_unlock_irqrestore(&(((struct usbdrv_private *)(dev->priv))->cs_lock), irqFlag);
+ spin_unlock_irqrestore(&(((struct usbdrv_private *) \
+ (dev->priv))->cs_lock), irqFlag);
#else
#define zmw_get_wlan_dev(dev) struct zsWlanDev *wd = zfwGetWlanDev(dev);
@@ -52,31 +54,29 @@
#define zmw_declare_for_critical_section()
/* Enter critical section */
-#define zmw_enter_critical_section(dev) \
- zfwEnterCriticalSection(dev);
+#define zmw_enter_critical_section(dev) zfwEnterCriticalSection(dev);
/* leave critical section */
-#define zmw_leave_critical_section(dev) \
- zfwLeaveCriticalSection(dev);
+#define zmw_leave_critical_section(dev) zfwLeaveCriticalSection(dev);
#endif
/***** Byte order converting *****/
#ifdef ZM_CONFIG_BIG_ENDIAN
-#define zmw_cpu_to_le32(v) (((v & 0xff000000) >> 24) | \
- ((v & 0x00ff0000) >> 8) | \
- ((v & 0x0000ff00) << 8) | \
- ((v & 0x000000ff) << 24))
+#define zmw_cpu_to_le32(v) (((v & 0xff000000) >> 24) | \
+ ((v & 0x00ff0000) >> 8) | \
+ ((v & 0x0000ff00) << 8) | \
+ ((v & 0x000000ff) << 24))
-#define zmw_le32_to_cpu(v) (((v & 0xff000000) >> 24) | \
- ((v & 0x00ff0000) >> 8) | \
- ((v & 0x0000ff00) << 8) | \
- ((v & 0x000000ff) << 24))
+#define zmw_le32_to_cpu(v) (((v & 0xff000000) >> 24) | \
+ ((v & 0x00ff0000) >> 8) | \
+ ((v & 0x0000ff00) << 8) | \
+ ((v & 0x000000ff) << 24))
#define zmw_cpu_to_le16(v) (((v & 0xff00) >> 8) | \
- ((v & 0x00ff) << 8))
+ ((v & 0x00ff) << 8))
#define zmw_le16_to_cpu(v) (((v & 0xff00) >> 8) | \
- ((v & 0x00ff) << 8))
+ ((v & 0x00ff) << 8))
#else
#define zmw_cpu_to_le32(v) (v)
#define zmw_le32_to_cpu(v) (v)
@@ -88,33 +88,41 @@
/* Called to read/write buffer */
#ifndef ZM_HALPLUS_LOCK
-#define zmw_buf_readb(dev, buf, offset) *(u8_t*)((u8_t*)buf->data+offset)
-#define zmw_buf_readh(dev, buf, offset) zmw_cpu_to_le16(*(u16_t*)((u8_t*)buf->data+offset))
-#define zmw_buf_writeb(dev, buf, offset, value) *(u8_t*)((u8_t*)buf->data+offset) = value
-#define zmw_buf_writeh(dev, buf, offset, value) *(u16_t*)((u8_t*)buf->data+offset) = zmw_cpu_to_le16(value)
-#define zmw_buf_get_buffer(dev, buf) (u8_t*)(buf->data)
+#define zmw_buf_readb(dev, buf, offset) (*(u8_t *)((u8_t *)buf->data+offset))
+#define zmw_buf_readh(dev, buf, offset) zmw_cpu_to_le16(*(u16_t *) \
+ ((u8_t *)buf->data+offset))
+#define zmw_buf_writeb(dev, buf, offset, value) (*(u8_t *) \
+ ((u8_t *)buf->data+offset) = value)
+#define zmw_buf_writeh(dev, buf, offset, value) (*(u16_t *) \
+ ((u8_t *)buf->data+offset) = zmw_cpu_to_le16(value))
+#define zmw_buf_get_buffer(dev, buf) (u8_t *)(buf->data)
#else
#define zmw_buf_readb(dev, buf, offset) zfwBufReadByte(dev, buf, offset)
#define zmw_buf_readh(dev, buf, offset) zfwBufReadHalfWord(dev, buf, offset)
-#define zmw_buf_writeb(dev, buf, offset, value) zfwBufWriteByte(dev, buf, offset, value)
-#define zmw_buf_writeh(dev, buf, offset, value) zfwBufWriteHalfWord(dev, buf, offset, value)
+#define zmw_buf_writeb(dev, buf, offset, value) \
+ zfwBufWriteByte(dev, buf, offset, value)
+#define zmw_buf_writeh(dev, buf, offset, value) \
+ zfwBufWriteHalfWord(dev, buf, offset, value)
#define zmw_buf_get_buffer(dev, buf) zfwGetBuffer(dev, buf)
#endif
/***** Debug message *****/
#if 0
-#define zm_debug_msg0(msg) printk("%s:%s\n", __func__, msg);
-#define zm_debug_msg1(msg, val) printk("%s:%s%ld\n", __func__, \
- msg, (u32_t)val);
-#define zm_debug_msg2(msg, val) printk("%s:%s%lxh\n", __func__, \
- msg, (u32_t)val);
-#define zm_debug_msg_s(msg, val) printk("%s:%s%s\n", __func__, \
- msg, val);
-#define zm_debug_msg_p(msg, val1, val2) printk("%s:%s%01ld.%02ld\n", __func__, \
- msg, (val1/val2), (((val1*100)/val2)%100));
+#define zm_debug_msg0(msg) printk(KERN_DEBUG "%s:%s\n", __func__, msg);
+#define zm_debug_msg1(msg, val) printk(KERN_DEBUG "%s:%s%ld\n", __func__, \
+ msg, (u32_t)val);
+#define zm_debug_msg2(msg, val) printk(KERN_DEBUG "%s:%s%lxh\n", __func__, \
+ msg, (u32_t)val);
+#define zm_debug_msg_s(msg, val) printk(KERN_DEBUG "%s:%s%s\n", __func__, \
+ msg, val);
+#define zm_debug_msg_p(msg, val1, val2) do { \
+ printk(KERN_DEBUG "%s:%s%01ld.%02ld\n", \
+ __func__, \
+ msg, (val1/val2), (((val1*100)/val2)%100));
+ } while (0)
#define zm_dbg(S) printk S
#else
#define zm_debug_msg0(msg)
@@ -125,10 +133,10 @@
#define zm_dbg(S)
#endif
-#define zm_assert(expr) if(!(expr)) { \
- printk( "Atheors Assertion failed! %s,%s,%s,line=%d\n", \
- #expr,__FILE__,__func__,__LINE__); \
- }
+#define zm_assert(expr) if (!(expr)) { \
+ printk(KERN_ERR "Atheors Assertion failed! %s, %s, %s,line=%d\n",\
+ #expr, __FILE__, __func__, __LINE__); \
+ }
#define DbgPrint printk
diff --git a/drivers/staging/otus/usbdrv.c b/drivers/staging/otus/usbdrv.c
index 48aa30a62164..b0adbc8b2dc2 100644
--- a/drivers/staging/otus/usbdrv.c
+++ b/drivers/staging/otus/usbdrv.c
@@ -111,7 +111,7 @@ extern u8_t zfLnxCreateThread(zdev_t *dev);
/* Definition of Wireless Extension */
-//wireless extension helper functions
+/* wireless extension helper functions */
extern int usbdrv_ioctl_setessid(struct net_device *dev, struct iw_point *erq);
extern int usbdrv_ioctl_setrts(struct net_device *dev, struct iw_param *rrq);
/* Wireless Extension Handler functions */
@@ -282,8 +282,8 @@ static struct iw_handler_def p80211wext_handler_def = {
};
/* WDS */
-//struct zsWdsStruct wds[ZM_WDS_PORT_NUMBER];
-//void zfInitWdsStruct(void);
+/* struct zsWdsStruct wds[ZM_WDS_PORT_NUMBER]; */
+/* void zfInitWdsStruct(void); */
/* VAP */
struct zsVapStruct vap[ZM_VAP_PORT_NUMBER];
@@ -314,13 +314,11 @@ irqreturn_t usbdrv_intr(int irq, void *dev_inst, struct pt_regs *regs)
return IRQ_NONE;
/* the device is closed, don't continue or else bad things may happen. */
- if (!netif_running(dev)) {
+ if (!netif_running(dev))
return IRQ_NONE;
- }
- if (macp->driver_isolated) {
+ if (macp->driver_isolated)
return IRQ_NONE;
- }
#if (WLAN_HOSTIF == WLAN_PCI)
//zfiIsrPci(dev);
@@ -340,9 +338,11 @@ int usbdrv_open(struct net_device *dev)
printk("Enter open()\n");
-//#ifndef CONFIG_SMP
-// read_lock(&(macp->isolate_lock));
-//#endif
+/*
+ * #ifndef CONFIG_SMP
+ * read_lock(&(macp->isolate_lock));
+ * #endif
+ */
if (macp->driver_isolated) {
rc = -EBUSY;
goto exit;
@@ -393,11 +393,11 @@ int usbdrv_open(struct net_device *dev)
dev->dev_addr[4] = addr[4];
dev->dev_addr[5] = addr[5];
#endif
- //zfwMacAddressNotify() will be called to setup dev->dev_addr[]
+ /* zfwMacAddressNotify() will be called to setup dev->dev_addr[] */
zfLnxCreateThread(dev);
- mod_timer(&(macp->hbTimer10ms), jiffies + (1*HZ)/100); //10 ms
+ mod_timer(&(macp->hbTimer10ms), jiffies + (1*HZ)/100); /* 10 ms */
netif_carrier_on(dev);
@@ -425,15 +425,15 @@ int usbdrv_open(struct net_device *dev)
#if ZM_SHARE_AUTH == 1
zfiWlanSetAuthenticationMode(dev, 1);
- #endif //#if ZM_SHARE_AUTH == 1
- #endif //#if ZM_WEP_MOME == 1
+ #endif /* #if ZM_SHARE_AUTH == 1 */
+ #endif /* #if ZM_WEP_MOME == 1 */
#elif ZM_PIBSS_MODE == 1
zfiWlanSetWlanMode(dev, ZM_MODE_PSEUDO);
#else
zfiWlanSetWlanMode(dev, ZM_MODE_INFRASTRUCTURE);
#endif
- //zfiWlanSetChannel(dev, ZM_CHANNEL, FALSE);
+ /* zfiWlanSetChannel(dev, ZM_CHANNEL, FALSE); */
zfiWlanSetFrequency(dev, 2462000, FALSE);
zfiWlanSetRtsThreshold(dev, 32767);
zfiWlanSetFragThreshold(dev, 0);
@@ -720,7 +720,7 @@ void zfLnxInitVapStruct(void)
{
u16_t i;
- for (i=0; i<ZM_VAP_PORT_NUMBER; i++)
+ for (i = 0; i < ZM_VAP_PORT_NUMBER; i++)
{
vap[i].dev = NULL;
vap[i].openFlag = 0;
@@ -1128,8 +1128,7 @@ u8_t zfLnxClearStructs(struct net_device *dev)
printk(KERN_ERR "TxQCnt: %d\n", TxQCnt);
- for(ii = 0; ii < TxQCnt; ii++)
- {
+ for (ii = 0; ii < TxQCnt; ii++) {
UsbTxQ_t *TxQ = zfLnxGetUsbTxBuffer(dev);
printk(KERN_ERR "dev_kfree_skb_any\n");
diff --git a/drivers/staging/otus/usbdrv.h b/drivers/staging/otus/usbdrv.h
index 78004062caba..330d1b95cb88 100644
--- a/drivers/staging/otus/usbdrv.h
+++ b/drivers/staging/otus/usbdrv.h
@@ -45,7 +45,7 @@
#include "oal_dt.h"
#include "oal_marc.h"
#include "80211core/pub_zfi.h"
-//#include "pub_zfw.h"
+/* #include "pub_zfw.h" */
#include "80211core/pub_usb.h"
#include <linux/usb.h>
@@ -86,8 +86,7 @@ struct driver_stats {
#define ZM_MAX_RX_URB_NUM 16
#define ZM_MAX_TX_BUF_NUM 128
-typedef struct UsbTxQ
-{
+typedef struct UsbTxQ {
zbuf_t *buf;
u8_t hdr[80];
u16_t hdrlen;
@@ -100,17 +99,16 @@ typedef struct UsbTxQ
struct zdap_ioctl {
- u16_t cmd; /* Command to run */
- u32_t addr; /* Length of the data buffer */
- u32_t value; /* Pointer to the data buffer */
+ u16_t cmd; /* Command to run */
+ u32_t addr; /* Length of the data buffer */
+ u32_t value; /* Pointer to the data buffer */
u8_t data[0x100];
};
#define ZM_OAL_MAX_STA_SUPPORT 16
-struct usbdrv_private
-{
- //linux used
+struct usbdrv_private {
+ /* linux used */
struct net_device *device;
#if (WLAN_HOSTIF == WLAN_PCI)
struct pci_dev *pdev;
@@ -121,7 +119,7 @@ struct usbdrv_private
#endif
struct driver_stats drv_stats;
char ifname[IFNAMSIZ];
- int using_dac;
+ int using_dac;
u8_t rev_id; /* adapter PCI revision ID */
rwlock_t isolate_lock;
spinlock_t cs_lock;
@@ -130,78 +128,76 @@ struct usbdrv_private
void *regp;
#endif
- /* timer for heart beat */
+ /* timer for heart beat */
struct timer_list hbTimer10ms;
/* For driver core */
- void* wd;
+ void *wd;
#if (WLAN_HOSTIF == WLAN_USB)
- u8_t txUsbBuf[ZM_MAX_TX_URB_NUM][ZM_USB_TX_BUF_SIZE];
- u8_t regUsbReadBuf[ZM_USB_REG_MAX_BUF_SIZE];
- u8_t regUsbWriteBuf[ZM_USB_REG_MAX_BUF_SIZE];
+ u8_t txUsbBuf[ZM_MAX_TX_URB_NUM][ZM_USB_TX_BUF_SIZE];
+ u8_t regUsbReadBuf[ZM_USB_REG_MAX_BUF_SIZE];
+ u8_t regUsbWriteBuf[ZM_USB_REG_MAX_BUF_SIZE];
urb_t *WlanTxDataUrb[ZM_MAX_TX_URB_NUM];
urb_t *WlanRxDataUrb[ZM_MAX_RX_URB_NUM];
urb_t *RegOutUrb;
urb_t *RegInUrb;
- UsbTxQ_t UsbTxBufQ[ZM_MAX_TX_BUF_NUM];
- zbuf_t *UsbRxBufQ[ZM_MAX_RX_URB_NUM];
- u16_t TxBufHead;
- u16_t TxBufTail;
- u16_t TxBufCnt;
- u16_t TxUrbHead;
- u16_t TxUrbTail;
- u16_t TxUrbCnt;
- u16_t RxBufHead;
- u16_t RxBufTail;
- u16_t RxBufCnt;
+ UsbTxQ_t UsbTxBufQ[ZM_MAX_TX_BUF_NUM];
+ zbuf_t *UsbRxBufQ[ZM_MAX_RX_URB_NUM];
+ u16_t TxBufHead;
+ u16_t TxBufTail;
+ u16_t TxBufCnt;
+ u16_t TxUrbHead;
+ u16_t TxUrbTail;
+ u16_t TxUrbCnt;
+ u16_t RxBufHead;
+ u16_t RxBufTail;
+ u16_t RxBufCnt;
#endif
#if ZM_USB_STREAM_MODE == 1
- zbuf_t *reamin_buf;
+ zbuf_t *reamin_buf;
#endif
#ifdef ZM_HOSTAPD_SUPPORT
- struct athr_wlan_param athr_wpa_req;
+ struct athr_wlan_param athr_wpa_req;
#endif
- struct sock *netlink_sk;
- u8_t DeviceOpened; //CWYang(+)
- u8_t supIe[50];
- u8_t supLen;
- struct ieee80211req_wpaie stawpaie[ZM_OAL_MAX_STA_SUPPORT];
- u8_t forwardMgmt;
-
- struct zfCbUsbFuncTbl usbCbFunctions;
-
- /* For keventd */
- u32_t flags;
- unsigned long kevent_flags;
- u16_t kevent_ready;
-
- struct semaphore ioctl_sem;
- struct work_struct kevent;
- wait_queue_head_t wait_queue_event;
+ struct sock *netlink_sk;
+ u8_t DeviceOpened; /* CWYang(+) */
+ u8_t supIe[50];
+ u8_t supLen;
+ struct ieee80211req_wpaie stawpaie[ZM_OAL_MAX_STA_SUPPORT];
+ u8_t forwardMgmt;
+
+ struct zfCbUsbFuncTbl usbCbFunctions;
+
+ /* For keventd */
+ u32_t flags;
+ unsigned long kevent_flags;
+ u16_t kevent_ready;
+
+ struct semaphore ioctl_sem;
+ struct work_struct kevent;
+ wait_queue_head_t wait_queue_event;
#ifdef ZM_HALPLUS_LOCK
- unsigned long hal_irqFlag;
+ unsigned long hal_irqFlag;
#endif
- u16_t adapterState;
+ u16_t adapterState;
};
/* WDS */
#define ZM_WDS_PORT_NUMBER 6
-struct zsWdsStruct
-{
- struct net_device* dev;
+struct zsWdsStruct {
+ struct net_device *dev;
u16_t openFlag;
};
/* VAP */
#define ZM_VAP_PORT_NUMBER 7
-struct zsVapStruct
-{
- struct net_device* dev;
+struct zsVapStruct {
+ struct net_device *dev;
u16_t openFlag;
};
@@ -215,25 +211,25 @@ struct zsVapStruct
#define ZM_IOCTL_RXD_DUMP 0x07
#define ZM_IOCTL_MEM_READ 0x0B
#define ZM_IOCTL_MEM_WRITE 0x0C
-#define ZM_IOCTL_DMA_TEST 0x10
-#define ZM_IOCTL_REG_TEST 0x11
-#define ZM_IOCTL_TEST 0x80
-#define ZM_IOCTL_TALLY 0x81 //CWYang(+)
-#define ZM_IOCTL_RTS 0xA0
-#define ZM_IOCTL_MIX_MODE 0xA1
-#define ZM_IOCTL_FRAG 0xA2
-#define ZM_IOCTL_SCAN 0xA3
-#define ZM_IOCTL_KEY 0xA4
-#define ZM_IOCTL_RATE 0xA5
-#define ZM_IOCTL_ENCRYPTION_MODE 0xA6
-#define ZM_IOCTL_GET_TXCNT 0xA7
-#define ZM_IOCTL_GET_DEAGG_CNT 0xA8
-#define ZM_IOCTL_DURATION_MODE 0xA9
-#define ZM_IOCTL_SET_AES_KEY 0xAA
-#define ZM_IOCTL_SET_AES_MODE 0xAB
-#define ZM_IOCTL_SIGNAL_STRENGTH 0xAC //CWYang(+)
-#define ZM_IOCTL_SIGNAL_QUALITY 0xAD //CWYang(+)
-#define ZM_IOCTL_SET_PIBSS_MODE 0xAE
+#define ZM_IOCTL_DMA_TEST 0x10
+#define ZM_IOCTL_REG_TEST 0x11
+#define ZM_IOCTL_TEST 0x80
+#define ZM_IOCTL_TALLY 0x81 /* CWYang(+) */
+#define ZM_IOCTL_RTS 0xA0
+#define ZM_IOCTL_MIX_MODE 0xA1
+#define ZM_IOCTL_FRAG 0xA2
+#define ZM_IOCTL_SCAN 0xA3
+#define ZM_IOCTL_KEY 0xA4
+#define ZM_IOCTL_RATE 0xA5
+#define ZM_IOCTL_ENCRYPTION_MODE 0xA6
+#define ZM_IOCTL_GET_TXCNT 0xA7
+#define ZM_IOCTL_GET_DEAGG_CNT 0xA8
+#define ZM_IOCTL_DURATION_MODE 0xA9
+#define ZM_IOCTL_SET_AES_KEY 0xAA
+#define ZM_IOCTL_SET_AES_MODE 0xAB
+#define ZM_IOCTL_SIGNAL_STRENGTH 0xAC /* CWYang(+) */
+#define ZM_IOCTL_SIGNAL_QUALITY 0xAD /* CWYang(+) */
+#define ZM_IOCTL_SET_PIBSS_MODE 0xAE
#define ZDAPIOCTL SIOCDEVPRIVATE
diff --git a/drivers/staging/otus/wrap_buf.c b/drivers/staging/otus/wrap_buf.c
index a0f677a52616..d7ee0b454e91 100644
--- a/drivers/staging/otus/wrap_buf.c
+++ b/drivers/staging/otus/wrap_buf.c
@@ -34,9 +34,9 @@
/* Called to allocate buffer, must return a continue buffer space */
-zbuf_t* zfwBufAllocate(zdev_t* dev, u16_t len)
+zbuf_t *zfwBufAllocate(zdev_t *dev, u16_t len)
{
- zbuf_t* buf;
+ zbuf_t *buf;
/* Allocate SKB for packet*/
buf = dev_alloc_skb(len);
@@ -46,15 +46,15 @@ zbuf_t* zfwBufAllocate(zdev_t* dev, u16_t len)
/* Called to free buffer, replace below 3 functions */
-void zfwBufFree(zdev_t* dev, zbuf_t* buf, u16_t status)
+void zfwBufFree(zdev_t *dev, zbuf_t *buf, u16_t status)
{
dev_kfree_skb_any(buf);
}
/* Called to adjust buffer size and head pointer */
-u16_t zfwBufRemoveHead(zdev_t* dev, zbuf_t* buf, u16_t size)
+u16_t zfwBufRemoveHead(zdev_t *dev, zbuf_t *buf, u16_t size)
{
- //zm_assert(buf->len > size);
+ /* zm_assert(buf->len > size); */
buf->data += size;
buf->len -= size;
@@ -68,7 +68,7 @@ u16_t zfwBufRemoveHead(zdev_t* dev, zbuf_t* buf, u16_t size)
/* Used to chain Rx buffer to form a frame. if the prepared Rx buffer */
/* is greater than an ethernet frame(1518+32 byte), then this function */
/* will only be called with head=NULL. */
-u16_t zfwBufChain(zdev_t* dev, zbuf_t** head, zbuf_t* tail)
+u16_t zfwBufChain(zdev_t *dev, zbuf_t **head, zbuf_t *tail)
{
*head = tail;
@@ -77,7 +77,7 @@ u16_t zfwBufChain(zdev_t* dev, zbuf_t** head, zbuf_t* tail)
/* Called when doing infra-bss forwarding */
-u16_t zfwBufCopy(zdev_t* dev, zbuf_t* dst, zbuf_t* src)
+u16_t zfwBufCopy(zdev_t *dev, zbuf_t *dst, zbuf_t *src)
{
memcpy(dst->data, src->data, src->len);
dst->tail = dst->data;
@@ -87,7 +87,7 @@ u16_t zfwBufCopy(zdev_t* dev, zbuf_t* dst, zbuf_t* src)
/* Called to adjust buffer size and tail pointer */
-u16_t zfwBufSetSize(zdev_t* dev, zbuf_t* buf, u16_t size)
+u16_t zfwBufSetSize(zdev_t *dev, zbuf_t *buf, u16_t size)
{
#ifdef NET_SKBUFF_DATA_USES_OFFSET
buf->tail = 0;
@@ -101,11 +101,11 @@ u16_t zfwBufSetSize(zdev_t* dev, zbuf_t* buf, u16_t size)
return 0;
}
-u16_t zfwBufGetSize(zdev_t* dev, zbuf_t* buf)
+u16_t zfwBufGetSize(zdev_t *dev, zbuf_t *buf)
{
return buf->len;
}
-void zfwCopyBufContext(zdev_t* dev, zbuf_t* source, zbuf_t* dst)
+void zfwCopyBufContext(zdev_t *dev, zbuf_t *source, zbuf_t *dst)
{
}
diff --git a/drivers/staging/otus/wrap_dbg.c b/drivers/staging/otus/wrap_dbg.c
index d47e9ab9179a..ee0ee1532601 100644
--- a/drivers/staging/otus/wrap_dbg.c
+++ b/drivers/staging/otus/wrap_dbg.c
@@ -29,70 +29,67 @@
#include <linux/netlink.h>
#include <net/iw_handler.h>
-void zfwDumpBuf(zdev_t* dev, zbuf_t* buf)
+void zfwDumpBuf(zdev_t *dev, zbuf_t *buf)
{
- u16_t i;
-
- for (i=0; i<buf->len; i++)
- {
- printk("%02x ", *(((u8_t*)buf->data)+i));
- if ((i&0xf)==0xf)
- {
- printk("\n");
- }
- }
- printk("\n");
+ u16_t i;
+
+ for (i = 0; i < buf->len; i++) {
+ printk(KERN_DEBUG "%02x ", *(((u8_t *)buf->data)+i));
+ if ((i & 0xf) == 0xf)
+ printk(KERN_DEBUG "\n");
+ }
+ printk(KERN_DEBUG "\n");
}
-void zfwDbgReadRegDone(zdev_t* dev, u32_t addr, u32_t val)
+void zfwDbgReadRegDone(zdev_t *dev, u32_t addr, u32_t val)
{
- printk("Read addr:%x = %x\n", addr, val);
+ printk(KERN_DEBUG "Read addr:%x = %x\n", addr, val);
}
-void zfwDbgWriteRegDone(zdev_t* dev, u32_t addr, u32_t val)
+void zfwDbgWriteRegDone(zdev_t *dev, u32_t addr, u32_t val)
{
- printk("Write addr:%x = %x\n", addr, val);
+ printk(KERN_DEBUG "Write addr:%x = %x\n", addr, val);
}
-void zfwDbgReadTallyDone(zdev_t* dev)
+void zfwDbgReadTallyDone(zdev_t *dev)
{
- //printk("Read Tall Done\n");
+ /* printk(KERN_DEBUG "Read Tall Done\n"); */
}
-void zfwDbgWriteEepromDone(zdev_t* dev, u32_t addr, u32_t val)
+void zfwDbgWriteEepromDone(zdev_t *dev, u32_t addr, u32_t val)
{
}
-void zfwDbgQueryHwTxBusyDone(zdev_t* dev, u32_t val)
+void zfwDbgQueryHwTxBusyDone(zdev_t *dev, u32_t val)
{
}
-//For Evl ++
-void zfwDbgReadFlashDone(zdev_t* dev, u32_t addr, u32_t* rspdata, u32_t datalen)
+/* For Evl ++ */
+void zfwDbgReadFlashDone(zdev_t *dev, u32_t addr, u32_t *rspdata, u32_t datalen)
{
- printk("Read Flash addr:%x length:%x\n", addr, datalen);
+ printk(KERN_DEBUG "Read Flash addr:%x length:%x\n", addr, datalen);
}
-void zfwDbgProgrameFlashDone(zdev_t* dev)
+void zfwDbgProgrameFlashDone(zdev_t *dev)
{
- printk("Program Flash Done\n");
+ printk(KERN_DEBUG "Program Flash Done\n");
}
-void zfwDbgProgrameFlashChkDone(zdev_t* dev)
+void zfwDbgProgrameFlashChkDone(zdev_t *dev)
{
- printk("Program Flash Done\n");
+ printk(KERN_DEBUG "Program Flash Done\n");
}
-void zfwDbgGetFlashChkSumDone(zdev_t* dev, u32_t* rspdata)
+void zfwDbgGetFlashChkSumDone(zdev_t *dev, u32_t *rspdata)
{
- printk("Get Flash ChkSum Done\n");
+ printk(KERN_DEBUG "Get Flash ChkSum Done\n");
}
-void zfwDbgDownloadFwInitDone(zdev_t* dev)
+void zfwDbgDownloadFwInitDone(zdev_t *dev)
{
- printk("Download FW Init Done\n");
+ printk(KERN_DEBUG "Download FW Init Done\n");
}
-//For Evl --
+/* For Evl -- */
/* Leave an empty line below to remove warning message on some compiler */
diff --git a/drivers/staging/otus/wrap_ev.c b/drivers/staging/otus/wrap_ev.c
index bcda0b9673dc..29f560372555 100644
--- a/drivers/staging/otus/wrap_ev.c
+++ b/drivers/staging/otus/wrap_ev.c
@@ -32,202 +32,214 @@
/***** Management *****/
-u16_t zfLnxAuthNotify(zdev_t* dev, u16_t* macAddr)
+u16_t zfLnxAuthNotify(zdev_t *dev, u16_t *macAddr)
{
- return 0;
+ return 0;
}
-u16_t zfLnxAsocNotify(zdev_t* dev, u16_t* macAddr, u8_t* body, u16_t bodySize, u16_t port)
+u16_t zfLnxAsocNotify(zdev_t *dev, u16_t *macAddr, u8_t *body, u16_t bodySize,
+ u16_t port)
{
-//#ifdef ZM_HOSTAPD_SUPPORT
- struct usbdrv_private *macp = dev->ml_priv;
- union iwreq_data wreq;
- u8_t *addr = (u8_t *) macAddr;
- u16_t i, j;
-
- memset(&wreq, 0, sizeof(wreq));
- memcpy(wreq.addr.sa_data, macAddr, ETH_ALEN);
- wreq.addr.sa_family = ARPHRD_ETHER;
- printk(KERN_DEBUG "join_event of MAC: %02x:%02x:%02x:%02x:%02x:%02x\n",
- addr[0], addr[1], addr[2], addr[3], addr[4], addr[5]);
-
- for(i = 0; i < ZM_OAL_MAX_STA_SUPPORT; i++)
- {
- for(j = 0; j < IEEE80211_ADDR_LEN; j++)
- {
- if ((macp->stawpaie[i].wpa_macaddr[j] != 0) &&
- (macp->stawpaie[i].wpa_macaddr[j] != addr[j]))
- break;
- }
- if (j == 6)
- break;
- }
- if (i < ZM_OAL_MAX_STA_SUPPORT)
- {
- //printk("zfwAsocNotify - store wpa ie in macp, index = %d\n", i);
- memcpy(macp->stawpaie[i].wpa_macaddr, macAddr, IEEE80211_ADDR_LEN);
- memcpy(macp->stawpaie[i].wpa_ie, body, bodySize);
- }
- //if(macp->cardSetting.BssType == INFRASTRUCTURE_BSS) {
- // //wireless_send_event(macp->device, SIOCGIWSCAN, &wreq, NULL);
- // wireless_send_event(macp->device, SIOCGIWAP, &wreq, NULL);
- //}
- //else if(macp->cardSetting.BssType == AP_BSS) {
-// if (port == 0)
-// {
- wireless_send_event(dev, IWEVREGISTERED, &wreq, NULL);
-// }
-// else
-// {
-// /* Check whether the VAP device is valid */
-// if (vap[port].dev != NULL)
-// {
-// wireless_send_event(vap[port].dev, IWEVREGISTERED, &wreq, NULL);
-// }
-// else
-// {
-// printk(KERN_ERR "Can' find a valid VAP device, port: %d\n", port);
-// }
-// }
- //}
-//#endif
-
- return 0;
+/* #ifdef ZM_HOSTAPD_SUPPORT */
+ struct usbdrv_private *macp = dev->ml_priv;
+ union iwreq_data wreq;
+ u8_t *addr = (u8_t *) macAddr;
+ u16_t i, j;
+
+ memset(&wreq, 0, sizeof(wreq));
+ memcpy(wreq.addr.sa_data, macAddr, ETH_ALEN);
+ wreq.addr.sa_family = ARPHRD_ETHER;
+ printk(KERN_DEBUG "join_event of MAC: %02x:%02x:%02x:%02x:%02x:%02x\n",
+ addr[0], addr[1], addr[2], addr[3], addr[4], addr[5]);
+
+ for (i = 0; i < ZM_OAL_MAX_STA_SUPPORT; i++) {
+ for (j = 0; j < IEEE80211_ADDR_LEN; j++) {
+ if ((macp->stawpaie[i].wpa_macaddr[j] != 0) &&
+ (macp->stawpaie[i].wpa_macaddr[j] != addr[j]))
+ break;
+ }
+ if (j == 6)
+ break;
+ }
+ if (i < ZM_OAL_MAX_STA_SUPPORT) {
+ /*
+ * printk("zfwAsocNotify - store wpa ie in macp,
+ * index = %d\n", i);
+ */
+ memcpy(macp->stawpaie[i].wpa_macaddr, macAddr,
+ IEEE80211_ADDR_LEN);
+ memcpy(macp->stawpaie[i].wpa_ie, body, bodySize);
+ }
+ /*
+ * if(macp->cardSetting.BssType == INFRASTRUCTURE_BSS) {
+ * wireless_send_event(macp->device, SIOCGIWSCAN, &wreq, NULL);
+ * wireless_send_event(macp->device, SIOCGIWAP, &wreq, NULL);
+ * }
+ * else if(macp->cardSetting.BssType == AP_BSS) {
+ * if (port == 0)
+ * {
+ */
+ wireless_send_event(dev, IWEVREGISTERED, &wreq, NULL);
+ /*
+ * }
+ * else
+ * {
+ * Check whether the VAP device is valid
+ * if (vap[port].dev != NULL)
+ * {
+ * wireless_send_event(vap[port].dev,
+ * IWEVREGISTERED, &wreq, NULL);
+ * }
+ * else
+ * {
+ * printk(KERN_ERR "Can' find a valid VAP device,
+ * port: %d\n", port);
+ * }
+ * }
+ * }
+ */
+/* #endif */
+
+ return 0;
}
/* Notification that a STA is disassociated from AP */
/* AP mode only */
-u16_t zfLnxDisAsocNotify(zdev_t* dev, u8_t* macAddr, u16_t port)
+u16_t zfLnxDisAsocNotify(zdev_t *dev, u8_t *macAddr, u16_t port)
{
- union iwreq_data wreq;
- u8_t *addr = (u8_t *) macAddr;
+ union iwreq_data wreq;
+ u8_t *addr = (u8_t *) macAddr;
- memset(&wreq, 0, sizeof(wreq));
- memcpy(wreq.addr.sa_data, macAddr, ETH_ALEN);
- wreq.addr.sa_family = ARPHRD_ETHER;
- printk(KERN_DEBUG "zfwDisAsocNotify(), MAC: %02x:%02x:%02x:%02x:%02x:%02x\n",
- addr[0], addr[1], addr[2], addr[3], addr[4], addr[5]);
+ memset(&wreq, 0, sizeof(wreq));
+ memcpy(wreq.addr.sa_data, macAddr, ETH_ALEN);
+ wreq.addr.sa_family = ARPHRD_ETHER;
+ printk(KERN_DEBUG "zfwDisAsocNotify(), MAC: %02x:%02x:%02x:%02x:%02x:%02x\n",
+ addr[0], addr[1], addr[2], addr[3], addr[4], addr[5]);
- return 0;
+ return 0;
}
/* Notification that a STA is connect to AP */
/* AP mode only */
-u16_t zfLnxApConnectNotify(zdev_t* dev, u8_t* macAddr, u16_t port)
+u16_t zfLnxApConnectNotify(zdev_t *dev, u8_t *macAddr, u16_t port)
{
- union iwreq_data wreq;
- u8_t *addr = (u8_t *) macAddr;
+ union iwreq_data wreq;
+ u8_t *addr = (u8_t *) macAddr;
- memset(&wreq, 0, sizeof(wreq));
- memcpy(wreq.addr.sa_data, macAddr, ETH_ALEN);
- wreq.addr.sa_family = ARPHRD_ETHER;
- printk(KERN_DEBUG "zfwApConnectNotify(), MAC: %02x:%02x:%02x:%02x:%02x:%02x\n",
- addr[0], addr[1], addr[2], addr[3], addr[4], addr[5]);
+ memset(&wreq, 0, sizeof(wreq));
+ memcpy(wreq.addr.sa_data, macAddr, ETH_ALEN);
+ wreq.addr.sa_family = ARPHRD_ETHER;
+ printk(KERN_DEBUG "zfwApConnectNotify(), MAC: %02x:%02x:%02x:%02x:%02x:%02x\n",
+ addr[0], addr[1], addr[2], addr[3], addr[4], addr[5]);
- return 0;
+ return 0;
}
-void zfLnxConnectNotify(zdev_t* dev, u16_t status, u16_t* bssid)
+void zfLnxConnectNotify(zdev_t *dev, u16_t status, u16_t *bssid)
{
- union iwreq_data wreq;
- u8_t *addr = (u8_t *) bssid;
- struct usbdrv_private *macp = dev->ml_priv;
-
- if (bssid != NULL)
- {
- memset(&wreq, 0, sizeof(wreq));
- if (status == ZM_STATUS_MEDIA_CONNECT)
- memcpy(wreq.addr.sa_data, bssid, ETH_ALEN);
- wreq.addr.sa_family = ARPHRD_ETHER;
-
- if (status == ZM_STATUS_MEDIA_CONNECT)
- {
+ union iwreq_data wreq;
+ u8_t *addr = (u8_t *) bssid;
+ struct usbdrv_private *macp = dev->ml_priv;
+
+ if (bssid != NULL) {
+ memset(&wreq, 0, sizeof(wreq));
+ if (status == ZM_STATUS_MEDIA_CONNECT)
+ memcpy(wreq.addr.sa_data, bssid, ETH_ALEN);
+ wreq.addr.sa_family = ARPHRD_ETHER;
+
+ if (status == ZM_STATUS_MEDIA_CONNECT) {
#ifdef ZM_CONFIG_BIG_ENDIAN
- printk(KERN_DEBUG "Connected to AP, MAC: %02x:%02x:%02x:%02x:%02x:%02x\n",
- addr[1], addr[0], addr[3], addr[2], addr[5], addr[4]);
+ printk(KERN_DEBUG "Connected to AP, MAC:"
+ "%02x:%02x:%02x:%02x:%02x:%02x\n",
+ addr[1], addr[0], addr[3], addr[2],
+ addr[5], addr[4]);
#else
- printk(KERN_DEBUG "Connected to AP, MAC: %02x:%02x:%02x:%02x:%02x:%02x\n",
- addr[0], addr[1], addr[2], addr[3], addr[4], addr[5]);
+ printk(KERN_DEBUG "Connected to AP, MAC:"
+ "%02x:%02x:%02x:%02x:%02x:%02x\n",
+ addr[0], addr[1], addr[2], addr[3],
+ addr[4], addr[5]);
#endif
- netif_start_queue(dev);
- }
- else if ((status == ZM_STATUS_MEDIA_DISCONNECT) ||
- (status == ZM_STATUS_MEDIA_DISABLED) ||
- (status == ZM_STATUS_MEDIA_CONNECTION_DISABLED) ||
- (status == ZM_STATUS_MEDIA_CONNECTION_RESET) ||
- (status == ZM_STATUS_MEDIA_RESET) ||
- (status == ZM_STATUS_MEDIA_DISCONNECT_DEAUTH) ||
- (status == ZM_STATUS_MEDIA_DISCONNECT_DISASOC) ||
- (status == ZM_STATUS_MEDIA_DISCONNECT_BEACON_MISS) ||
- (status == ZM_STATUS_MEDIA_DISCONNECT_NOT_FOUND) ||
- (status == ZM_STATUS_MEDIA_DISCONNECT_TIMEOUT))
- {
- printk(KERN_DEBUG "Disconnection Notify\n");
-
- netif_stop_queue(dev);
- }
+ netif_start_queue(dev);
+ } else if ((status == ZM_STATUS_MEDIA_DISCONNECT) ||
+ (status == ZM_STATUS_MEDIA_DISABLED) ||
+ (status == ZM_STATUS_MEDIA_CONNECTION_DISABLED) ||
+ (status == ZM_STATUS_MEDIA_CONNECTION_RESET) ||
+ (status == ZM_STATUS_MEDIA_RESET) ||
+ (status == ZM_STATUS_MEDIA_DISCONNECT_DEAUTH) ||
+ (status == ZM_STATUS_MEDIA_DISCONNECT_DISASOC) ||
+ (status == ZM_STATUS_MEDIA_DISCONNECT_BEACON_MISS) ||
+ (status == ZM_STATUS_MEDIA_DISCONNECT_NOT_FOUND) ||
+ (status == ZM_STATUS_MEDIA_DISCONNECT_TIMEOUT)) {
+ printk(KERN_DEBUG "Disconnection Notify\n");
+
+ netif_stop_queue(dev);
+ }
/* Save the connected status */
macp->adapterState = status;
- if(zfiWlanQueryWlanMode(dev) == ZM_MODE_INFRASTRUCTURE) {
- // //wireless_send_event(dev, SIOCGIWSCAN, &wreq, NULL);
- wireless_send_event(dev, SIOCGIWAP, &wreq, NULL);
- }
- else if(zfiWlanQueryWlanMode(dev) == ZM_MODE_AP) {
- //if (port == 0)
- //{
- wireless_send_event(dev, IWEVREGISTERED, &wreq, NULL);
- //}
- //else
- //{
- // /* Check whether the VAP device is valid */
- // if (vap[port].dev != NULL)
- // {
- // wireless_send_event(vap[port].dev, IWEVREGISTERED, &wreq, NULL);
- // }
- // else
- // {
- // printk(KERN_ERR "Can' find a valid VAP device, port: %d\n", port);
- // }
- //}
- }
- }
- //return 0;
+ if (zfiWlanQueryWlanMode(dev) == ZM_MODE_INFRASTRUCTURE) {
+ /*wireless_send_event(dev, SIOCGIWSCAN, &wreq, NULL);*/
+ wireless_send_event(dev, SIOCGIWAP, &wreq, NULL);
+ } else if (zfiWlanQueryWlanMode(dev) == ZM_MODE_AP) {
+ /*
+ * if (port == 0)
+ * {
+ * wireless_send_event(dev, IWEVREGISTERED,
+ * &wreq, NULL);
+ * }
+ * else
+ * {
+ * Check whether the VAP device is valid
+ * if (vap[port].dev != NULL)
+ * {
+ * wireless_send_event(vap[port].dev,
+ * IWEVREGISTERED, &wreq, NULL);
+ * }
+ * else
+ * {
+ * printk(KERN_ERR "Can' find a valid VAP"
+ * " device, port: %d\n", port);
+ * }
+ * }
+ */
+ }
+ }
+ /* return 0; */
}
-void zfLnxScanNotify(zdev_t* dev, struct zsScanResult* result)
+void zfLnxScanNotify(zdev_t *dev, struct zsScanResult *result)
{
- return;
+ return;
}
-void zfLnxStatisticsNotify(zdev_t* dev, struct zsStastics* result)
+void zfLnxStatisticsNotify(zdev_t *dev, struct zsStastics *result)
{
- return;
+ return;
}
-//void zfwMicFailureNotify(zdev_t* dev, u8_t* message, u16_t event)
-void zfLnxMicFailureNotify(zdev_t* dev, u16_t* addr, u16_t status)
+/* void zfwMicFailureNotify(zdev_t *dev, u8_t *message, u16_t event) */
+void zfLnxMicFailureNotify(zdev_t *dev, u16_t *addr, u16_t status)
{
static const char *tag = "MLME-MICHAELMICFAILURE.indication";
union iwreq_data wrqu;
char buf[128];
/* TODO: needed parameters: count, type, src address */
- //snprintf(buf, sizeof(buf), "%s(%scast addr=%s)", tag,
- // (status == ZM_MIC_GROUP_ERROR) ? "broad" : "uni",
- // ether_sprintf((u8_t *)addr));
+ /*
+ * snprintf(buf, sizeof(buf), "%s(%scast addr=%s)", tag,
+ * (status == ZM_MIC_GROUP_ERROR) ? "broad" : "uni",
+ * ether_sprintf((u8_t *)addr));
+ */
if (zfiWlanQueryWlanMode(dev) == ZM_MODE_INFRASTRUCTURE)
- {
strcpy(buf, tag);
- }
memset(&wrqu, 0, sizeof(wrqu));
wrqu.data.length = strlen(buf);
@@ -235,42 +247,46 @@ void zfLnxMicFailureNotify(zdev_t* dev, u16_t* addr, u16_t status)
}
-void zfLnxApMicFailureNotify(zdev_t* dev, u8_t* addr, zbuf_t* buf)
+void zfLnxApMicFailureNotify(zdev_t *dev, u8_t *addr, zbuf_t *buf)
{
- union iwreq_data wreq;
+ union iwreq_data wreq;
- memset(&wreq, 0, sizeof(wreq));
- memcpy(wreq.addr.sa_data, addr, ETH_ALEN);
- wreq.addr.sa_family = ARPHRD_ETHER;
- printk(KERN_DEBUG "zfwApMicFailureNotify(), MAC: %02x:%02x:%02x:%02x:%02x:%02x\n",
- addr[0], addr[1], addr[2], addr[3], addr[4], addr[5]);
+ memset(&wreq, 0, sizeof(wreq));
+ memcpy(wreq.addr.sa_data, addr, ETH_ALEN);
+ wreq.addr.sa_family = ARPHRD_ETHER;
+ printk(KERN_DEBUG "zfwApMicFailureNotify(), "
+ "MAC: %02x:%02x:%02x:%02x:%02x:%02x\n",
+ addr[0], addr[1], addr[2], addr[3], addr[4], addr[5]);
- return;
+ return;
}
-
-// status = 0 => partner lost
-// = 1 => partner alive
-//void zfwIbssPartnerNotify(zdev_t* dev, u8_t status)
-void zfLnxIbssPartnerNotify(zdev_t* dev, u16_t status, struct zsPartnerNotifyEvent *event)
+/*
+ * status = 0 => partner lost
+ * = 1 => partner alive
+ * void zfwIbssPartnerNotify(zdev_t* dev, u8_t status)
+ */
+void zfLnxIbssPartnerNotify(zdev_t *dev, u16_t status,
+ struct zsPartnerNotifyEvent *event)
{
}
-void zfLnxMacAddressNotify(zdev_t* dev, u8_t* addr)
+void zfLnxMacAddressNotify(zdev_t *dev, u8_t *addr)
{
- dev->dev_addr[0] = addr[0];
- dev->dev_addr[1] = addr[1];
- dev->dev_addr[2] = addr[2];
- dev->dev_addr[3] = addr[3];
- dev->dev_addr[4] = addr[4];
- dev->dev_addr[5] = addr[5];
+ dev->dev_addr[0] = addr[0];
+ dev->dev_addr[1] = addr[1];
+ dev->dev_addr[2] = addr[2];
+ dev->dev_addr[3] = addr[3];
+ dev->dev_addr[4] = addr[4];
+ dev->dev_addr[5] = addr[5];
}
-void zfLnxSendCompleteIndication(zdev_t* dev, zbuf_t* buf)
+void zfLnxSendCompleteIndication(zdev_t *dev, zbuf_t *buf)
{
}
-void zfLnxRestoreBufData(zdev_t* dev, zbuf_t* buf) {
+void zfLnxRestoreBufData(zdev_t *dev, zbuf_t *buf)
+{
}
/* Leave an empty line below to remove warning message on some compiler */
diff --git a/drivers/staging/otus/wrap_mem.c b/drivers/staging/otus/wrap_mem.c
index 32416d77a471..47cbce1346a9 100644
--- a/drivers/staging/otus/wrap_mem.c
+++ b/drivers/staging/otus/wrap_mem.c
@@ -30,69 +30,75 @@
#include <net/iw_handler.h>
/* Memory management */
-/* Called to allocate uncached memory, allocated memory must */
-/* in 4-byte boundary */
-void* zfwMemAllocate(zdev_t* dev, u32_t size)
+/* Called to allocate uncached memory, allocated memory must */
+/* in 4-byte boundary */
+void *zfwMemAllocate(zdev_t *dev, u32_t size)
{
- void* mem = NULL;
- mem = kmalloc(size, GFP_ATOMIC);
- return mem;
+ void *mem = NULL;
+ mem = kmalloc(size, GFP_ATOMIC);
+ return mem;
}
/* Called to free allocated memory */
-void zfwMemFree(zdev_t* dev, void* mem, u32_t size)
+void zfwMemFree(zdev_t *dev, void *mem, u32_t size)
{
- kfree(mem);
- return;
+ kfree(mem);
+ return;
}
-void zfwMemoryCopy(u8_t* dst, u8_t* src, u16_t length)
+void zfwMemoryCopy(u8_t *dst, u8_t *src, u16_t length)
{
- //u16_t i;
+ /* u16_t i; */
- memcpy(dst, src, length);
- //for(i=0; i<length; i++)
- //{
- // dst[i] = src[i];
- //}
- return;
+ memcpy(dst, src, length);
+ /*
+ * for(i=0; i<length; i++)
+ * {
+ * dst[i] = src[i];
+ * }
+ */
+ return;
}
-void zfwZeroMemory(u8_t* va, u16_t length)
+void zfwZeroMemory(u8_t *va, u16_t length)
{
- //u16_t i;
- memset(va, 0, length);
- //for(i=0; i<length; i++)
- //{
- // va[i] = 0;
- //}
- return;
+ /* u16_t i; */
+ memset(va, 0, length);
+ /*
+ * for(i=0; i<length; i++)
+ * {
+ * va[i] = 0;
+ * }
+ */
+ return;
}
-void zfwMemoryMove(u8_t* dst, u8_t* src, u16_t length)
+void zfwMemoryMove(u8_t *dst, u8_t *src, u16_t length)
{
- memcpy(dst, src, length);
- return;
+ memcpy(dst, src, length);
+ return;
}
-u8_t zfwMemoryIsEqual(u8_t* m1, u8_t* m2, u16_t length)
+u8_t zfwMemoryIsEqual(u8_t *m1, u8_t *m2, u16_t length)
{
- //u16_t i;
- int ret;
+ /* u16_t i; */
+ int ret;
- ret = memcmp(m1, m2, length);
+ ret = memcmp(m1, m2, length);
- return ((ret==0)?TRUE:FALSE);
- //for(i=0; i<length; i++)
- //{
- // if ( m1[i] != m2[i] )
- // {
- // return FALSE;
- // }
- //}
-
- //return TRUE;
+ return ((ret == 0) ? TRUE : FALSE);
+ /*
+ * for(i=0; i<length; i++)
+ *{
+ * if ( m1[i] != m2[i] )
+ * {
+ * return FALSE;
+ * }
+ *}
+ *
+ * return TRUE;
+ */
}
/* Leave an empty line below to remove warning message on some compiler */
diff --git a/drivers/staging/otus/wrap_mis.c b/drivers/staging/otus/wrap_mis.c
index ea2199fecbbe..26f49b7ec834 100644
--- a/drivers/staging/otus/wrap_mis.c
+++ b/drivers/staging/otus/wrap_mis.c
@@ -30,76 +30,73 @@
#include <linux/netlink.h>
#include <net/iw_handler.h>
-//extern struct zsWdsStruct wds[ZM_WDS_PORT_NUMBER];
+/* extern struct zsWdsStruct wds[ZM_WDS_PORT_NUMBER]; */
extern struct zsVapStruct vap[ZM_VAP_PORT_NUMBER];
-extern u16_t zfLnxGetVapId(zdev_t* dev);
+extern u16_t zfLnxGetVapId(zdev_t *dev);
/* Simply return 0xffff if VAP function is not supported */
-u16_t zfwGetVapId(zdev_t* dev)
+u16_t zfwGetVapId(zdev_t *dev)
{
- return zfLnxGetVapId(dev);
+ return zfLnxGetVapId(dev);
}
-void zfwSleep(zdev_t* dev, u32_t ms)
+void zfwSleep(zdev_t *dev, u32_t ms)
{
- if (in_interrupt() == 0)
- {
- mdelay(ms);
- }
- else
- {
- int ii;
- int iter = 100000 * ms;
-
- for (ii = 0; ii < iter; ii++)
- {
-
- }
- }
+ if (in_interrupt() == 0)
+ mdelay(ms);
+ else {
+ int ii;
+ int iter = 100000 * ms;
+
+ for (ii = 0; ii < iter; ii++) {
+ }
+ }
}
#ifdef ZM_HALPLUS_LOCK
-asmlinkage struct zsWlanDev *zfwGetWlanDev(zdev_t* dev)
+asmlinkage struct zsWlanDev *zfwGetWlanDev(zdev_t *dev)
{
struct usbdrv_private *macp = dev->ml_priv;
return macp->wd;
}
-asmlinkage void zfwEnterCriticalSection(zdev_t* dev)
+asmlinkage void zfwEnterCriticalSection(zdev_t *dev)
{
struct usbdrv_private *macp = dev->ml_priv;
spin_lock_irqsave(&macp->cs_lock, macp->hal_irqFlag);
}
-asmlinkage void zfwLeaveCriticalSection(zdev_t* dev)
+asmlinkage void zfwLeaveCriticalSection(zdev_t *dev)
{
struct usbdrv_private *macp = dev->ml_priv;
spin_unlock_irqrestore(&macp->cs_lock, macp->hal_irqFlag);
}
-asmlinkage u8_t zfwBufReadByte(zdev_t* dev, zbuf_t* buf, u16_t offset)
+asmlinkage u8_t zfwBufReadByte(zdev_t *dev, zbuf_t *buf, u16_t offset)
{
- return *(u8_t*)((u8_t*)buf->data+offset);
+ return *(u8_t *)((u8_t *)buf->data+offset);
}
-asmlinkage u16_t zfwBufReadHalfWord(zdev_t* dev, zbuf_t* buf, u16_t offset)
+asmlinkage u16_t zfwBufReadHalfWord(zdev_t *dev, zbuf_t *buf, u16_t offset)
{
- return zmw_cpu_to_le16(*(u16_t*)((u8_t*)buf->data+offset));
+ return zmw_cpu_to_le16(*(u16_t *)((u8_t *)buf->data+offset));
}
-asmlinkage void zfwBufWriteByte(zdev_t* dev, zbuf_t* buf, u16_t offset, u8_t value)
+asmlinkage void zfwBufWriteByte(zdev_t *dev, zbuf_t *buf, u16_t offset,
+ u8_t value)
{
- *(u8_t*)((u8_t*)buf->data+offset) = value;
+ *(u8_t *)((u8_t *)buf->data+offset) = value;
}
-asmlinkage void zfwBufWriteHalfWord(zdev_t* dev, zbuf_t* buf, u16_t offset, u16_t value)
+asmlinkage void zfwBufWriteHalfWord(zdev_t *dev, zbuf_t *buf, u16_t offset,
+ u16_t value)
{
- *(u16_t*)((u8_t*)buf->data+offset) = zmw_cpu_to_le16(value);
+ *(u16_t *)((u8_t *)buf->data+offset) = zmw_cpu_to_le16(value);
}
-asmlinkage u8_t *zfwGetBuffer(zdev_t* dev, zbuf_t* buf)
+asmlinkage u8_t *zfwGetBuffer(zdev_t *dev, zbuf_t *buf)
{
- return (u8_t*)(buf->data);
+ return (u8_t *)(buf->data);
}
#endif
diff --git a/drivers/staging/otus/wrap_pkt.c b/drivers/staging/otus/wrap_pkt.c
index 0d5920fdf4f3..75bb952fd0a5 100644
--- a/drivers/staging/otus/wrap_pkt.c
+++ b/drivers/staging/otus/wrap_pkt.c
@@ -31,136 +31,122 @@
#include <net/iw_handler.h>
-//extern struct zsWdsStruct wds[ZM_WDS_PORT_NUMBER];
+/* extern struct zsWdsStruct wds[ZM_WDS_PORT_NUMBER]; */
extern struct zsVapStruct vap[ZM_VAP_PORT_NUMBER];
/***** Rx *****/
-void zfLnxRecv80211(zdev_t* dev, zbuf_t* buf, struct zsAdditionInfo* addInfo)
+void zfLnxRecv80211(zdev_t *dev, zbuf_t *buf, struct zsAdditionInfo *addInfo)
{
- u16_t frameType;
- u16_t frameCtrl;
- u16_t frameSubtype;
- zbuf_t *skb1;
- struct usbdrv_private *macp = dev->ml_priv;
-
- //frameCtrl = zmw_buf_readb(dev, buf, 0);
- frameCtrl = *(u8_t*)((u8_t*)buf->data);
- frameType = frameCtrl & 0xf;
- frameSubtype = frameCtrl & 0xf0;
-
- if ((frameType == 0x0) && (macp->forwardMgmt))
- {
- switch (frameSubtype)
- {
- /* Beacon */
- case 0x80 :
- /* Probe response */
- case 0x50 :
- skb1 = skb_copy(buf, GFP_ATOMIC);
- if(skb1 != NULL)
- {
- skb1->dev = dev;
- skb1->mac_header = skb1->data;
- skb1->ip_summed = CHECKSUM_NONE;
- skb1->pkt_type = PACKET_OTHERHOST;
- skb1->protocol = __constant_htons(0x0019); /* ETH_P_80211_RAW */
- netif_rx(skb1);
- }
- break;
- default:
- break;
- }
- }
-
- zfiRecv80211(dev, buf, addInfo);
- return;
+ u16_t frameType;
+ u16_t frameCtrl;
+ u16_t frameSubtype;
+ zbuf_t *skb1;
+ struct usbdrv_private *macp = dev->ml_priv;
+
+ /* frameCtrl = zmw_buf_readb(dev, buf, 0); */
+ frameCtrl = *(u8_t *)((u8_t *)buf->data);
+ frameType = frameCtrl & 0xf;
+ frameSubtype = frameCtrl & 0xf0;
+
+ if ((frameType == 0x0) && (macp->forwardMgmt)) {
+ switch (frameSubtype) {
+ /* Beacon */
+ case 0x80:
+ /* Probe response */
+ case 0x50:
+ skb1 = skb_copy(buf, GFP_ATOMIC);
+ if (skb1 != NULL) {
+ skb1->dev = dev;
+ skb1->mac_header = skb1->data;
+ skb1->ip_summed = CHECKSUM_NONE;
+ skb1->pkt_type = PACKET_OTHERHOST;
+ /* ETH_P_80211_RAW */
+ skb1->protocol = __constant_htons(0x0019);
+ netif_rx(skb1);
+ }
+ break;
+ default:
+ break;
+ }
+ }
+
+ zfiRecv80211(dev, buf, addInfo);
+ return;
}
#define ZM_AVOID_UDP_LARGE_PACKET_FAIL
-void zfLnxRecvEth(zdev_t* dev, zbuf_t* buf, u16_t port)
+void zfLnxRecvEth(zdev_t *dev, zbuf_t *buf, u16_t port)
{
- struct usbdrv_private *macp = dev->ml_priv;
+ struct usbdrv_private *macp = dev->ml_priv;
#ifdef ZM_AVOID_UDP_LARGE_PACKET_FAIL
- zbuf_t *new_buf;
+ zbuf_t *new_buf;
- //new_buf = dev_alloc_skb(2048);
- new_buf = dev_alloc_skb(buf->len);
+ /* new_buf = dev_alloc_skb(2048); */
+ new_buf = dev_alloc_skb(buf->len);
#ifdef NET_SKBUFF_DATA_USES_OFFSET
- new_buf->tail = 0;
- new_buf->len = 0;
+ new_buf->tail = 0;
+ new_buf->len = 0;
#else
- new_buf->tail = new_buf->data;
- new_buf->len = 0;
+ new_buf->tail = new_buf->data;
+ new_buf->len = 0;
#endif
- skb_put(new_buf, buf->len);
- memcpy(new_buf->data, buf->data, buf->len);
-
- /* Free buffer */
- dev_kfree_skb_any(buf);
-
- if (port == 0)
- {
- new_buf->dev = dev;
- new_buf->protocol = eth_type_trans(new_buf, dev);
- }
- else
- {
- /* VAP */
- if (vap[0].dev != NULL)
- {
- new_buf->dev = vap[0].dev;
- new_buf->protocol = eth_type_trans(new_buf, vap[0].dev);
- }
- else
- {
- new_buf->dev = dev;
- new_buf->protocol = eth_type_trans(new_buf, dev);
- }
- }
-
- new_buf->ip_summed = CHECKSUM_NONE;
- dev->last_rx = jiffies;
-
- switch(netif_rx(new_buf))
+ skb_put(new_buf, buf->len);
+ memcpy(new_buf->data, buf->data, buf->len);
+
+ /* Free buffer */
+ dev_kfree_skb_any(buf);
+
+ if (port == 0) {
+ new_buf->dev = dev;
+ new_buf->protocol = eth_type_trans(new_buf, dev);
+ } else {
+ /* VAP */
+ if (vap[0].dev != NULL) {
+ new_buf->dev = vap[0].dev;
+ new_buf->protocol = eth_type_trans(new_buf, vap[0].dev);
+ } else {
+ new_buf->dev = dev;
+ new_buf->protocol = eth_type_trans(new_buf, dev);
+ }
+ }
+
+ new_buf->ip_summed = CHECKSUM_NONE;
+ dev->last_rx = jiffies;
+
+ switch (netif_rx(new_buf))
#else
- if (port == 0)
- {
- buf->dev = dev;
- buf->protocol = eth_type_trans(buf, dev);
- }
- else
- {
- /* VAP */
- if (vap[0].dev != NULL)
- {
- buf->dev = vap[0].dev;
- buf->protocol = eth_type_trans(buf, vap[0].dev);
- }
- else
- {
- buf->dev = dev;
- buf->protocol = eth_type_trans(buf, dev);
- }
- }
-
- buf->ip_summed = CHECKSUM_NONE;
- dev->last_rx = jiffies;
-
- switch(netif_rx(buf))
+ if (port == 0) {
+ buf->dev = dev;
+ buf->protocol = eth_type_trans(buf, dev);
+ } else {
+ /* VAP */
+ if (vap[0].dev != NULL) {
+ buf->dev = vap[0].dev;
+ buf->protocol = eth_type_trans(buf, vap[0].dev);
+ } else {
+ buf->dev = dev;
+ buf->protocol = eth_type_trans(buf, dev);
+ }
+ }
+
+ buf->ip_summed = CHECKSUM_NONE;
+ dev->last_rx = jiffies;
+
+ switch (netif_rx(buf))
#endif
- {
- case NET_RX_DROP:
- break;
- default:
- macp->drv_stats.net_stats.rx_packets++;
- macp->drv_stats.net_stats.rx_bytes += buf->len;
- break;
- }
-
- return;
+ {
+ case NET_RX_DROP:
+ break;
+ default:
+ macp->drv_stats.net_stats.rx_packets++;
+ macp->drv_stats.net_stats.rx_bytes += buf->len;
+ break;
+ }
+
+ return;
}
/* Leave an empty line below to remove warning message on some compiler */
diff --git a/drivers/staging/otus/wrap_sec.c b/drivers/staging/otus/wrap_sec.c
index 0f780bacc598..0b238e9999bf 100644
--- a/drivers/staging/otus/wrap_sec.c
+++ b/drivers/staging/otus/wrap_sec.c
@@ -33,92 +33,93 @@
#ifdef ZM_ENABLE_CENC
extern int zfLnxCencSendMsg(struct sock *netlink_sk, u_int8_t *msg, int len);
-u16_t zfLnxCencAsocNotify(zdev_t* dev, u16_t* macAddr, u8_t* body, u16_t bodySize, u16_t port)
+u16_t zfLnxCencAsocNotify(zdev_t *dev, u16_t *macAddr, u8_t *body,
+ u16_t bodySize, u16_t port)
{
- struct usbdrv_private *macp = (struct usbdrv_private *)dev->priv;
- struct zydas_cenc_sta_info cenc_info;
- //struct sock *netlink_sk;
- u8_t ie_len;
- int ii;
+ struct usbdrv_private *macp = (struct usbdrv_private *)dev->priv;
+ struct zydas_cenc_sta_info cenc_info;
+ /* struct sock *netlink_sk; */
+ u8_t ie_len;
+ int ii;
- /* Create NETLINK socket */
- //netlink_sk = netlink_kernel_create(NETLINK_USERSOCK, NULL);
+ /* Create NETLINK socket */
+ /*netlink_sk = netlink_kernel_create(NETLINK_USERSOCK, NULL); */
- if (macp->netlink_sk == NULL)
- {
- printk(KERN_ERR "NETLINK Socket is NULL\n");
- return -1;
- }
+ if (macp->netlink_sk == NULL) {
+ printk(KERN_ERR "NETLINK Socket is NULL\n");
+ return -1;
+ }
- memset(&cenc_info, 0, sizeof(cenc_info));
+ memset(&cenc_info, 0, sizeof(cenc_info));
- //memcpy(cenc_info.gsn, vap->iv_cencmsk_keys.wk_txiv, ZM_CENC_IV_LEN);
- zfiWlanQueryGSN(dev, cenc_info.gsn, port);
- cenc_info.datalen += ZM_CENC_IV_LEN;
- ie_len = body[1] + 2;
- memcpy(cenc_info.wie, body, ie_len);
- cenc_info.datalen += ie_len;
+ /* memcpy(cenc_info.gsn, vap->iv_cencmsk_keys.wk_txiv,
+ * ZM_CENC_IV_LEN);
+ */
+ zfiWlanQueryGSN(dev, cenc_info.gsn, port);
+ cenc_info.datalen += ZM_CENC_IV_LEN;
+ ie_len = body[1] + 2;
+ memcpy(cenc_info.wie, body, ie_len);
+ cenc_info.datalen += ie_len;
- memcpy(cenc_info.sta_mac, macAddr, 6);
- cenc_info.msg_type = ZM_CENC_WAI_REQUEST;
- cenc_info.datalen += 6 + 2;
+ memcpy(cenc_info.sta_mac, macAddr, 6);
+ cenc_info.msg_type = ZM_CENC_WAI_REQUEST;
+ cenc_info.datalen += 6 + 2;
- printk(KERN_ERR "===== zfwCencSendMsg, bodySize: %d =====\n", bodySize);
+ printk(KERN_ERR "===== zfwCencSendMsg, bodySize: %d =====\n", bodySize);
- for(ii = 0; ii < bodySize; ii++)
- {
- printk(KERN_ERR "%02x ", body[ii]);
+ for (ii = 0; ii < bodySize; ii++) {
+ printk(KERN_ERR "%02x ", body[ii]);
- if ((ii & 0xf) == 0xf)
- {
- printk(KERN_ERR "\n");
- }
- }
+ if ((ii & 0xf) == 0xf)
+ printk(KERN_ERR "\n");
+ }
- zfLnxCencSendMsg(macp->netlink_sk, (u8_t *)&cenc_info, cenc_info.datalen+4);
+ zfLnxCencSendMsg(macp->netlink_sk, (u8_t *)&cenc_info,
+ cenc_info.datalen+4);
- /* Close NETLINK socket */
- //sock_release(netlink_sk);
+ /* Close NETLINK socket */
+ /* sock_release(netlink_sk); */
- return 0;
+ return 0;
}
-#endif //ZM_ENABLE_CENC
+#endif /* ZM_ENABLE_CENC */
-u8_t zfwCencHandleBeaconProbrespon(zdev_t* dev, u8_t *pWIEc,
- u8_t *pPeerSSIDc, u8_t *pPeerAddrc)
+u8_t zfwCencHandleBeaconProbrespon(zdev_t *dev, u8_t *pWIEc,
+ u8_t *pPeerSSIDc, u8_t *pPeerAddrc)
{
- return 0;
+ return 0;
}
-u8_t zfwGetPktEncExemptionActionType(zdev_t* dev, zbuf_t* buf)
+u8_t zfwGetPktEncExemptionActionType(zdev_t *dev, zbuf_t *buf)
{
- return ZM_ENCRYPTION_EXEMPT_NO_EXEMPTION;
+ return ZM_ENCRYPTION_EXEMPT_NO_EXEMPTION;
}
-void copyToIntTxBuffer(zdev_t* dev, zbuf_t* buf, u8_t* src,
- u16_t offset, u16_t length)
+void copyToIntTxBuffer(zdev_t *dev, zbuf_t *buf, u8_t *src,
+ u16_t offset, u16_t length)
{
- u16_t i;
+ u16_t i;
- for(i=0; i<length;i++)
- {
- //zmw_tx_buf_writeb(dev, buf, offset+i, src[i]);
- *(u8_t*)((u8_t*)buf->data+offset+i) = src[i];
- }
+ for (i = 0; i < length; i++) {
+ /* zmw_tx_buf_writeb(dev, buf, offset+i, src[i]); */
+ *(u8_t *)((u8_t *)buf->data+offset+i) = src[i];
+ }
}
-u16_t zfwStaAddIeWpaRsn(zdev_t* dev, zbuf_t* buf, u16_t offset, u8_t frameType)
+u16_t zfwStaAddIeWpaRsn(zdev_t *dev, zbuf_t *buf, u16_t offset, u8_t frameType)
{
- struct usbdrv_private *macp = dev->ml_priv;
- //zm_msg1_mm(ZM_LV_0, "CWY - add wpaie content Length : ", macp->supIe[1]);
- if (macp->supIe[1] != 0)
- {
- copyToIntTxBuffer(dev, buf, macp->supIe, offset, macp->supIe[1]+2);
- //memcpy(buf->data[offset], macp->supIe, macp->supIe[1]+2);
- offset += (macp->supIe[1]+2);
- }
-
- return offset;
+ struct usbdrv_private *macp = dev->ml_priv;
+ /* zm_msg1_mm(ZM_LV_0, "CWY - add wpaie content Length : "
+ * , macp->supIe[1]);
+ */
+ if (macp->supIe[1] != 0) {
+ copyToIntTxBuffer(dev, buf, macp->supIe, offset,
+ macp->supIe[1]+2);
+ /* memcpy(buf->data[offset], macp->supIe, macp->supIe[1]+2);*/
+ offset += (macp->supIe[1]+2);
+ }
+
+ return offset;
}
/* Leave an empty line below to remove warning message on some compiler */
diff --git a/drivers/staging/otus/wrap_usb.c b/drivers/staging/otus/wrap_usb.c
index 70fd410bc894..6b336ede8867 100644
--- a/drivers/staging/otus/wrap_usb.c
+++ b/drivers/staging/otus/wrap_usb.c
@@ -30,159 +30,152 @@
#include <linux/netlink.h>
#include <net/iw_handler.h>
-extern void zfLnxInitUsbTxQ(zdev_t* dev);
-extern void zfLnxInitUsbRxQ(zdev_t* dev);
+extern void zfLnxInitUsbTxQ(zdev_t *dev);
+extern void zfLnxInitUsbRxQ(zdev_t *dev);
extern u32_t zfLnxSubmitRegInUrb(zdev_t *dev);
-u32_t zfLnxUsbOut(zdev_t* dev, u8_t *hdr, u16_t hdrlen, u8_t *snap, u16_t snapLen,
- u8_t *tail, u16_t tailLen, zbuf_t *buf, u16_t offset);
-u32_t zfLnxUsbWriteReg(zdev_t* dev, u32_t* cmd, u16_t cmdLen);
+u32_t zfLnxUsbOut(zdev_t *dev, u8_t *hdr, u16_t hdrlen, u8_t *snap,
+ u16_t snapLen, u8_t *tail, u16_t tailLen, zbuf_t *buf,
+ u16_t offset);
+u32_t zfLnxUsbWriteReg(zdev_t *dev, u32_t *cmd, u16_t cmdLen);
-void zfwUsbRegisterCallBack(zdev_t* dev, struct zfCbUsbFuncTbl *zfUsbFunc) {
- struct usbdrv_private *macp = dev->ml_priv;
+void zfwUsbRegisterCallBack(zdev_t *dev, struct zfCbUsbFuncTbl *zfUsbFunc)
+{
+ struct usbdrv_private *macp = dev->ml_priv;
- macp->usbCbFunctions.zfcbUsbRecv = zfUsbFunc->zfcbUsbRecv;
- macp->usbCbFunctions.zfcbUsbRegIn = zfUsbFunc->zfcbUsbRegIn;
- macp->usbCbFunctions.zfcbUsbOutComplete = zfUsbFunc->zfcbUsbOutComplete;
+ macp->usbCbFunctions.zfcbUsbRecv = zfUsbFunc->zfcbUsbRecv;
+ macp->usbCbFunctions.zfcbUsbRegIn = zfUsbFunc->zfcbUsbRegIn;
+ macp->usbCbFunctions.zfcbUsbOutComplete = zfUsbFunc->zfcbUsbOutComplete;
- return;
+ return;
}
-u32_t zfwUsbGetFreeTxQSize(zdev_t* dev)
+u32_t zfwUsbGetFreeTxQSize(zdev_t *dev)
{
- struct usbdrv_private *macp = dev->ml_priv;
- u32_t freeTxQSize;
- unsigned long irqFlag;
- //zmw_declare_for_critical_section();
+ struct usbdrv_private *macp = dev->ml_priv;
+ u32_t freeTxQSize;
+ unsigned long irqFlag;
+ /* zmw_declare_for_critical_section(); */
- //zmw_enter_critical_section(dev);
- spin_lock_irqsave(&macp->cs_lock, irqFlag);
+ /* zmw_enter_critical_section(dev); */
+ spin_lock_irqsave(&macp->cs_lock, irqFlag);
- freeTxQSize = ZM_MAX_TX_BUF_NUM - macp->TxBufCnt;
+ freeTxQSize = ZM_MAX_TX_BUF_NUM - macp->TxBufCnt;
- //zmw_leave_critical_section(dev);
- spin_unlock_irqrestore(&macp->cs_lock, irqFlag);
+ /* zmw_leave_critical_section(dev); */
+ spin_unlock_irqrestore(&macp->cs_lock, irqFlag);
- return freeTxQSize;
+ return freeTxQSize;
}
-u32_t zfwUsbGetMaxTxQSize(zdev_t* dev)
+u32_t zfwUsbGetMaxTxQSize(zdev_t *dev)
{
- return ZM_MAX_TX_BUF_NUM;
+ return ZM_MAX_TX_BUF_NUM;
}
u32_t zfwUsbEnableIntEpt(zdev_t *dev, u8_t endpt)
{
- /* Initialize USB TxQ */
- zfLnxInitUsbTxQ(dev);
+ /* Initialize USB TxQ */
+ zfLnxInitUsbTxQ(dev);
- /* Initialize USB RxQ */
- zfLnxInitUsbRxQ(dev);
+ /* Initialize USB RxQ */
+ zfLnxInitUsbRxQ(dev);
- /* Initialize USB Register In URB */
- //zfwUsbSubmitRegIn(dev);
- /* Initialize USB Register In URB */
- zfLnxSubmitRegInUrb(dev);
+ /* Initialize USB Register In URB */
+ /* zfwUsbSubmitRegIn(dev); */
+ /* Initialize USB Register In URB */
+ zfLnxSubmitRegInUrb(dev);
- return 0;
+ return 0;
}
-int zfwUsbEnableRxEpt(zdev_t* dev, u8_t endpt)
+int zfwUsbEnableRxEpt(zdev_t *dev, u8_t endpt)
{
- return 0;
+ return 0;
}
-u32_t zfwUsbSubmitControl(zdev_t* dev, u8_t req, u16_t value, u16_t index, void *data, u32_t size)
+u32_t zfwUsbSubmitControl(zdev_t *dev, u8_t req, u16_t value, u16_t index,
+ void *data, u32_t size)
{
- int result = 0;
- u32_t ret = 0;
- struct usbdrv_private *macp = dev->ml_priv;
- u8_t* buf;
-
- if (size > 0)
- {
- buf = kmalloc(size, GFP_KERNEL);
- memcpy(buf, (u8_t*)data, size);
- }
- else
- {
- buf = NULL;
- }
+ int result = 0;
+ u32_t ret = 0;
+ struct usbdrv_private *macp = dev->ml_priv;
+ u8_t *buf;
+
+ if (size > 0) {
+ buf = kmalloc(size, GFP_KERNEL);
+ memcpy(buf, (u8_t *)data, size);
+ } else
+ buf = NULL;
#if 0
- printk(KERN_ERR "req = 0x%02x\n", req);
- printk(KERN_ERR "value = 0x%04x\n", value);
- printk(KERN_ERR "index = 0x%04x\n", index);
- printk(KERN_ERR "data = 0x%lx\n", (u32_t) data);
- printk(KERN_ERR "size = %ld\n", size);
+ printk(KERN_ERR "req = 0x%02x\n", req);
+ printk(KERN_ERR "value = 0x%04x\n", value);
+ printk(KERN_ERR "index = 0x%04x\n", index);
+ printk(KERN_ERR "data = 0x%lx\n", (u32_t) data);
+ printk(KERN_ERR "size = %ld\n", size);
#endif
- result = usb_control_msg(macp->udev, usb_sndctrlpipe(macp->udev, 0),
- req, USB_DIR_OUT | 0x40, value, index, buf, size, HZ);
+ result = usb_control_msg(macp->udev, usb_sndctrlpipe(macp->udev, 0),
+ req, USB_DIR_OUT | 0x40, value, index, buf, size, HZ);
- if (result < 0)
- {
- printk("zfwUsbSubmitControl() failed, result=0x%x\n", result);
- ret = 1;
- }
- kfree(buf);
+ if (result < 0) {
+ printk(KERN_ERR "zfwUsbSubmitControl() failed, result = 0x%x\n",
+ result);
+ ret = 1;
+ }
+ kfree(buf);
- return ret;
+ return ret;
}
-void zfwUsbCmd(zdev_t* dev, u8_t endpt, u32_t* cmd, u16_t cmdLen)
+void zfwUsbCmd(zdev_t *dev, u8_t endpt, u32_t *cmd, u16_t cmdLen)
{
- struct usbdrv_private *macp = dev->ml_priv;
- u32_t ret;
-
- //MPUsbCommand(dev, endpt, cmd, cmdLen);
- ret = zfLnxUsbWriteReg(dev, cmd, cmdLen);
-
- /* if zfLnxUsbWriteReg() return error, free and allocate urb, resend again */
- if (ret != 0)
- {
- usb_free_urb(macp->RegOutUrb);
- macp->RegOutUrb = usb_alloc_urb(0, GFP_ATOMIC);
- ret = zfLnxUsbWriteReg(dev, cmd, cmdLen);
- }
+ struct usbdrv_private *macp = dev->ml_priv;
+ u32_t ret;
+
+ /* MPUsbCommand(dev, endpt, cmd, cmdLen); */
+ ret = zfLnxUsbWriteReg(dev, cmd, cmdLen);
+
+ /*
+ * if zfLnxUsbWriteReg() return error, free and allocate urb,
+ * resend again
+ */
+ if (ret != 0) {
+ usb_free_urb(macp->RegOutUrb);
+ macp->RegOutUrb = usb_alloc_urb(0, GFP_ATOMIC);
+ ret = zfLnxUsbWriteReg(dev, cmd, cmdLen);
+ }
}
-u32_t zfwUsbSend(zdev_t* dev, u8_t endpt, u8_t *hdr, u16_t hdrlen, u8_t *snap, u16_t snapLen,
- u8_t *tail, u16_t tailLen, zbuf_t *buf, u16_t offset)
+u32_t zfwUsbSend(zdev_t *dev, u8_t endpt, u8_t *hdr, u16_t hdrlen, u8_t *snap,
+ u16_t snapLen, u8_t *tail, u16_t tailLen,
+ zbuf_t *buf, u16_t offset)
{
- u32_t status;
+ u32_t status;
#ifdef ZM_CONFIG_BIG_ENDIAN
- u32_t ii = 0;
- u16_t *pc = NULL;
-
- pc = (u16_t *)hdr;
- for(ii=0; ii<(hdrlen>>1); ii++)
- {
- pc[ii] = cpu_to_le16(pc[ii]);
- }
-
- pc = (u16_t *)snap;
- for(ii=0; ii<(snapLen>>1); ii++)
- {
- pc[ii] = cpu_to_le16(pc[ii]);
- }
-
- pc = (u16_t *)tail;
- for(ii=0; ii<(tailLen>>1); ii++)
- {
- pc[ii] = cpu_to_le16(pc[ii]);
- }
+ u32_t ii = 0;
+ u16_t *pc = NULL;
+
+ pc = (u16_t *)hdr;
+ for (ii = 0; ii < (hdrlen >> 1); ii++)
+ pc[ii] = cpu_to_le16(pc[ii]);
+
+ pc = (u16_t *)snap;
+ for (ii = 0; ii < (snapLen >> 1); ii++)
+ pc[ii] = cpu_to_le16(pc[ii]);
+
+ pc = (u16_t *)tail;
+ for (ii = 0; ii < (tailLen>>1); ii++)
+ pc[ii] = cpu_to_le16(pc[ii]);
#endif
- status = zfLnxUsbOut(dev, hdr, hdrlen, snap, snapLen, tail, tailLen, buf, offset);
- if ( status == 0 )
- {
- return 0;
- }
- else
- {
- return 1;
- }
+ status = zfLnxUsbOut(dev, hdr, hdrlen, snap, snapLen, tail, tailLen,
+ buf, offset);
+ if (status == 0)
+ return 0;
+ else
+ return 1;
}
/* Leave an empty line below to remove warning message on some compiler */
diff --git a/drivers/staging/otus/zdcompat.h b/drivers/staging/otus/zdcompat.h
index 84ac43356b77..cdcaef54afcd 100644
--- a/drivers/staging/otus/zdcompat.h
+++ b/drivers/staging/otus/zdcompat.h
@@ -17,7 +17,7 @@
/* Module Name : zdcompat.h */
/* */
/* Abstract */
-/* This module contains function defintion for compatibility. */
+/* This module contains function definition for compatibility. */
/* */
/* NOTES */
/* Platform dependent. */
diff --git a/drivers/staging/otus/zdusb.h b/drivers/staging/otus/zdusb.h
index 9f8ab2e96169..97e4ef09567a 100644
--- a/drivers/staging/otus/zdusb.h
+++ b/drivers/staging/otus/zdusb.h
@@ -34,10 +34,10 @@
#define VERSIONID "0.0.0.999"
/* Define these values to match your device */
-#define VENDOR_ATHR 0x0CF3 //Atheros
+#define VENDOR_ATHR 0x0CF3 /* Atheros */
#define PRODUCT_AR9170 0x9170
-#define VENDOR_DLINK 0x07D1 //Dlink
+#define VENDOR_DLINK 0x07D1 /* Dlink */
#define PRODUCT_DWA160A 0x3C10
#define VENDOR_NETGEAR 0x0846 /* NetGear */
Copyright © 1996 – 2023 Jason A. Donenfeld. All Rights Reverse Engineered.