From d9811b79d4e13fc82a55ce3ae19dda531cd759f5 Mon Sep 17 00:00:00 2001 From: Daniele Boncompagni Date: Sun, 1 Aug 2010 18:41:21 +0200 Subject: [PATCH 521/524] Staging: comedi : fix brace coding style issue in wwrap.c This is a patch to the wwrap.c file that fixes up a brace warnings and other errors found by the checkpatch.pl tool. Signed-off-by: Daniele Boncompagni Signed-off-by: Greg Kroah-Hartman --- drivers/staging/otus/wwrap.c | 968 +++++++++++++++++++----------------------- 1 files changed, 446 insertions(+), 522 deletions(-) diff --git a/drivers/staging/otus/wwrap.c b/drivers/staging/otus/wwrap.c index b02eb42..fcd3da0 100644 --- a/drivers/staging/otus/wwrap.c +++ b/drivers/staging/otus/wwrap.c @@ -29,24 +29,24 @@ #include #include -extern void zfiRecv80211(zdev_t* dev, zbuf_t* buf, struct zsAdditionInfo* addInfo); -extern void zfCoreRecv(zdev_t* dev, zbuf_t* buf, struct zsAdditionInfo* addInfo); -extern void zfIdlChkRsp(zdev_t* dev, u32_t* rsp, u16_t rspLen); -extern void zfIdlRsp(zdev_t* dev, u32_t *rsp, u16_t rspLen); +extern void zfiRecv80211(zdev_t *dev, zbuf_t *buf, struct zsAdditionInfo *addInfo); +extern void zfCoreRecv(zdev_t *dev, zbuf_t *buf, struct zsAdditionInfo *addInfo); +extern void zfIdlChkRsp(zdev_t *dev, u32_t *rsp, u16_t rspLen); +extern void zfIdlRsp(zdev_t *dev, u32_t *rsp, u16_t rspLen); -//extern struct zsWdsStruct wds[ZM_WDS_PORT_NUMBER]; +/*extern struct zsWdsStruct wds[ZM_WDS_PORT_NUMBER];*/ extern struct zsVapStruct vap[ZM_VAP_PORT_NUMBER]; -u32_t zfLnxUsbSubmitTxData(zdev_t* dev); -u32_t zfLnxUsbIn(zdev_t* dev, urb_t *urb, zbuf_t *buf); +u32_t zfLnxUsbSubmitTxData(zdev_t *dev); +u32_t zfLnxUsbIn(zdev_t *dev, urb_t *urb, zbuf_t *buf); u32_t zfLnxSubmitRegInUrb(zdev_t *dev); u32_t zfLnxUsbSubmitBulkUrb(urb_t *urb, struct usb_device *usb, u16_t epnum, u16_t direction, - void *transfer_buffer, int buffer_length, usb_complete_t complete, void *context); + void *transfer_buffer, int buffer_length, usb_complete_t complete, void *context); u32_t zfLnxUsbSubmitIntUrb(urb_t *urb, struct usb_device *usb, u16_t epnum, u16_t direction, - void *transfer_buffer, int buffer_length, usb_complete_t complete, void *context, - u32_t interval); + void *transfer_buffer, int buffer_length, usb_complete_t complete, void *context, + u32_t interval); u16_t zfLnxGetFreeTxUrb(zdev_t *dev) { @@ -56,22 +56,19 @@ u16_t zfLnxGetFreeTxUrb(zdev_t *dev) spin_lock_irqsave(&macp->cs_lock, irqFlag); - //idx = ((macp->TxUrbTail + 1) & (ZM_MAX_TX_URB_NUM - 1)); + /*idx = ((macp->TxUrbTail + 1) & (ZM_MAX_TX_URB_NUM - 1));*/ - //if (idx != macp->TxUrbHead) - if (macp->TxUrbCnt != 0) - { - idx = macp->TxUrbTail; - macp->TxUrbTail = ((macp->TxUrbTail + 1) & (ZM_MAX_TX_URB_NUM - 1)); - macp->TxUrbCnt--; - } - else - { - //printk(KERN_ERR "macp->TxUrbCnt: %d\n", macp->TxUrbCnt); - idx = 0xffff; - } + /*if (idx != macp->TxUrbHead)*/ + if (macp->TxUrbCnt != 0) { + idx = macp->TxUrbTail; + macp->TxUrbTail = ((macp->TxUrbTail + 1) & (ZM_MAX_TX_URB_NUM - 1)); + macp->TxUrbCnt--; + } else { + /*printk(KERN_ERR "macp->TxUrbCnt: %d\n", macp->TxUrbCnt);*/ + idx = 0xffff; + } - spin_unlock_irqrestore(&macp->cs_lock, irqFlag); + spin_unlock_irqrestore(&macp->cs_lock, irqFlag); return idx; } @@ -85,16 +82,13 @@ void zfLnxPutTxUrb(zdev_t *dev) idx = ((macp->TxUrbHead + 1) & (ZM_MAX_TX_URB_NUM - 1)); - //if (idx != macp->TxUrbTail) - if (macp->TxUrbCnt < ZM_MAX_TX_URB_NUM) - { - macp->TxUrbHead = idx; - macp->TxUrbCnt++; - } - else - { - printk("UsbTxUrbQ inconsistent: TxUrbHead: %d, TxUrbTail: %d\n", - macp->TxUrbHead, macp->TxUrbTail); + /*if (idx != macp->TxUrbTail)*/ + if (macp->TxUrbCnt < ZM_MAX_TX_URB_NUM) { + macp->TxUrbHead = idx; + macp->TxUrbCnt++; + } else { + printk("UsbTxUrbQ inconsistent: TxUrbHead: %d, TxUrbTail: %d\n", + macp->TxUrbHead, macp->TxUrbTail); } spin_unlock_irqrestore(&macp->cs_lock, irqFlag); @@ -125,24 +119,20 @@ UsbTxQ_t *zfLnxGetUsbTxBuffer(zdev_t *dev) idx = ((macp->TxBufHead+1) & (ZM_MAX_TX_BUF_NUM - 1)); - //if (idx != macp->TxBufTail) - if (macp->TxBufCnt > 0) - { - //printk("CWY - zfwGetUsbTxBuffer ,macp->TxBufCnt = %d\n", macp->TxBufCnt); - TxQ = (UsbTxQ_t *)&(macp->UsbTxBufQ[macp->TxBufHead]); - macp->TxBufHead = ((macp->TxBufHead+1) & (ZM_MAX_TX_BUF_NUM - 1)); - macp->TxBufCnt--; - } - else - { - if (macp->TxBufHead != macp->TxBufTail) - { - printk(KERN_ERR "zfwGetUsbTxBuf UsbTxBufQ inconsistent: TxBufHead: %d, TxBufTail: %d\n", - macp->TxBufHead, macp->TxBufTail); - } - - spin_unlock_irqrestore(&macp->cs_lock, irqFlag); - return NULL; + /*if (idx != macp->TxBufTail)*/ + if (macp->TxBufCnt > 0) { + /*printk("CWY - zfwGetUsbTxBuffer ,macp->TxBufCnt = %d\n", macp->TxBufCnt);*/ + TxQ = (UsbTxQ_t *)&(macp->UsbTxBufQ[macp->TxBufHead]); + macp->TxBufHead = ((macp->TxBufHead+1) & (ZM_MAX_TX_BUF_NUM - 1)); + macp->TxBufCnt--; + } else { + if (macp->TxBufHead != macp->TxBufTail) { + printk(KERN_ERR "zfwGetUsbTxBuf UsbTxBufQ inconsistent: TxBufHead: %d, TxBufTail: %d\n", + macp->TxBufHead, macp->TxBufTail); + } + + spin_unlock_irqrestore(&macp->cs_lock, irqFlag); + return NULL; } spin_unlock_irqrestore(&macp->cs_lock, irqFlag); @@ -150,8 +140,8 @@ UsbTxQ_t *zfLnxGetUsbTxBuffer(zdev_t *dev) } u16_t zfLnxPutUsbTxBuffer(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) + u8_t *snap, u16_t snapLen, u8_t *tail, u16_t tailLen, + zbuf_t *buf, u16_t offset) { struct usbdrv_private *macp = dev->ml_priv; u16_t idx; @@ -163,32 +153,29 @@ u16_t zfLnxPutUsbTxBuffer(zdev_t *dev, u8_t *hdr, u16_t hdrlen, idx = ((macp->TxBufTail+1) & (ZM_MAX_TX_BUF_NUM - 1)); /* For Tx debug */ - //zm_assert(macp->TxBufCnt >= 0); // deleted because of always true - - //if (idx != macp->TxBufHead) - if (macp->TxBufCnt < ZM_MAX_TX_BUF_NUM) - { - //printk("CWY - zfwPutUsbTxBuffer ,macp->TxBufCnt = %d\n", macp->TxBufCnt); - TxQ = (UsbTxQ_t *)&(macp->UsbTxBufQ[macp->TxBufTail]); - memcpy(TxQ->hdr, hdr, hdrlen); - TxQ->hdrlen = hdrlen; - memcpy(TxQ->snap, snap, snapLen); - TxQ->snapLen = snapLen; - memcpy(TxQ->tail, tail, tailLen); - TxQ->tailLen = tailLen; - TxQ->buf = buf; - TxQ->offset = offset; - - macp->TxBufTail = ((macp->TxBufTail+1) & (ZM_MAX_TX_BUF_NUM - 1)); - macp->TxBufCnt++; - } - else - { - printk(KERN_ERR "zfLnxPutUsbTxBuffer UsbTxBufQ inconsistent: TxBufHead: %d, TxBufTail: %d, TxBufCnt: %d\n", - macp->TxBufHead, macp->TxBufTail, macp->TxBufCnt); - spin_unlock_irqrestore(&macp->cs_lock, irqFlag); - return 0xffff; - } + /*zm_assert(macp->TxBufCnt >= 0); // deleted because of always true*/ + + /*if (idx != macp->TxBufHead)*/ + if (macp->TxBufCnt < ZM_MAX_TX_BUF_NUM) { + /*printk("CWY - zfwPutUsbTxBuffer ,macp->TxBufCnt = %d\n", macp->TxBufCnt);*/ + TxQ = (UsbTxQ_t *)&(macp->UsbTxBufQ[macp->TxBufTail]); + memcpy(TxQ->hdr, hdr, hdrlen); + TxQ->hdrlen = hdrlen; + memcpy(TxQ->snap, snap, snapLen); + TxQ->snapLen = snapLen; + memcpy(TxQ->tail, tail, tailLen); + TxQ->tailLen = tailLen; + TxQ->buf = buf; + TxQ->offset = offset; + + macp->TxBufTail = ((macp->TxBufTail+1) & (ZM_MAX_TX_BUF_NUM - 1)); + macp->TxBufCnt++; + } else { + printk(KERN_ERR "zfLnxPutUsbTxBuffer UsbTxBufQ inconsistent: TxBufHead: %d, TxBufTail: %d, TxBufCnt: %d\n", + macp->TxBufHead, macp->TxBufTail, macp->TxBufCnt); + spin_unlock_irqrestore(&macp->cs_lock, irqFlag); + return 0xffff; + } spin_unlock_irqrestore(&macp->cs_lock, irqFlag); return 0; @@ -197,28 +184,25 @@ u16_t zfLnxPutUsbTxBuffer(zdev_t *dev, u8_t *hdr, u16_t hdrlen, zbuf_t *zfLnxGetUsbRxBuffer(zdev_t *dev) { struct usbdrv_private *macp = dev->ml_priv; - //u16_t idx; + /*u16_t idx;*/ zbuf_t *buf; unsigned long irqFlag; spin_lock_irqsave(&macp->cs_lock, irqFlag); - //idx = ((macp->RxBufHead+1) & (ZM_MAX_RX_URB_NUM - 1)); - - //if (idx != macp->RxBufTail) - if (macp->RxBufCnt != 0) - { - buf = macp->UsbRxBufQ[macp->RxBufHead]; - macp->RxBufHead = ((macp->RxBufHead+1) & (ZM_MAX_RX_URB_NUM - 1)); - macp->RxBufCnt--; - } - else - { - printk("RxBufQ inconsistent: RxBufHead: %d, RxBufTail: %d\n", - macp->RxBufHead, macp->RxBufTail); - spin_unlock_irqrestore(&macp->cs_lock, irqFlag); - return NULL; - } + /*idx = ((macp->RxBufHead+1) & (ZM_MAX_RX_URB_NUM - 1));*/ + + /*if (idx != macp->RxBufTail)*/ + if (macp->RxBufCnt != 0) { + buf = macp->UsbRxBufQ[macp->RxBufHead]; + macp->RxBufHead = ((macp->RxBufHead+1) & (ZM_MAX_RX_URB_NUM - 1)); + macp->RxBufCnt--; + } else { + printk("RxBufQ inconsistent: RxBufHead: %d, RxBufTail: %d\n", + macp->RxBufHead, macp->RxBufTail); + spin_unlock_irqrestore(&macp->cs_lock, irqFlag); + return NULL; + } spin_unlock_irqrestore(&macp->cs_lock, irqFlag); return buf; @@ -234,61 +218,56 @@ u32_t zfLnxPutUsbRxBuffer(zdev_t *dev, zbuf_t *buf) idx = ((macp->RxBufTail+1) & (ZM_MAX_RX_URB_NUM - 1)); - //if (idx != macp->RxBufHead) - if (macp->RxBufCnt != ZM_MAX_RX_URB_NUM) - { - macp->UsbRxBufQ[macp->RxBufTail] = buf; - macp->RxBufTail = idx; - macp->RxBufCnt++; - } - else - { - printk("RxBufQ inconsistent: RxBufHead: %d, RxBufTail: %d\n", - macp->RxBufHead, macp->RxBufTail); - spin_unlock_irqrestore(&macp->cs_lock, irqFlag); - return 0xffff; - } + /*if (idx != macp->RxBufHead)*/ + if (macp->RxBufCnt != ZM_MAX_RX_URB_NUM) { + macp->UsbRxBufQ[macp->RxBufTail] = buf; + macp->RxBufTail = idx; + macp->RxBufCnt++; + } else { + printk("RxBufQ inconsistent: RxBufHead: %d, RxBufTail: %d\n", + macp->RxBufHead, macp->RxBufTail); + spin_unlock_irqrestore(&macp->cs_lock, irqFlag); + return 0xffff; + } - spin_unlock_irqrestore(&macp->cs_lock, irqFlag); - return 0; + spin_unlock_irqrestore(&macp->cs_lock, irqFlag); + return 0; } void zfLnxUsbDataOut_callback(urb_t *urb) { - zdev_t* dev = urb->context; - //UsbTxQ_t *TxData; + zdev_t *dev = urb->context; + /*UsbTxQ_t *TxData;*/ /* Give the urb back */ zfLnxPutTxUrb(dev); /* Check whether there is any pending buffer needed */ /* to be sent */ - if (zfLnxCheckTxBufferCnt(dev) != 0) - { - //TxData = zfwGetUsbTxBuffer(dev); - - //if (TxData == NULL) - //{ - // printk("Get a NULL buffer from zfwGetUsbTxBuffer\n"); - // return; - //} - //else - //{ - zfLnxUsbSubmitTxData(dev); - //} + if (zfLnxCheckTxBufferCnt(dev) != 0) { + /*TxData = zfwGetUsbTxBuffer(dev); + //if (TxData == NULL) + //{ + // printk("Get a NULL buffer from zfwGetUsbTxBuffer\n"); + // return; + //} + //else + //{ + zfLnxUsbSubmitTxData(dev); + //}*/ } } void zfLnxUsbDataIn_callback(urb_t *urb) { - zdev_t* dev = urb->context; + zdev_t *dev = urb->context; struct usbdrv_private *macp = dev->ml_priv; zbuf_t *buf; zbuf_t *new_buf; int status; #if ZM_USB_STREAM_MODE == 1 - static int remain_len = 0, check_pad = 0, check_len = 0; + static int remain_len, check_pad, check_len; int index = 0; int chk_idx; u16_t pkt_len; @@ -299,47 +278,45 @@ void zfLnxUsbDataIn_callback(urb_t *urb) #endif /* Check status for URB */ - if (urb->status != 0){ - printk("zfLnxUsbDataIn_callback() : status=0x%x\n", urb->status); - if ((urb->status != -ENOENT) && (urb->status != -ECONNRESET) - && (urb->status != -ESHUTDOWN)) - { - if (urb->status == -EPIPE){ - //printk(KERN_ERR "nonzero read bulk status received: -EPIPE"); - status = -1; - } - - if (urb->status == -EPROTO){ - //printk(KERN_ERR "nonzero read bulk status received: -EPROTO"); - status = -1; - } - } - - //printk(KERN_ERR "urb->status: 0x%08x\n", urb->status); - - /* Dequeue skb buffer */ - buf = zfLnxGetUsbRxBuffer(dev); - dev_kfree_skb_any(buf); - #if 0 - /* Enqueue skb buffer */ - zfLnxPutUsbRxBuffer(dev, buf); - - /* Submit a Rx urb */ - zfLnxUsbIn(dev, urb, buf); - #endif - return; - } + if (urb->status != 0) { + printk("zfLnxUsbDataIn_callback() : status=0x%x\n", urb->status); + if ((urb->status != -ENOENT) && (urb->status != -ECONNRESET) + && (urb->status != -ESHUTDOWN)) { + if (urb->status == -EPIPE) { + /*printk(KERN_ERR "nonzero read bulk status received: -EPIPE");*/ + status = -1; + } + + if (urb->status == -EPROTO) { + /*printk(KERN_ERR "nonzero read bulk status received: -EPROTO");*/ + status = -1; + } + } + + /*printk(KERN_ERR "urb->status: 0x%08x\n", urb->status);*/ + + /* Dequeue skb buffer */ + buf = zfLnxGetUsbRxBuffer(dev); + dev_kfree_skb_any(buf); + #if 0 + /* Enqueue skb buffer */ + zfLnxPutUsbRxBuffer(dev, buf); - if (urb->actual_length == 0) - { - printk(KERN_ERR "Get an URB whose length is zero"); - status = -1; + /* Submit a Rx urb */ + zfLnxUsbIn(dev, urb, buf); + #endif + return; + } + + if (urb->actual_length == 0) { + printk(KERN_ERR "Get an URB whose length is zero"); + status = -1; } /* Dequeue skb buffer */ buf = zfLnxGetUsbRxBuffer(dev); - //zfwBufSetSize(dev, buf, urb->actual_length); + /*zfwBufSetSize(dev, buf, urb->actual_length);*/ #ifdef NET_SKBUFF_DATA_USES_OFFSET buf->tail = 0; buf->len = 0; @@ -353,134 +330,122 @@ void zfLnxUsbDataIn_callback(urb_t *urb) skb_put(buf, urb->actual_length); #if ZM_USB_STREAM_MODE == 1 - if (remain_len != 0) - { - zbuf_t *remain_buf = macp->reamin_buf; + if (remain_len != 0) { + zbuf_t *remain_buf = macp->reamin_buf; - index = remain_len; - remain_len -= check_pad; + index = remain_len; + remain_len -= check_pad; - /* Copy data */ - memcpy(&(remain_buf->data[check_len]), buf->data, remain_len); - check_len += remain_len; - remain_len = 0; + /* Copy data */ + memcpy(&(remain_buf->data[check_len]), buf->data, remain_len); + check_len += remain_len; + remain_len = 0; - rxBufPool[rxBufPoolIndex++] = remain_buf; + rxBufPool[rxBufPoolIndex++] = remain_buf; } - while(index < urb->actual_length) - { - pkt_len = buf->data[index] + (buf->data[index+1] << 8); - pkt_tag = buf->data[index+2] + (buf->data[index+3] << 8); - - if (pkt_tag == 0x4e00) - { - int pad_len; - - //printk("Get a packet, index: %d, pkt_len: 0x%04x\n", index, pkt_len); - #if 0 - /* Dump data */ - for (ii = index; ii < pkt_len+4;) - { - printk("%02x ", (buf->data[ii] & 0xff)); - - if ((++ii % 16) == 0) - printk("\n"); - } - - printk("\n"); - #endif - - pad_len = 4 - (pkt_len & 0x3); - - if(pad_len == 4) - pad_len = 0; - - chk_idx = index; - index = index + 4 + pkt_len + pad_len; - - if (index > ZM_MAX_RX_BUFFER_SIZE) - { - remain_len = index - ZM_MAX_RX_BUFFER_SIZE; // - pad_len; - check_len = ZM_MAX_RX_BUFFER_SIZE - chk_idx - 4; - check_pad = pad_len; - - /* Allocate a skb buffer */ - //new_buf = zfwBufAllocate(dev, ZM_MAX_RX_BUFFER_SIZE); - new_buf = dev_alloc_skb(ZM_MAX_RX_BUFFER_SIZE); - - /* Set skb buffer length */ - #ifdef NET_SKBUFF_DATA_USES_OFFSET - new_buf->tail = 0; - new_buf->len = 0; - #else - new_buf->tail = new_buf->data; - new_buf->len = 0; - #endif - - skb_put(new_buf, pkt_len); - - /* Copy the buffer */ - memcpy(new_buf->data, &(buf->data[chk_idx+4]), check_len); - - /* Record the buffer pointer */ - macp->reamin_buf = new_buf; - } - else - { - #ifdef ZM_DONT_COPY_RX_BUFFER - if (rxBufPoolIndex == 0) - { - new_buf = skb_clone(buf, GFP_ATOMIC); - - new_buf->data = &(buf->data[chk_idx+4]); - new_buf->len = pkt_len; - } - else - { - #endif - /* Allocate a skb buffer */ - new_buf = dev_alloc_skb(ZM_MAX_RX_BUFFER_SIZE); - - /* Set skb buffer length */ - #ifdef NET_SKBUFF_DATA_USES_OFFSET - new_buf->tail = 0; - new_buf->len = 0; - #else - new_buf->tail = new_buf->data; - new_buf->len = 0; - #endif - - skb_put(new_buf, pkt_len); - - /* Copy the buffer */ - memcpy(new_buf->data, &(buf->data[chk_idx+4]), pkt_len); - - #ifdef ZM_DONT_COPY_RX_BUFFER - } - #endif - rxBufPool[rxBufPoolIndex++] = new_buf; - } - } - else - { - printk(KERN_ERR "Can't find tag, pkt_len: 0x%04x, tag: 0x%04x\n", pkt_len, pkt_tag); - - /* Free buffer */ - dev_kfree_skb_any(buf); - - /* Allocate a skb buffer */ - new_buf = dev_alloc_skb(ZM_MAX_RX_BUFFER_SIZE); - - /* Enqueue skb buffer */ - zfLnxPutUsbRxBuffer(dev, new_buf); - - /* Submit a Rx urb */ - zfLnxUsbIn(dev, urb, new_buf); - - return; - } - } + while (index < urb->actual_length) { + pkt_len = buf->data[index] + (buf->data[index+1] << 8); + pkt_tag = buf->data[index+2] + (buf->data[index+3] << 8); + + if (pkt_tag == 0x4e00) { + int pad_len; + + /*printk("Get a packet, index: %d, pkt_len: 0x%04x\n", index, pkt_len);*/ + #if 0 + /* Dump data */ + for (ii = index; ii < pkt_len+4;) { + printk("%02x ", (buf->data[ii] & 0xff)); + + if ((++ii % 16) == 0) + printk("\n"); + } + + printk("\n"); + #endif + + pad_len = 4 - (pkt_len & 0x3); + + if (pad_len == 4) + pad_len = 0; + + chk_idx = index; + index = index + 4 + pkt_len + pad_len; + + if (index > ZM_MAX_RX_BUFFER_SIZE) { + remain_len = index - ZM_MAX_RX_BUFFER_SIZE; /* - pad_len;*/ + check_len = ZM_MAX_RX_BUFFER_SIZE - chk_idx - 4; + check_pad = pad_len; + + /* Allocate a skb buffer */ + /*new_buf = zfwBufAllocate(dev, ZM_MAX_RX_BUFFER_SIZE);*/ + new_buf = dev_alloc_skb(ZM_MAX_RX_BUFFER_SIZE); + + /* Set skb buffer length */ + #ifdef NET_SKBUFF_DATA_USES_OFFSET + new_buf->tail = 0; + new_buf->len = 0; + #else + new_buf->tail = new_buf->data; + new_buf->len = 0; + #endif + + skb_put(new_buf, pkt_len); + + /* Copy the buffer */ + memcpy(new_buf->data, &(buf->data[chk_idx+4]), check_len); + + /* Record the buffer pointer */ + macp->reamin_buf = new_buf; + } else { + #ifdef ZM_DONT_COPY_RX_BUFFER + if (rxBufPoolIndex == 0) { + new_buf = skb_clone(buf, GFP_ATOMIC); + + new_buf->data = &(buf->data[chk_idx+4]); + new_buf->len = pkt_len; + } else { + #endif + /* Allocate a skb buffer */ + new_buf = dev_alloc_skb(ZM_MAX_RX_BUFFER_SIZE); + + /* Set skb buffer length */ + #ifdef NET_SKBUFF_DATA_USES_OFFSET + new_buf->tail = 0; + new_buf->len = 0; + #else + new_buf->tail = new_buf->data; + new_buf->len = 0; + #endif + + skb_put(new_buf, pkt_len); + + /* Copy the buffer */ + memcpy(new_buf->data, &(buf->data[chk_idx+4]), pkt_len); + + #ifdef ZM_DONT_COPY_RX_BUFFER + } + #endif + rxBufPool[rxBufPoolIndex++] = new_buf; + } + } else { + printk(KERN_ERR "Can't find tag, pkt_len: 0x%04x, tag: 0x%04x\n", pkt_len, pkt_tag); + + /* Free buffer */ + dev_kfree_skb_any(buf); + + /* Allocate a skb buffer */ + new_buf = dev_alloc_skb(ZM_MAX_RX_BUFFER_SIZE); + + /* Enqueue skb buffer */ + zfLnxPutUsbRxBuffer(dev, new_buf); + + /* Submit a Rx urb */ + zfLnxUsbIn(dev, urb, new_buf); + + return; + } + } /* Free buffer */ dev_kfree_skb_any(buf); @@ -496,9 +461,8 @@ void zfLnxUsbDataIn_callback(urb_t *urb) zfLnxUsbIn(dev, urb, new_buf); #if ZM_USB_STREAM_MODE == 1 - for(ii = 0; ii < rxBufPoolIndex; ii++) - { - macp->usbCbFunctions.zfcbUsbRecv(dev, rxBufPool[ii]); + for (ii = 0; ii < rxBufPoolIndex; ii++) { + macp->usbCbFunctions.zfcbUsbRecv(dev, rxBufPool[ii]); } #else /* pass data to upper layer */ @@ -508,51 +472,48 @@ void zfLnxUsbDataIn_callback(urb_t *urb) void zfLnxUsbRegOut_callback(urb_t *urb) { - //dev_t* dev = urb->context; + /*dev_t* dev = urb->context;*/ - //printk(KERN_ERR "zfwUsbRegOut_callback\n"); + /*printk(KERN_ERR "zfwUsbRegOut_callback\n");*/ } void zfLnxUsbRegIn_callback(urb_t *urb) { - zdev_t* dev = urb->context; + zdev_t *dev = urb->context; u32_t rsp[64/4]; int status; struct usbdrv_private *macp = dev->ml_priv; /* Check status for URB */ - if (urb->status != 0){ - printk("zfLnxUsbRegIn_callback() : status=0x%x\n", urb->status); - if ((urb->status != -ENOENT) && (urb->status != -ECONNRESET) - && (urb->status != -ESHUTDOWN)) - { - if (urb->status == -EPIPE){ - //printk(KERN_ERR "nonzero read bulk status received: -EPIPE"); - status = -1; - } - - if (urb->status == -EPROTO){ - //printk(KERN_ERR "nonzero read bulk status received: -EPROTO"); - status = -1; - } - } - - //printk(KERN_ERR "urb->status: 0x%08x\n", urb->status); - return; - } + if (urb->status != 0) { + printk("zfLnxUsbRegIn_callback() : status=0x%x\n", urb->status); + if ((urb->status != -ENOENT) && (urb->status != -ECONNRESET) && (urb->status != -ESHUTDOWN)) { + if (urb->status == -EPIPE) { + /*printk(KERN_ERR "nonzero read bulk status received: -EPIPE");*/ + status = -1; + } + + if (urb->status == -EPROTO) { + /*printk(KERN_ERR "nonzero read bulk status received: -EPROTO");*/ + status = -1; + } + } + + /*printk(KERN_ERR "urb->status: 0x%08x\n", urb->status);*/ + return; + } - if (urb->actual_length == 0) - { - printk(KERN_ERR "Get an URB whose length is zero"); - status = -1; + if (urb->actual_length == 0) { + printk(KERN_ERR "Get an URB whose length is zero"); + status = -1; } /* Copy data into respone buffer */ memcpy(rsp, macp->regUsbReadBuf, urb->actual_length); /* Notify to upper layer */ - //zfIdlChkRsp(dev, rsp, (u16_t)urb->actual_length); - //zfiUsbRegIn(dev, rsp, (u16_t)urb->actual_length); + /*zfIdlChkRsp(dev, rsp, (u16_t)urb->actual_length);*/ + /*zfiUsbRegIn(dev, rsp, (u16_t)urb->actual_length);*/ macp->usbCbFunctions.zfcbUsbRegIn(dev, rsp, (u16_t)urb->actual_length); /* Issue another USB IN URB */ @@ -564,22 +525,22 @@ u32_t zfLnxSubmitRegInUrb(zdev_t *dev) u32_t ret; struct usbdrv_private *macp = dev->ml_priv; - /* Submit a rx urb */ + /* Submit a rx urb //ret = zfLnxUsbSubmitBulkUrb(macp->RegInUrb, macp->udev, // USB_REG_IN_PIPE, USB_DIR_IN, macp->regUsbReadBuf, // ZM_USB_REG_MAX_BUF_SIZE, zfLnxUsbRegIn_callback, dev); //CWYang(-) //if (ret != 0) - // printk("zfwUsbSubmitBulkUrb fail, status: 0x%08x\n", (int)ret); + // printk("zfwUsbSubmitBulkUrb fail, status: 0x%08x\n", (int)ret);*/ ret = zfLnxUsbSubmitIntUrb(macp->RegInUrb, macp->udev, - USB_REG_IN_PIPE, USB_DIR_IN, macp->regUsbReadBuf, - ZM_USB_REG_MAX_BUF_SIZE, zfLnxUsbRegIn_callback, dev, 1); + USB_REG_IN_PIPE, USB_DIR_IN, macp->regUsbReadBuf, + ZM_USB_REG_MAX_BUF_SIZE, zfLnxUsbRegIn_callback, dev, 1); return ret; } -u32_t zfLnxUsbSubmitTxData(zdev_t* dev) +u32_t zfLnxUsbSubmitTxData(zdev_t *dev) { u32_t i; u32_t ret; @@ -600,39 +561,33 @@ u32_t zfLnxUsbSubmitTxData(zdev_t* dev) freeTxUrb = zfLnxGetFreeTxUrb(dev); /* If there is no any free Tx Urb */ - if (freeTxUrb == 0xffff) - { - //printk(KERN_ERR "Can't get free Tx Urb\n"); - //printk("CWY - Can't get free Tx Urb\n"); - return 0xffff; + if (freeTxUrb == 0xffff) { + /*printk(KERN_ERR "Can't get free Tx Urb\n"); + //printk("CWY - Can't get free Tx Urb\n");*/ + return 0xffff; } #if ZM_USB_TX_STREAM_MODE == 1 usbTxAggCnt = zfLnxCheckTxBufferCnt(dev); - if (usbTxAggCnt >= ZM_MAX_TX_AGGREGATE_NUM) - { - usbTxAggCnt = ZM_MAX_TX_AGGREGATE_NUM; - } - else - { - usbTxAggCnt = 1; + if (usbTxAggCnt >= ZM_MAX_TX_AGGREGATE_NUM) { + usbTxAggCnt = ZM_MAX_TX_AGGREGATE_NUM; + } else { + usbTxAggCnt = 1; } - //printk("usbTxAggCnt: %d\n", usbTxAggCnt); + /*printk("usbTxAggCnt: %d\n", usbTxAggCnt);*/ #endif #if ZM_USB_TX_STREAM_MODE == 1 - for(ii = 0; ii < usbTxAggCnt; ii++) - { + for (ii = 0; ii < usbTxAggCnt; ii++) { #endif /* Dequeue the packet from UsbTxBufQ */ TxData = zfLnxGetUsbTxBuffer(dev); - if (TxData == NULL) - { - /* Give the urb back */ - zfLnxPutTxUrb(dev); - return 0xffff; + if (TxData == NULL) { + /* Give the urb back */ + zfLnxPutTxUrb(dev); + return 0xffff; } /* Point to the freeTxUrb buffer */ @@ -644,114 +599,103 @@ u32_t zfLnxUsbSubmitTxData(zdev_t* dev) /* Add the packet length and tag information */ *pUsbTxHdr++ = TxData->hdrlen + TxData->snapLen + - (TxData->buf->len - TxData->offset) + TxData->tailLen; + (TxData->buf->len - TxData->offset) + TxData->tailLen; *pUsbTxHdr++ = 0x697e; puTxBuf += 4; -#endif // #ifdef ZM_USB_TX_STREAM_MODE +#endif /* #ifdef ZM_USB_TX_STREAM_MODE*/ /* Copy WLAN header and packet buffer into USB buffer */ - for(i = 0; i < TxData->hdrlen; i++) - { - *puTxBuf++ = TxData->hdr[i]; + for (i = 0; i < TxData->hdrlen; i++) { + *puTxBuf++ = TxData->hdr[i]; } /* Copy SNAP header */ - for(i = 0; i < TxData->snapLen; i++) - { - *puTxBuf++ = TxData->snap[i]; + for (i = 0; i < TxData->snapLen; i++) { + *puTxBuf++ = TxData->snap[i]; } /* Copy packet buffer */ - for(i = 0; i < TxData->buf->len - TxData->offset; i++) - { - //*puTxBuf++ = zmw_rx_buf_readb(dev, TxData->buf, i); - *puTxBuf++ = *(u8_t*)((u8_t*)TxData->buf->data+i+TxData->offset); + for (i = 0; i < TxData->buf->len - TxData->offset; i++) { + /*puTxBuf++ = zmw_rx_buf_readb(dev, TxData->buf, i);*/ + *puTxBuf++ = *(u8_t *)((u8_t *)TxData->buf->data+i+TxData->offset); } /* Copy tail */ - for(i = 0; i < TxData->tailLen; i++) - { - *puTxBuf++ = TxData->tail[i]; + for (i = 0; i < TxData->tailLen; i++) { + *puTxBuf++ = TxData->tail[i]; } len = TxData->hdrlen+TxData->snapLen+TxData->buf->len+TxData->tailLen-TxData->offset; #if 0 - if (TxData->hdrlen != 0) - { - puTxBuf = macp->txUsbBuf[freeTxUrb]; - for (i = 0; i < len; i++) - { - printk("%02x ", puTxBuf[i]); - if (i % 16 == 15) - printk("\n"); - } - printk("\n"); - } + if (TxData->hdrlen != 0) { + puTxBuf = macp->txUsbBuf[freeTxUrb]; + for (i = 0; i < len; i++) { + printk("%02x ", puTxBuf[i]); + if (i % 16 == 15) + printk("\n"); + } + printk("\n"); + } #endif #if 0 /* For debug purpose */ - if(TxData->hdr[9] & 0x40) - { - int i; - u16_t ctrlLen = TxData->hdr[0] + (TxData->hdr[1] << 8); - - if (ctrlLen != len + 4) - { - /* Dump control setting */ - for(i = 0; i < 8; i++) - { - printk(KERN_ERR "0x%02x ", TxData->hdr[i]); - } - printk(KERN_ERR "\n"); - - printk(KERN_ERR "ctrLen: %d, hdrLen: %d, snapLen: %d\n", ctrlLen, TxData->hdrlen, TxData->snapLen); - printk(KERN_ERR "bufLen: %d, tailLen: %d, len: %d\n", TxData->buf->len, TxData->tailLen, len); - } + if (TxData->hdr[9] & 0x40) { + int i; + u16_t ctrlLen = TxData->hdr[0] + (TxData->hdr[1] << 8); + + if (ctrlLen != len + 4) { + /* Dump control setting */ + for (i = 0; i < 8; i++) { + printk(KERN_ERR "0x%02x ", TxData->hdr[i]); + } + printk(KERN_ERR "\n"); + + printk(KERN_ERR "ctrLen: %d, hdrLen: %d, snapLen: %d\n", ctrlLen, TxData->hdrlen, TxData->snapLen); + printk(KERN_ERR "bufLen: %d, tailLen: %d, len: %d\n", TxData->buf->len, TxData->tailLen, len); + } } #endif #if ZM_USB_TX_STREAM_MODE == 1 - // Add the Length and Tag + /* Add the Length and Tag*/ len += 4; - //printk("%d packet, length: %d\n", ii+1, len); + /*printk("%d packet, length: %d\n", ii+1, len);*/ - if (ii < (ZM_MAX_TX_AGGREGATE_NUM-1)) - { - /* Pad the buffer to firmware descriptor boundary */ - offset += (((len-1) / 4) + 1) * 4; + if (ii < (ZM_MAX_TX_AGGREGATE_NUM-1)) { + /* Pad the buffer to firmware descriptor boundary */ + offset += (((len-1) / 4) + 1) * 4; } - if (ii == (ZM_MAX_TX_AGGREGATE_NUM-1)) - { - len += offset; + if (ii == (ZM_MAX_TX_AGGREGATE_NUM-1)) { + len += offset; } TxQPool[ii] = TxData; - //DbgPrint("%d packet, offset: %d\n", ii+1, pUsbTxTransfer->offset); + /*DbgPrint("%d packet, offset: %d\n", ii+1, pUsbTxTransfer->offset);*/ /* free packet */ - //zfBufFree(dev, txData->buf); + /*zfBufFree(dev, txData->buf);*/ } #endif - //printk("CWY - call zfwUsbSubmitBulkUrb(), len = 0x%d\n", len); + /*printk("CWY - call zfwUsbSubmitBulkUrb(), len = 0x%d\n", len);*/ /* Submit a tx urb */ ret = zfLnxUsbSubmitBulkUrb(macp->WlanTxDataUrb[freeTxUrb], macp->udev, - USB_WLAN_TX_PIPE, USB_DIR_OUT, macp->txUsbBuf[freeTxUrb], - len, zfLnxUsbDataOut_callback, dev); - //CWYang(-) + USB_WLAN_TX_PIPE, USB_DIR_OUT, macp->txUsbBuf[freeTxUrb], + len, zfLnxUsbDataOut_callback, dev); + /*CWYang(-) //if (ret != 0) - // printk("zfwUsbSubmitBulkUrb fail, status: 0x%08x\n", (int)ret); + // printk("zfwUsbSubmitBulkUrb fail, status: 0x%08x\n", (int)ret);*/ /* free packet */ - //dev_kfree_skb_any(TxData->buf); + /*dev_kfree_skb_any(TxData->buf);*/ #if ZM_USB_TX_STREAM_MODE == 1 - for(ii = 0; ii < usbTxAggCnt; ii++) - macp->usbCbFunctions.zfcbUsbOutComplete(dev, TxQPool[ii]->buf, 1, TxQPool[ii]->hdr); + for (ii = 0; ii < usbTxAggCnt; ii++) + macp->usbCbFunctions.zfcbUsbOutComplete(dev, TxQPool[ii]->buf, 1, TxQPool[ii]->hdr); #else macp->usbCbFunctions.zfcbUsbOutComplete(dev, TxData->buf, 1, TxData->hdr); #endif @@ -761,23 +705,23 @@ u32_t zfLnxUsbSubmitTxData(zdev_t* dev) -u32_t zfLnxUsbIn(zdev_t* dev, urb_t *urb, zbuf_t *buf) +u32_t zfLnxUsbIn(zdev_t *dev, urb_t *urb, zbuf_t *buf) { u32_t ret; struct usbdrv_private *macp = dev->ml_priv; /* Submit a rx urb */ ret = zfLnxUsbSubmitBulkUrb(urb, macp->udev, USB_WLAN_RX_PIPE, - USB_DIR_IN, buf->data, ZM_MAX_RX_BUFFER_SIZE, - zfLnxUsbDataIn_callback, dev); - //CWYang(-) + USB_DIR_IN, buf->data, ZM_MAX_RX_BUFFER_SIZE, + zfLnxUsbDataIn_callback, dev); + /*CWYang(-) //if (ret != 0) - // printk("zfwUsbSubmitBulkUrb fail, status: 0x%08x\n", (int)ret); + // printk("zfwUsbSubmitBulkUrb fail, status: 0x%08x\n", (int)ret);*/ return ret; } -u32_t zfLnxUsbWriteReg(zdev_t* dev, u32_t* cmd, u16_t cmdLen) +u32_t zfLnxUsbWriteReg(zdev_t *dev, u32_t *cmd, u16_t cmdLen) { struct usbdrv_private *macp = dev->ml_priv; u32_t ret; @@ -785,7 +729,7 @@ u32_t zfLnxUsbWriteReg(zdev_t* dev, u32_t* cmd, u16_t cmdLen) #ifdef ZM_CONFIG_BIG_ENDIAN int ii = 0; - for(ii=0; ii<(cmdLen>>2); ii++) + for (ii = 0; ii < (cmdLen>>2); ii++) cmd[ii] = cpu_to_le32(cmd[ii]); #endif @@ -794,39 +738,38 @@ u32_t zfLnxUsbWriteReg(zdev_t* dev, u32_t* cmd, u16_t cmdLen) /* Issue an USB Out transfer */ /* Submit a tx urb */ ret = zfLnxUsbSubmitIntUrb(macp->RegOutUrb, macp->udev, - USB_REG_OUT_PIPE, USB_DIR_OUT, macp->regUsbWriteBuf, - cmdLen, zfLnxUsbRegOut_callback, dev, 1); + USB_REG_OUT_PIPE, USB_DIR_OUT, macp->regUsbWriteBuf, + cmdLen, zfLnxUsbRegOut_callback, dev, 1); return ret; } -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 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 ret; struct usbdrv_private *macp = dev->ml_priv; /* Check length of tail buffer */ - //zm_assert((tailLen <= 16)); + /*zm_assert((tailLen <= 16));*/ /* Enqueue the packet into UsbTxBufQ */ - if (zfLnxPutUsbTxBuffer(dev, hdr, hdrlen, snap, snapLen, tail, tailLen, buf, offset) == 0xffff) - { - /* free packet */ - //printk("CWY - zfwPutUsbTxBuffer Error, free packet\n"); - //dev_kfree_skb_any(buf); - macp->usbCbFunctions.zfcbUsbOutComplete(dev, buf, 0, hdr); - return 0xffff; - } + if (zfLnxPutUsbTxBuffer(dev, hdr, hdrlen, snap, snapLen, tail, tailLen, buf, offset) == 0xffff) { + /* free packet */ + /*printk("CWY - zfwPutUsbTxBuffer Error, free packet\n"); + //dev_kfree_skb_any(buf);*/ + macp->usbCbFunctions.zfcbUsbOutComplete(dev, buf, 0, hdr); + return 0xffff; + } - //return 0; - //printk("CWY - call zfwUsbSubmitTxData()\n"); + /*return 0; + //printk("CWY - call zfwUsbSubmitTxData()\n");*/ ret = zfLnxUsbSubmitTxData(dev); return ret; } -void zfLnxInitUsbTxQ(zdev_t* dev) +void zfLnxInitUsbTxQ(zdev_t *dev) { struct usbdrv_private *macp = dev->ml_priv; @@ -842,7 +785,7 @@ void zfLnxInitUsbTxQ(zdev_t* dev) macp->TxUrbCnt = ZM_MAX_TX_URB_NUM; } -void zfLnxInitUsbRxQ(zdev_t* dev) +void zfLnxInitUsbRxQ(zdev_t *dev) { u16_t i; zbuf_t *buf; @@ -853,76 +796,65 @@ void zfLnxInitUsbRxQ(zdev_t* dev) macp->RxBufHead = 0; - for (i = 0; i < ZM_MAX_RX_URB_NUM; i++) - { - //buf = zfwBufAllocate(dev, ZM_MAX_RX_BUFFER_SIZE); - buf = dev_alloc_skb(ZM_MAX_RX_BUFFER_SIZE); - macp->UsbRxBufQ[i] = buf; - } + for (i = 0; i < ZM_MAX_RX_URB_NUM; i++) { + /*buf = zfwBufAllocate(dev, ZM_MAX_RX_BUFFER_SIZE);*/ + buf = dev_alloc_skb(ZM_MAX_RX_BUFFER_SIZE); + macp->UsbRxBufQ[i] = buf; + } - //macp->RxBufTail = ZM_MAX_RX_URB_NUM - 1; + /*macp->RxBufTail = ZM_MAX_RX_URB_NUM - 1;*/ macp->RxBufTail = 0; /* Submit all Rx urbs */ - for (i = 0; i < ZM_MAX_RX_URB_NUM; i++) - { - zfLnxPutUsbRxBuffer(dev, macp->UsbRxBufQ[i]); - zfLnxUsbIn(dev, macp->WlanRxDataUrb[i], macp->UsbRxBufQ[i]); - } + for (i = 0; i < ZM_MAX_RX_URB_NUM; i++) { + zfLnxPutUsbRxBuffer(dev, macp->UsbRxBufQ[i]); + zfLnxUsbIn(dev, macp->WlanRxDataUrb[i], macp->UsbRxBufQ[i]); + } } u32_t zfLnxUsbSubmitBulkUrb(urb_t *urb, struct usb_device *usb, u16_t epnum, u16_t direction, - void *transfer_buffer, int buffer_length, usb_complete_t complete, void *context) + void *transfer_buffer, int buffer_length, usb_complete_t complete, void *context) { u32_t ret; - if(direction == USB_DIR_OUT) - { - usb_fill_bulk_urb(urb, usb, usb_sndbulkpipe(usb, epnum), - transfer_buffer, buffer_length, complete, context); + if (direction == USB_DIR_OUT) { + usb_fill_bulk_urb(urb, usb, usb_sndbulkpipe(usb, epnum), + transfer_buffer, buffer_length, complete, context); - urb->transfer_flags |= URB_ZERO_PACKET; - } - else - { - usb_fill_bulk_urb(urb, usb, usb_rcvbulkpipe(usb, epnum), - transfer_buffer, buffer_length, complete, context); + urb->transfer_flags |= URB_ZERO_PACKET; + } else { + usb_fill_bulk_urb(urb, usb, usb_rcvbulkpipe(usb, epnum), + transfer_buffer, buffer_length, complete, context); } - if (epnum == 4) - { - if (urb->hcpriv) - { - //printk("CWY - urb->hcpriv set by unknown reason, reset it\n"); - //urb->hcpriv = 0; - } - } + if (epnum == 4) { + if (urb->hcpriv) { + /*printk("CWY - urb->hcpriv set by unknown reason, reset it\n"); + //urb->hcpriv = 0;*/ + } + } ret = usb_submit_urb(urb, GFP_ATOMIC); - if ((epnum == 4) & (ret != 0)) - { - //printk("CWY - ret = %x\n", ret); + if ((epnum == 4) & (ret != 0)) { + /*printk("CWY - ret = %x\n", ret);*/ } return ret; } u32_t zfLnxUsbSubmitIntUrb(urb_t *urb, struct usb_device *usb, u16_t epnum, u16_t direction, - void *transfer_buffer, int buffer_length, usb_complete_t complete, void *context, - u32_t interval) + void *transfer_buffer, int buffer_length, usb_complete_t complete, void *context, + u32_t interval) { u32_t ret; - if(direction == USB_DIR_OUT) - { - usb_fill_int_urb(urb, usb, usb_sndbulkpipe(usb, epnum), - transfer_buffer, buffer_length, complete, context, interval); - } - else - { - usb_fill_int_urb(urb, usb, usb_rcvbulkpipe(usb, epnum), - transfer_buffer, buffer_length, complete, context, interval); + if (direction == USB_DIR_OUT) { + usb_fill_int_urb(urb, usb, usb_sndbulkpipe(usb, epnum), + transfer_buffer, buffer_length, complete, context, interval); + } else { + usb_fill_int_urb(urb, usb, usb_rcvbulkpipe(usb, epnum), + transfer_buffer, buffer_length, complete, context, interval); } ret = usb_submit_urb(urb, GFP_ATOMIC); @@ -946,51 +878,48 @@ int zfLnxCencSendMsg(struct sock *netlink_sk, u_int8_t *msg, int len) size = NLMSG_SPACE(len); skb = alloc_skb(size, GFP_ATOMIC); - if(skb == NULL) - { + if (skb == NULL) { printk("dev_alloc_skb failure \n"); goto out; } old_tail = skb->tail; - /*填写数据报相关信息*/ + /* */ nlh = NLMSG_PUT(skb, 0, 0, WAI_K_MSG, size-sizeof(*nlh)); pos = NLMSG_DATA(nlh); - /*传输到用户空间的数据*/ + /* */ memcpy(pos, msg, len); - /*计算经过字节对其后的数据实际长度*/ + /* */ nlh->nlmsg_len = skb->tail - old_tail; NETLINK_CB(skb).dst_group = COMMTYPE_GROUP; netlink_broadcast(netlink_sk, skb, 0, COMMTYPE_GROUP, GFP_ATOMIC); ret = 0; out: return ret; -nlmsg_failure: /*NLMSG_PUT 失败，则撤销套接字缓存*/ +nlmsg_failure: /* */ kfree_skb(skb); goto out; #undef COMMTYPE_GROUP #undef WAI_K_MSG } -#endif //ZM_ENABLE_CENC +#endif /*ZM_ENABLE_CENC*/ /* Simply return 0xffff if VAP function is not supported */ -u16_t zfLnxGetVapId(zdev_t* dev) +u16_t zfLnxGetVapId(zdev_t *dev) { u16_t i; - for (i=0; idevice; + container_of(work, struct usbdrv_private, kevent); + zdev_t *dev = macp->device; - if (test_and_set_bit(0, (void *)&smp_kevent_Lock)) - { - //schedule_work(&macp->kevent); - return; + if (test_and_set_bit(0, (void *)&smp_kevent_Lock)) { + /*schedule_work(&macp->kevent);*/ + return; } down(&macp->ioctl_sem); - if (test_and_clear_bit(KEVENT_WATCHDOG, &macp->kevent_flags)) - { + if (test_and_clear_bit(KEVENT_WATCHDOG, &macp->kevent_flags)) { extern u16_t zfHpStartRecv(zdev_t *dev); - //zfiHwWatchDogReinit(dev); - printk(("\n ************ Hw watchDog occur!! ************** \n")); - zfiWlanSuspend(dev); - zfiWlanResume(dev,0); - zfHpStartRecv(dev); + /*zfiHwWatchDogReinit(dev);*/ + printk(("\n ************ Hw watchDog occur!! ************** \n")); + zfiWlanSuspend(dev); + zfiWlanResume(dev , 0); + zfHpStartRecv(dev); } clear_bit(0, (void *)&smp_kevent_Lock); @@ -1083,41 +1010,38 @@ void zfLnxSignalThread(zdev_t *dev, int flag) { struct usbdrv_private *macp = dev->ml_priv; - if (macp == NULL) - { - printk("macp is NULL\n"); - return; + if (macp == NULL) { + printk("macp is NULL\n"); + return; } - if (0 && macp->kevent_ready != 1) - { - printk("Kevent not ready\n"); - return; + if (0 && macp->kevent_ready != 1) { + printk("Kevent not ready\n"); + return; } set_bit(flag, &macp->kevent_flags); - if (!schedule_work(&macp->kevent)) - { - //Fails is Normal - //printk(KERN_ERR "schedule_task failed, flag = %x\n", flag); - } + if (!schedule_work(&macp->kevent)) { + /*Fails is Normal + //printk(KERN_ERR "schedule_task failed, flag = %x\n", flag);*/ + } } /* Notify wrapper todo redownload firmware and reinit procedure when */ /* hardware watchdog occur : zfiHwWatchDogReinit() */ -void zfLnxWatchDogNotify(zdev_t* dev) +void zfLnxWatchDogNotify(zdev_t *dev) { zfLnxSignalThread(dev, KEVENT_WATCHDOG); } /* Query Durantion of Active Scan */ -void zfwGetActiveScanDur(zdev_t* dev, u8_t* Dur) +void zfwGetActiveScanDur(zdev_t *dev, u8_t *Dur) { - *Dur = 30; // default 30 ms + *Dur = 30; /* default 30 ms*/ } -void zfwGetShowZeroLengthSSID(zdev_t* dev, u8_t* Dur) +void zfwGetShowZeroLengthSSID(zdev_t *dev, u8_t *Dur) { *Dur = 0; } -- 1.7.1