1 files changed, 67 insertions, 62 deletions

diff --git a/drivers/staging/bcm/Adapter.h b/drivers/staging/bcm/Adapter.h
index d4c98acd6c10..42291eed33d6 100644
--- a/drivers/staging/bcm/Adapter.h
+++ b/drivers/staging/bcm/Adapter.h
@@ -34,7 +34,7 @@ struct link_request {
 } __attribute__((packed));
 typedef struct link_request LINK_REQUEST, *PLINK_REQUEST;
 
-//classification extension is added
+/* classification extension is added */
 typedef struct _ADD_CONNECTION {
         ULONG   SrcIpAddressCount;
         ULONG   SrcIpAddress[MAX_CONNECTIONS];
@@ -83,12 +83,12 @@ typedef struct _CLASSIFICATION_ONLY {
 
 typedef union _U_IP_ADDRESS {
         struct {
-                ULONG ulIpv4Addr[MAX_IP_RANGE_LENGTH];//Source Ip Address Range
-                ULONG ulIpv4Mask[MAX_IP_RANGE_LENGTH];//Source Ip Mask Address Range
+                ULONG ulIpv4Addr[MAX_IP_RANGE_LENGTH]; /* Source Ip Address Range */
+                ULONG ulIpv4Mask[MAX_IP_RANGE_LENGTH]; /* Source Ip Mask Address Range */
         };
         struct {
-                ULONG ulIpv6Addr[MAX_IP_RANGE_LENGTH * 4];//Source Ip Address Range
-                ULONG ulIpv6Mask[MAX_IP_RANGE_LENGTH * 4];//Source Ip Mask Address Range
+                ULONG ulIpv6Addr[MAX_IP_RANGE_LENGTH * 4]; /* Source Ip Address Range */
+                ULONG ulIpv6Mask[MAX_IP_RANGE_LENGTH * 4]; /* Source Ip Mask Address Range */
         };
         struct {
                 UCHAR ucIpv4Address[MAX_IP_RANGE_LENGTH * IP_LENGTH_OF_ADDRESS];
@@ -102,8 +102,8 @@ typedef union _U_IP_ADDRESS {
 struct _packet_info;
 
 typedef struct _S_HDR_SUPRESSION_CONTEXTINFO {
-        UCHAR ucaHdrSupressionInBuf[MAX_PHS_LENGTHS]; //Intermediate buffer to accumulate pkt Header for PHS
-        UCHAR ucaHdrSupressionOutBuf[MAX_PHS_LENGTHS + PHSI_LEN]; //Intermediate buffer containing pkt Header after PHS
+        UCHAR ucaHdrSupressionInBuf[MAX_PHS_LENGTHS]; /* Intermediate buffer to accumulate pkt Header for PHS */
+        UCHAR ucaHdrSupressionOutBuf[MAX_PHS_LENGTHS + PHSI_LEN]; /* Intermediate buffer containing pkt Header after PHS */
 } S_HDR_SUPRESSION_CONTEXTINFO;
 
 typedef struct _S_CLASSIFIER_RULE {
@@ -112,19 +112,19 @@ typedef struct _S_CLASSIFIER_RULE {
         B_UINT16        uiClassifierRuleIndex;
         BOOLEAN         bUsed;
         USHORT          usVCID_Value;
-        B_UINT8         u8ClassifierRulePriority; //This field detemines the Classifier Priority
+        B_UINT8         u8ClassifierRulePriority; /* This field detemines the Classifier Priority */
         U_IP_ADDRESS    stSrcIpAddress;
-        UCHAR           ucIPSourceAddressLength;//Ip Source Address Length
+        UCHAR           ucIPSourceAddressLength; /* Ip Source Address Length */
 
         U_IP_ADDRESS    stDestIpAddress;
-        UCHAR           ucIPDestinationAddressLength;//Ip Destination Address Length
-        UCHAR           ucIPTypeOfServiceLength;//Type of service Length
-        UCHAR           ucTosLow;//Tos Low
-        UCHAR           ucTosHigh;//Tos High
-        UCHAR           ucTosMask;//Tos Mask
-
-        UCHAR           ucProtocolLength;//protocol Length
-        UCHAR           ucProtocol[MAX_PROTOCOL_LENGTH];//protocol Length
+        UCHAR           ucIPDestinationAddressLength; /* Ip Destination Address Length */
+        UCHAR           ucIPTypeOfServiceLength; /* Type of service Length */
+        UCHAR           ucTosLow; /* Tos Low */
+        UCHAR           ucTosHigh; /* Tos High */
+        UCHAR           ucTosMask; /* Tos Mask */
+
+        UCHAR           ucProtocolLength; /* protocol Length */
+        UCHAR           ucProtocol[MAX_PROTOCOL_LENGTH]; /* protocol Length */
         USHORT          usSrcPortRangeLo[MAX_PORT_RANGE];
         USHORT          usSrcPortRangeHi[MAX_PORT_RANGE];
         UCHAR           ucSrcPortRangeLength;
@@ -138,14 +138,14 @@ typedef struct _S_CLASSIFIER_RULE {
         BOOLEAN         bDestIpValid;
         BOOLEAN         bSrcIpValid;
 
-        //For IPv6 Addressing
+        /* For IPv6 Addressing */
         UCHAR           ucDirection;
         BOOLEAN         bIpv6Protocol;
         UINT32          u32PHSRuleID;
         S_PHS_RULE      sPhsRule;
         UCHAR           u8AssociatedPHSI;
 
-        //Classification fields for ETH CS
+        /* Classification fields for ETH CS */
         UCHAR           ucEthCSSrcMACLen;
         UCHAR           au8EThCSSrcMAC[MAC_ADDRESS_SIZE];
         UCHAR           au8EThCSSrcMACMask[MAC_ADDRESS_SIZE];
@@ -158,7 +158,7 @@ typedef struct _S_CLASSIFIER_RULE {
         USHORT          usVLANID;
         USHORT          usValidityBitMap;
 } S_CLASSIFIER_RULE;
-//typedef struct _S_CLASSIFIER_RULE S_CLASSIFIER_RULE;
+/* typedef struct _S_CLASSIFIER_RULE S_CLASSIFIER_RULE; */
 
 typedef struct _S_FRAGMENTED_PACKET_INFO {
         BOOLEAN                 bUsed;
@@ -169,20 +169,20 @@ typedef struct _S_FRAGMENTED_PACKET_INFO {
 } S_FRAGMENTED_PACKET_INFO, *PS_FRAGMENTED_PACKET_INFO;
 
 struct _packet_info {
-        //classification extension Rule
+        /* classification extension Rule */
         ULONG           ulSFID;
         USHORT          usVCID_Value;
         UINT            uiThreshold;
-        // This field determines the priority of the SF Queues
+        /* This field determines the priority of the SF Queues */
         B_UINT8         u8TrafficPriority;
 
         BOOLEAN         bValid;
         BOOLEAN         bActive;
         BOOLEAN         bActivateRequestSent;
 
-        B_UINT8         u8QueueType;//BE or rtPS
+        B_UINT8         u8QueueType; /* BE or rtPS */
 
-        UINT            uiMaxBucketSize;//maximum size of the bucket for the queue
+        UINT            uiMaxBucketSize; /* maximum size of the bucket for the queue */
         UINT            uiCurrentQueueDepthOnTarget;
         UINT            uiCurrentBytesOnHost;
         UINT            uiCurrentPacketsOnHost;
@@ -255,22 +255,22 @@ typedef struct _PER_TARANG_DATA {
 typedef struct _TARGET_PARAMS {
         B_UINT32 m_u32CfgVersion;
 
-        // Scanning Related Params
+        /* Scanning Related Params */
         B_UINT32 m_u32CenterFrequency;
         B_UINT32 m_u32BandAScan;
         B_UINT32 m_u32BandBScan;
         B_UINT32 m_u32BandCScan;
 
-        // QoS Params
-        B_UINT32 m_u32minGrantsize;     // size of minimum grant is 0 or 6
+        /* QoS Params */
+        B_UINT32 m_u32minGrantsize;     /* size of minimum grant is 0 or 6 */
         B_UINT32 m_u32PHSEnable;
 
-        // HO Params
+        /* HO Params */
         B_UINT32 m_u32HoEnable;
         B_UINT32 m_u32HoReserved1;
         B_UINT32 m_u32HoReserved2;
 
-        // Power Control Params
+        /* Power Control Params */
         B_UINT32 m_u32MimoEnable;
         B_UINT32 m_u32SecurityEnable;
         /*
@@ -279,22 +279,23 @@ typedef struct _TARGET_PARAMS {
          */
         B_UINT32 m_u32PowerSavingModesEnable;
         /* PowerSaving Mode Options:
-           bit 0 = 1: CPE mode - to keep pcmcia if alive;
-           bit 1 = 1: CINR reporing in Idlemode Msg
-           bit 2 = 1: Default PSC Enable in sleepmode*/
+         * bit 0 = 1: CPE mode - to keep pcmcia if alive;
+         * bit 1 = 1: CINR reporing in Idlemode Msg
+         * bit 2 = 1: Default PSC Enable in sleepmode
+         */