Merge remote-tracking branch 'staging/staging-next'

[deliverable/linux.git] / drivers / staging / vt6655 / rxtx.c

diff --git a/drivers/staging/vt6655/rxtx.c b/drivers/staging/vt6655/rxtx.c
index e4c3165ae027556238fabb2f38405d3fd57b7873..890d108463a2394c809093f6b7e340147a85502b 100644 (file)
--- a/drivers/staging/vt6655/rxtx.c
+++ b/drivers/staging/vt6655/rxtx.c
@@ -64,8 +64,10 @@
 /*---------------------  Static Functions  --------------------------*/
 
 /*---------------------  Static Definitions -------------------------*/
-#define CRITICAL_PACKET_LEN      256    /* if packet size < 256 -> in-direct send
-                                            packet size >= 256 -> direct send */
+/* if packet size < 256 -> in-direct send
+ * vpacket size >= 256 -> direct send
+ */
+#define CRITICAL_PACKET_LEN      256
 
 static const unsigned short wTimeStampOff[2][MAX_RATE] = {
        {384, 288, 226, 209, 54, 43, 37, 31, 28, 25, 24, 23}, /* Long Preamble */
@@ -158,11 +160,11 @@ static __le16 vnt_time_stamp_off(struct vnt_private *priv, u16 rate)
                                                        [rate % MAX_RATE]);
 }
 
-/*byPktType : PK_TYPE_11A     0
-  PK_TYPE_11B     1
-  PK_TYPE_11GB    2
-  PK_TYPE_11GA    3
-*/
+/* byPktType : PK_TYPE_11A     0
+ * PK_TYPE_11B     1
+ * PK_TYPE_11GB    2
+ * PK_TYPE_11GA    3
+ */
 static
 unsigned int
 s_uGetTxRsvTime(
@@ -650,13 +652,16 @@ s_vFillRTSHead(
                return;
 
        if (bDisCRC) {
-               /* When CRCDIS bit is on, H/W forgot to generate FCS for RTS frame,
-                in this case we need to decrease its length by 4. */
+               /* When CRCDIS bit is on, H/W forgot to generate FCS for
+                * RTS frame, in this case we need to decrease its length by 4.
+                */
                uRTSFrameLen -= 4;
        }
 
-       /* Note: So far RTSHead doesn't appear in ATIM & Beacom DMA, so we don't need to take them into account.
-              Otherwise, we need to modify codes for them. */
+       /* Note: So far RTSHead doesn't appear in ATIM & Beacom DMA,
+        * so we don't need to take them into account.
+        * Otherwise, we need to modify codes for them.
+        */
        if (byPktType == PK_TYPE_11GB || byPktType == PK_TYPE_11GA) {
                if (byFBOption == AUTO_FB_NONE) {
                        struct vnt_rts_g *buf = pvRTS;
@@ -842,8 +847,9 @@ s_vFillCTSHead(
                return;
 
        if (bDisCRC) {
-               /* When CRCDIS bit is on, H/W forgot to generate FCS for CTS frame,
-                in this case we need to decrease its length by 4. */
+               /* When CRCDIS bit is on, H/W forgot to generate FCS for
+                * CTS frame, in this case we need to decrease its length by 4.
+                */
                uCTSFrameLen -= 4;
        }
 
@@ -915,7 +921,7 @@ s_vFillCTSHead(
        }
 }
 
-/*+
+/*
  *
  * Description:
  *      Generate FIFO control for MAC & Baseband controller
@@ -937,7 +943,8 @@ s_vFillCTSHead(
  * Return Value: none
  *
  -
- * unsigned int cbFrameSize, Hdr+Payload+FCS */
+ * unsigned int cbFrameSize, Hdr+Payload+FCS
+ */
 static
 void
 s_vGenerateTxParameter(
@@ -972,8 +979,8 @@ s_vGenerateTxParameter(
                return;
 
        if (byPktType == PK_TYPE_11GB || byPktType == PK_TYPE_11GA) {
-               if (pvRTS != NULL) { /* RTS_need
-                        Fill RsvTime */
+               if (pvRTS != NULL) { /* RTS_need */
+                       /* Fill RsvTime */
                        struct vnt_rrv_time_rts *buf = pvRrvTime;
 
                        buf->rts_rrv_time_aa = s_uGetRTSCTSRsvTime(pDevice, 2, byPktType, cbFrameSize, wCurrentRate);