Signed-off-by: Matthias Beyer <m...@beyermatthias.de>
---
 drivers/staging/bcm/CmHost.c | 986 +++++++++++++++++++++----------------------
 1 file changed, 493 insertions(+), 493 deletions(-)

diff --git a/drivers/staging/bcm/CmHost.c b/drivers/staging/bcm/CmHost.c
index adca0ce..43ce563 100644
--- a/drivers/staging/bcm/CmHost.c
+++ b/drivers/staging/bcm/CmHost.c
@@ -13,14 +13,14 @@ enum E_CLASSIFIER_ACTION {
        eDeleteClassifier
 };
 
-static ULONG GetNextTargetBufferLocation(struct bcm_mini_adapter *Adapter,
+static ULONG GetNextTargetBufferLocation(struct bcm_mini_adapter *ad,
                B_UINT16 tid);
 static void restore_endianess_of_pstClassifierEntry(
                struct bcm_classifier_rule *pstClassifierEntry,
                enum bcm_ipaddr_context eIpAddrContext);
 
 static void apply_phs_rule_to_all_classifiers(
-               register struct bcm_mini_adapter *Adapter,
+               register struct bcm_mini_adapter *ad,
                register UINT uiSearchRuleIndex,
                USHORT uVCID,
                struct bcm_phs_rule *sPhsRule,
@@ -33,18 +33,18 @@ static void apply_phs_rule_to_all_classifiers(
  * Description - This routinue would search QOS queues having
  *  specified SFID as input parameter.
  *
- * Parameters -        Adapter: Pointer to the Adapter structure
+ * Parameters -        ad: Pointer to the ad structure
  *  uiSfid : Given SFID for matching
  *
  * Returns - Queue index for this SFID(If matched)
  *  Else Invalid Queue Index(If Not matched)
  ************************************************************/
-int SearchSfid(struct bcm_mini_adapter *Adapter, UINT uiSfid)
+int SearchSfid(struct bcm_mini_adapter *ad, UINT uiSfid)
 {
        int i;
 
        for (i = (NO_OF_QUEUES-1); i >= 0; i--)
-               if (Adapter->PackInfo[i].ulSFID == uiSfid)
+               if (ad->PackInfo[i].ulSFID == uiSfid)
                        return i;
 
        return NO_OF_QUEUES+1;
@@ -55,17 +55,17 @@ int SearchSfid(struct bcm_mini_adapter *Adapter, UINT 
uiSfid)
  *
  * Description - This routinue would search Free available SFID.
  *
- * Parameter - Adapter: Pointer to the Adapter structure
+ * Parameter - ad: Pointer to the ad structure
  *
  * Returns - Queue index for the free SFID
  *  Else returns Invalid Index.
  ****************************************************************/
-static int SearchFreeSfid(struct bcm_mini_adapter *Adapter)
+static int SearchFreeSfid(struct bcm_mini_adapter *ad)
 {
        int i;
 
        for (i = 0; i < (NO_OF_QUEUES-1); i++)
-               if (Adapter->PackInfo[i].ulSFID == 0)
+               if (ad->PackInfo[i].ulSFID == 0)
                        return i;
 
        return NO_OF_QUEUES+1;
@@ -74,22 +74,22 @@ static int SearchFreeSfid(struct bcm_mini_adapter *Adapter)
 /*
  * Function: SearchClsid
  * Description:        This routinue would search Classifier  having specified 
ClassifierID as input parameter
- * Input parameters: struct bcm_mini_adapter *Adapter - Adapter Context
+ * Input parameters: struct bcm_mini_adapter *ad - ad Context
  *  unsigned int uiSfid   - The SF in which the classifier is to searched
  *  B_UINT16  uiClassifierID - The classifier ID to be searched
  * Return: int :Classifier table index of matching entry
  */
-static int SearchClsid(struct bcm_mini_adapter *Adapter,
+static int SearchClsid(struct bcm_mini_adapter *ad,
                ULONG ulSFID,
                B_UINT16 uiClassifierID)
 {
        int i;
 
        for (i = 0; i < MAX_CLASSIFIERS; i++) {
-               if ((Adapter->astClassifierTable[i].bUsed) &&
-                       (Adapter->astClassifierTable[i].uiClassifierRuleIndex
+               if ((ad->astClassifierTable[i].bUsed) &&
+                       (ad->astClassifierTable[i].uiClassifierRuleIndex
                                == uiClassifierID) &&
-                       (Adapter->astClassifierTable[i].ulSFID == ulSFID))
+                       (ad->astClassifierTable[i].ulSFID == ulSFID))
                        return i;
        }
 
@@ -101,29 +101,29 @@ static int SearchClsid(struct bcm_mini_adapter *Adapter,
  * This routinue would search Free available Classifier entry in classifier 
table.
  * @return free Classifier Entry index in classifier table for specified SF
  */
-static int SearchFreeClsid(struct bcm_mini_adapter *Adapter /**Adapter 
Context*/)
+static int SearchFreeClsid(struct bcm_mini_adapter *ad /**ad Context*/)
 {
        int i;
 
        for (i = 0; i < MAX_CLASSIFIERS; i++) {
-               if (!Adapter->astClassifierTable[i].bUsed)
+               if (!ad->astClassifierTable[i].bUsed)
                        return i;
        }
 
        return MAX_CLASSIFIERS+1;
 }
 
-static VOID deleteSFBySfid(struct bcm_mini_adapter *Adapter,
+static VOID deleteSFBySfid(struct bcm_mini_adapter *ad,
                UINT uiSearchRuleIndex)
 {
        /* deleting all the packet held in the SF */
-       flush_queue(Adapter, uiSearchRuleIndex);
+       flush_queue(ad, uiSearchRuleIndex);
 
        /* Deleting the all classifiers for this SF */
-       DeleteAllClassifiersForSF(Adapter, uiSearchRuleIndex);
+       DeleteAllClassifiersForSF(ad, uiSearchRuleIndex);
 
        /* Resetting only MIBS related entries in the SF */
-       memset((PVOID)&Adapter->PackInfo[uiSearchRuleIndex], 0,
+       memset((PVOID)&ad->PackInfo[uiSearchRuleIndex], 0,
                        sizeof(struct bcm_mibs_table));
 }
 
@@ -136,13 +136,13 @@ CopyIpAddrToClassifier(struct bcm_classifier_rule 
*pstClassifierEntry,
        UINT nSizeOfIPAddressInBytes = IP_LENGTH_OF_ADDRESS;
        UCHAR *ptrClassifierIpAddress = NULL;
        UCHAR *ptrClassifierIpMask = NULL;
-       struct bcm_mini_adapter *Adapter = GET_BCM_ADAPTER(gblpnetdev);
+       struct bcm_mini_adapter *ad = GET_BCM_ADAPTER(gblpnetdev);
 
        if (bIpVersion6)
                nSizeOfIPAddressInBytes = IPV6_ADDRESS_SIZEINBYTES;
 
        /* Destination Ip Address */
-       BCM_DEBUG_PRINT(Adapter, DBG_TYPE_OTHERS, CONN_MSG, DBG_LVL_ALL,
+       BCM_DEBUG_PRINT(ad, DBG_TYPE_OTHERS, CONN_MSG, DBG_LVL_ALL,
                        "Ip Address Range Length:0x%X ", u8IpAddressLen);
        if ((bIpVersion6 ? (IPV6_ADDRESS_SIZEINBYTES * MAX_IP_RANGE_LENGTH * 2) 
:
                        (TOTAL_MASKED_ADDRESS_IN_BYTES)) >= u8IpAddressLen) {
@@ -185,7 +185,7 @@ CopyIpAddrToClassifier(struct bcm_classifier_rule 
*pstClassifierEntry,
                                ptrClassifierIpMask = st_src_ip->ucIpv4Mask;
                        }
                }
-               BCM_DEBUG_PRINT(Adapter, DBG_TYPE_OTHERS, CONN_MSG, DBG_LVL_ALL,
+               BCM_DEBUG_PRINT(ad, DBG_TYPE_OTHERS, CONN_MSG, DBG_LVL_ALL,
                                "Address Length:0x%X\n",
                                
pstClassifierEntry->ucIPDestinationAddressLength);
                while ((u8IpAddressLen >= nSizeOfIPAddressInBytes)
@@ -200,7 +200,7 @@ CopyIpAddrToClassifier(struct bcm_classifier_rule 
*pstClassifierEntry,
                                if (eIpAddrContext == eSrcIpAddress) {
                                        st_src_ip->ulIpv4Addr[i] =
                                                ntohl(st_src_ip->ulIpv4Addr[i]);
-                                       BCM_DEBUG_PRINT(Adapter,
+                                       BCM_DEBUG_PRINT(ad,
                                                        DBG_TYPE_OTHERS,
                                                        CONN_MSG,
                                                        DBG_LVL_ALL,
@@ -209,7 +209,7 @@ CopyIpAddrToClassifier(struct bcm_classifier_rule 
*pstClassifierEntry,
                                } else if (eIpAddrContext == eDestIpAddress) {
                                        st_dest_ip->ulIpv4Addr[i] =
                                                
ntohl(st_dest_ip->ulIpv4Addr[i]);
-                                       BCM_DEBUG_PRINT(Adapter,
+                                       BCM_DEBUG_PRINT(ad,
                                                        DBG_TYPE_OTHERS,
                                                        CONN_MSG,
                                                        DBG_LVL_ALL,
@@ -230,7 +230,7 @@ CopyIpAddrToClassifier(struct bcm_classifier_rule 
*pstClassifierEntry,
                                        if (eIpAddrContext == eSrcIpAddress) {
                                                st_src_ip->ulIpv4Mask[i] =
                                                        
ntohl(st_src_ip->ulIpv4Mask[i]);
-                                               BCM_DEBUG_PRINT(Adapter,
+                                               BCM_DEBUG_PRINT(ad,
                                                                DBG_TYPE_OTHERS,
                                                                CONN_MSG,
                                                                DBG_LVL_ALL,
@@ -239,7 +239,7 @@ CopyIpAddrToClassifier(struct bcm_classifier_rule 
*pstClassifierEntry,
                                        } else if (eIpAddrContext == 
eDestIpAddress) {
                                                st_dest_ip->ulIpv4Mask[i] =
                                                        
ntohl(st_dest_ip->ulIpv4Mask[i]);
-                                               BCM_DEBUG_PRINT(Adapter,
+                                               BCM_DEBUG_PRINT(ad,
                                                                DBG_TYPE_OTHERS,
                                                                CONN_MSG,
                                                                DBG_LVL_ALL,
@@ -264,24 +264,24 @@ CopyIpAddrToClassifier(struct bcm_classifier_rule 
*pstClassifierEntry,
        }
 }
 
-void ClearTargetDSXBuffer(struct bcm_mini_adapter *Adapter, B_UINT16 TID, bool 
bFreeAll)
+void ClearTargetDSXBuffer(struct bcm_mini_adapter *ad, B_UINT16 TID, bool 
bFreeAll)
 {
        int i;
        struct bcm_targetdsx_buffer *curr_buf;
 
-       for (i = 0; i < Adapter->ulTotalTargetBuffersAvailable; i++) {
-               curr_buf = &Adapter->astTargetDsxBuffer[i];
+       for (i = 0; i < ad->ulTotalTargetBuffersAvailable; i++) {
+               curr_buf = &ad->astTargetDsxBuffer[i];
 
                if (curr_buf->valid)
                        continue;
 
                if ((bFreeAll) || (curr_buf->tid == TID)) {
-                       BCM_DEBUG_PRINT(Adapter, DBG_TYPE_PRINTK, 0, 0,
+                       BCM_DEBUG_PRINT(ad, DBG_TYPE_PRINTK, 0, 0,
                                        "ClearTargetDSXBuffer: found tid %d 
buffer cleared %lx\n",
                                        TID, curr_buf->ulTargetDsxBuffer);
                        curr_buf->valid = 1;
                        curr_buf->tid = 0;
-                       Adapter->ulFreeTargetBufferCnt++;
+                       ad->ulFreeTargetBufferCnt++;
                }
        }
 }
@@ -290,7 +290,7 @@ void ClearTargetDSXBuffer(struct bcm_mini_adapter *Adapter, 
B_UINT16 TID, bool b
  * @ingroup ctrl_pkt_functions
  * copy classifier rule into the specified SF index
  */
-static inline VOID CopyClassifierRuleToSF(struct bcm_mini_adapter *Adapter,
+static inline VOID CopyClassifierRuleToSF(struct bcm_mini_adapter *ad,
                struct bcm_convergence_types *psfCSType,
                UINT uiSearchRuleIndex,
                UINT nClassifierIndex)
@@ -304,27 +304,27 @@ static inline VOID CopyClassifierRuleToSF(struct 
bcm_mini_adapter *Adapter,
        struct bcm_packet_class_rules *pack_class_rule =
                &psfCSType->cCPacketClassificationRule;
 
-       if (Adapter->PackInfo[uiSearchRuleIndex].usVCID_Value == 0 ||
+       if (ad->PackInfo[uiSearchRuleIndex].usVCID_Value == 0 ||
                nClassifierIndex > (MAX_CLASSIFIERS-1))
                return;
 
-       BCM_DEBUG_PRINT(Adapter, DBG_TYPE_OTHERS, CONN_MSG, DBG_LVL_ALL,
+       BCM_DEBUG_PRINT(ad, DBG_TYPE_OTHERS, CONN_MSG, DBG_LVL_ALL,
                        "Storing Classifier Rule Index : %X",
                        
ntohs(pack_class_rule->u16PacketClassificationRuleIndex));
 
        if (nClassifierIndex > MAX_CLASSIFIERS-1)
                return;
 
-       pstClassifierEntry = &Adapter->astClassifierTable[nClassifierIndex];
+       pstClassifierEntry = &ad->astClassifierTable[nClassifierIndex];
        if (pstClassifierEntry) {
                /* Store if Ipv6 */
                pstClassifierEntry->bIpv6Protocol =
-                       (Adapter->PackInfo[uiSearchRuleIndex].ucIpVersion == 
IPV6) ? TRUE : false;
+                       (ad->PackInfo[uiSearchRuleIndex].ucIpVersion == IPV6) ? 
TRUE : false;
 
                /* Destinaiton Port */
                pstClassifierEntry->ucDestPortRangeLength =
                        pack_class_rule->u8ProtocolDestPortRangeLength / 4;
-               BCM_DEBUG_PRINT(Adapter, DBG_TYPE_OTHERS, CONN_MSG, DBG_LVL_ALL,
+               BCM_DEBUG_PRINT(ad, DBG_TYPE_OTHERS, CONN_MSG, DBG_LVL_ALL,
                                "Destination Port Range Length:0x%X ",
                                pstClassifierEntry->ucDestPortRangeLength);
 
@@ -336,7 +336,7 @@ static inline VOID CopyClassifierRuleToSF(struct 
bcm_mini_adapter *Adapter,
                                        
*((PUSHORT)(pack_class_rule->u8ProtocolDestPortRange+2+i));
                                pstClassifierEntry->usDestPortRangeLo[i] =
                                        
ntohs(pstClassifierEntry->usDestPortRangeLo[i]);
-                               BCM_DEBUG_PRINT(Adapter, DBG_TYPE_OTHERS,
+                               BCM_DEBUG_PRINT(ad, DBG_TYPE_OTHERS,
                                                CONN_MSG, DBG_LVL_ALL,
                                                "Destination Port Range Lo:0x%X 
",
                                                
pstClassifierEntry->usDestPortRangeLo[i]);
@@ -348,7 +348,7 @@ static inline VOID CopyClassifierRuleToSF(struct 
bcm_mini_adapter *Adapter,
                }
 
                /* Source Port */
-               BCM_DEBUG_PRINT(Adapter, DBG_TYPE_OTHERS, CONN_MSG, DBG_LVL_ALL,
+               BCM_DEBUG_PRINT(ad, DBG_TYPE_OTHERS, CONN_MSG, DBG_LVL_ALL,
                                "Source Port Range Length:0x%X ",
                                
pack_class_rule->u8ProtocolSourcePortRangeLength);
                if (pack_class_rule->u8ProtocolSourcePortRangeLength <= 
MAX_PORT_RANGE) {
@@ -363,7 +363,7 @@ static inline VOID CopyClassifierRuleToSF(struct 
bcm_mini_adapter *Adapter,
                                                        
u8ProtocolSourcePortRange+2+i));
                                pstClassifierEntry->usSrcPortRangeLo[i] =
                                        
ntohs(pstClassifierEntry->usSrcPortRangeLo[i]);
-                               BCM_DEBUG_PRINT(Adapter, DBG_TYPE_OTHERS,
+                               BCM_DEBUG_PRINT(ad, DBG_TYPE_OTHERS,
                                                CONN_MSG, DBG_LVL_ALL,
                                                "Source Port Range Lo:0x%X ",
                                                
pstClassifierEntry->usSrcPortRangeLo[i]);
@@ -372,26 +372,26 @@ static inline VOID CopyClassifierRuleToSF(struct 
bcm_mini_adapter *Adapter,
                        }
                }
                /* Destination Ip Address and Mask */
-               BCM_DEBUG_PRINT(Adapter, DBG_TYPE_OTHERS, CONN_MSG, DBG_LVL_ALL,
+               BCM_DEBUG_PRINT(ad, DBG_TYPE_OTHERS, CONN_MSG, DBG_LVL_ALL,
                                "Ip Destination Parameters : ");
                CopyIpAddrToClassifier(pstClassifierEntry,
                                pack_class_rule->u8IPDestinationAddressLength,
                                pack_class_rule->u8IPDestinationAddress,
-                               
(Adapter->PackInfo[uiSearchRuleIndex].ucIpVersion == IPV6) ?
+                               (ad->PackInfo[uiSearchRuleIndex].ucIpVersion == 
IPV6) ?
                        TRUE : false, eDestIpAddress);
 
                /* Source Ip Address and Mask */
-               BCM_DEBUG_PRINT(Adapter, DBG_TYPE_OTHERS, CONN_MSG, DBG_LVL_ALL,
+               BCM_DEBUG_PRINT(ad, DBG_TYPE_OTHERS, CONN_MSG, DBG_LVL_ALL,
                                "Ip Source Parameters : ");
 
                CopyIpAddrToClassifier(pstClassifierEntry,
                                pack_class_rule->u8IPMaskedSourceAddressLength,
                                pack_class_rule->u8IPMaskedSourceAddress,
-                               
(Adapter->PackInfo[uiSearchRuleIndex].ucIpVersion == IPV6) ? TRUE : false,
+                               (ad->PackInfo[uiSearchRuleIndex].ucIpVersion == 
IPV6) ? TRUE : false,
                                eSrcIpAddress);
 
                /* TOS */
-               BCM_DEBUG_PRINT(Adapter, DBG_TYPE_OTHERS, CONN_MSG, DBG_LVL_ALL,
+               BCM_DEBUG_PRINT(ad, DBG_TYPE_OTHERS, CONN_MSG, DBG_LVL_ALL,
                                "TOS Length:0x%X ",
                                pack_class_rule->u8IPTypeOfServiceLength);
                if (pack_class_rule->u8IPTypeOfServiceLength == 3) {
@@ -418,14 +418,14 @@ static inline VOID CopyClassifierRuleToSF(struct 
bcm_mini_adapter *Adapter,
 
                /* store the classifier rule ID and set this classifier entry 
as valid */
                pstClassifierEntry->ucDirection =
-                       Adapter->PackInfo[uiSearchRuleIndex].ucDirection;
+                       ad->PackInfo[uiSearchRuleIndex].ucDirection;
                pstClassifierEntry->uiClassifierRuleIndex =
                        
ntohs(pack_class_rule->u16PacketClassificationRuleIndex);
                pstClassifierEntry->usVCID_Value =
-                       Adapter->PackInfo[uiSearchRuleIndex].usVCID_Value;
+                       ad->PackInfo[uiSearchRuleIndex].usVCID_Value;
                pstClassifierEntry->ulSFID =
-                       Adapter->PackInfo[uiSearchRuleIndex].ulSFID;
-               BCM_DEBUG_PRINT(Adapter, DBG_TYPE_OTHERS, CONN_MSG, DBG_LVL_ALL,
+                       ad->PackInfo[uiSearchRuleIndex].ulSFID;
+               BCM_DEBUG_PRINT(ad, DBG_TYPE_OTHERS, CONN_MSG, DBG_LVL_ALL,
                                "Search Index %d Dir: %d, Index: %d, Vcid: 
%d\n",
                                uiSearchRuleIndex,
                                pstClassifierEntry->ucDirection,
@@ -472,7 +472,7 @@ static inline VOID CopyClassifierRuleToSF(struct 
bcm_mini_adapter *Adapter,
 /*
  * @ingroup ctrl_pkt_functions
  */
-static inline VOID DeleteClassifierRuleFromSF(struct bcm_mini_adapter *Adapter,
+static inline VOID DeleteClassifierRuleFromSF(struct bcm_mini_adapter *ad,
                UINT uiSearchRuleIndex, UINT nClassifierIndex)
 {
        struct bcm_classifier_rule *pstClassifierEntry = NULL;
@@ -481,7 +481,7 @@ static inline VOID DeleteClassifierRuleFromSF(struct 
bcm_mini_adapter *Adapter,
        /* VOID *pvPhsContext = NULL; */
        /*ULONG ulPhsStatus; */
 
-       usVCID = Adapter->PackInfo[uiSearchRuleIndex].usVCID_Value;
+       usVCID = ad->PackInfo[uiSearchRuleIndex].usVCID_Value;
 
        if (nClassifierIndex > MAX_CLASSIFIERS-1)
                return;
@@ -490,8 +490,8 @@ static inline VOID DeleteClassifierRuleFromSF(struct 
bcm_mini_adapter *Adapter,
                return;
 
        u16PacketClassificationRuleIndex =
-               
Adapter->astClassifierTable[nClassifierIndex].uiClassifierRuleIndex;
-       pstClassifierEntry = &Adapter->astClassifierTable[nClassifierIndex];
+               ad->astClassifierTable[nClassifierIndex].uiClassifierRuleIndex;
+       pstClassifierEntry = &ad->astClassifierTable[nClassifierIndex];
        if (pstClassifierEntry) {
                pstClassifierEntry->bUsed = false;
                pstClassifierEntry->uiClassifierRuleIndex = 0;
@@ -499,7 +499,7 @@ static inline VOID DeleteClassifierRuleFromSF(struct 
bcm_mini_adapter *Adapter,
                                sizeof(struct bcm_classifier_rule));
 
                /* Delete the PHS Rule for this classifier */
-               PhsDeleteClassifierRule(&Adapter->stBCMPhsContext, usVCID,
+               PhsDeleteClassifierRule(&ad->stBCMPhsContext, usVCID,
                                u16PacketClassificationRuleIndex);
        }
 }
@@ -507,7 +507,7 @@ static inline VOID DeleteClassifierRuleFromSF(struct 
bcm_mini_adapter *Adapter,
 /*
  * @ingroup ctrl_pkt_functions
  */
-VOID DeleteAllClassifiersForSF(struct bcm_mini_adapter *Adapter,
+VOID DeleteAllClassifiersForSF(struct bcm_mini_adapter *ad,
                UINT uiSearchRuleIndex)
 {
        struct bcm_classifier_rule *pstClassifierEntry = NULL;
@@ -517,31 +517,31 @@ VOID DeleteAllClassifiersForSF(struct bcm_mini_adapter 
*Adapter,
        /* VOID *pvPhsContext = NULL; */
        /* ULONG ulPhsStatus; */
 
-       ulVCID = Adapter->PackInfo[uiSearchRuleIndex].usVCID_Value;
+       ulVCID = ad->PackInfo[uiSearchRuleIndex].usVCID_Value;
 
        if (ulVCID == 0)
                return;
 
        for (i = 0; i < MAX_CLASSIFIERS; i++) {
-               if (Adapter->astClassifierTable[i].usVCID_Value == ulVCID) {
-                       pstClassifierEntry = &Adapter->astClassifierTable[i];
+               if (ad->astClassifierTable[i].usVCID_Value == ulVCID) {
+                       pstClassifierEntry = &ad->astClassifierTable[i];
 
                        if (pstClassifierEntry->bUsed)
-                               DeleteClassifierRuleFromSF(Adapter,
+                               DeleteClassifierRuleFromSF(ad,
                                                uiSearchRuleIndex, i);
                }
        }
 
        /* Delete All Phs Rules Associated with this SF */
-       PhsDeleteSFRules(&Adapter->stBCMPhsContext, ulVCID);
+       PhsDeleteSFRules(&ad->stBCMPhsContext, ulVCID);
 }
 
 /*
  * This routinue  copies the Connection Management
- * related data into the Adapter structure.
+ * related data into the ad structure.
  * @ingroup ctrl_pkt_functions
  */
-static VOID CopyToAdapter(register struct bcm_mini_adapter *Adapter, /* 
<Pointer to the Adapter structure */
+static VOID CopyToAdapter(register struct bcm_mini_adapter *ad, /* <Pointer to 
the ad structure */
                        register struct bcm_connect_mgr_params *psfLocalSet, /* 
Pointer to the connection manager parameters structure */
                        register UINT uiSearchRuleIndex, /* <Index of Queue, to 
which this data belongs */
                        register UCHAR ucDsxType,
@@ -556,16 +556,16 @@ static VOID CopyToAdapter(register struct 
bcm_mini_adapter *Adapter, /* <Pointer
        struct bcm_convergence_types *psfCSType = NULL;
        struct bcm_phs_rule sPhsRule;
        struct bcm_packet_info *curr_packinfo =
-               &Adapter->PackInfo[uiSearchRuleIndex];
+               &ad->PackInfo[uiSearchRuleIndex];
        USHORT uVCID = curr_packinfo->usVCID_Value;
        UINT UGIValue = 0;
 
        curr_packinfo->bValid = TRUE;
-       BCM_DEBUG_PRINT(Adapter, DBG_TYPE_OTHERS, CONN_MSG, DBG_LVL_ALL,
+       BCM_DEBUG_PRINT(ad, DBG_TYPE_OTHERS, CONN_MSG, DBG_LVL_ALL,
                        "Search Rule Index = %d\n", uiSearchRuleIndex);
-       BCM_DEBUG_PRINT(Adapter, DBG_TYPE_OTHERS, CONN_MSG, DBG_LVL_ALL,
+       BCM_DEBUG_PRINT(ad, DBG_TYPE_OTHERS, CONN_MSG, DBG_LVL_ALL,
                        "%s: SFID= %x ", __func__, ntohl(psfLocalSet->u32SFID));
-       BCM_DEBUG_PRINT(Adapter, DBG_TYPE_OTHERS, CONN_MSG, DBG_LVL_ALL,
+       BCM_DEBUG_PRINT(ad, DBG_TYPE_OTHERS, CONN_MSG, DBG_LVL_ALL,
                        "Updating Queue %d", uiSearchRuleIndex);
 
        ulSFID = ntohl(psfLocalSet->u32SFID);
@@ -576,8 +576,8 @@ static VOID CopyToAdapter(register struct bcm_mini_adapter 
*Adapter, /* <Pointer
        curr_packinfo->bEthCSSupport = 0;
 
        /* Enable IP/ETh CS Support As Required */
-       BCM_DEBUG_PRINT(Adapter, DBG_TYPE_OTHERS, CONN_MSG, DBG_LVL_ALL,
-                       "CopyToAdapter : u8CSSpecification : %X\n",
+       BCM_DEBUG_PRINT(ad, DBG_TYPE_OTHERS, CONN_MSG, DBG_LVL_ALL,
+                       "CopyToad : u8CSSpecification : %X\n",
                        psfLocalSet->u8CSSpecification);
        switch (psfLocalSet->u8CSSpecification) {
        case eCSPacketIPV4:
@@ -601,14 +601,14 @@ static VOID CopyToAdapter(register struct 
bcm_mini_adapter *Adapter, /* <Pointer
                curr_packinfo->bEthCSSupport = ETH_CS_802_3;
                break;
        default:
-               BCM_DEBUG_PRINT(Adapter, DBG_TYPE_OTHERS, CONN_MSG, DBG_LVL_ALL,
+               BCM_DEBUG_PRINT(ad, DBG_TYPE_OTHERS, CONN_MSG, DBG_LVL_ALL,
                                "Error in value of CS Classification.. setting 
default to IP CS\n");
                curr_packinfo->bIPCSSupport = IPV4_CS;
                break;
        }
 
-       BCM_DEBUG_PRINT(Adapter, DBG_TYPE_OTHERS, CONN_MSG, DBG_LVL_ALL,
-                       "CopyToAdapter : Queue No : %X ETH CS Support :  %X  , 
IP CS Support : %X\n",
+       BCM_DEBUG_PRINT(ad, DBG_TYPE_OTHERS, CONN_MSG, DBG_LVL_ALL,
+                       "CopyToad : Queue No : %X ETH CS Support :  %X  , IP CS 
Support : %X\n",
                        uiSearchRuleIndex,
                        curr_packinfo->bEthCSSupport,
                        curr_packinfo->bIPCSSupport);
@@ -621,7 +621,7 @@ static VOID CopyToAdapter(register struct bcm_mini_adapter 
*Adapter, /* <Pointer
                curr_packinfo->ucIpVersion = IPV4;
 
        /* To ensure that the ETH CS code doesn't gets executed if the BS 
doesn't supports ETH CS */
-       if (!Adapter->bETHCSEnabled)
+       if (!ad->bETHCSEnabled)
                curr_packinfo->bEthCSSupport = 0;
 
        if (psfLocalSet->u8ServiceClassNameLength > 0 && 
psfLocalSet->u8ServiceClassNameLength < 32)
@@ -632,7 +632,7 @@ static VOID CopyToAdapter(register struct bcm_mini_adapter 
*Adapter, /* <Pointer
        curr_packinfo->u8QueueType = psfLocalSet->u8ServiceFlowSchedulingType;
 
        if (curr_packinfo->u8QueueType == BE && curr_packinfo->ucDirection)
-               Adapter->usBestEffortQueueIndex = uiSearchRuleIndex;
+               ad->usBestEffortQueueIndex = uiSearchRuleIndex;
 
        curr_packinfo->ulSFID = ntohl(psfLocalSet->u32SFID);
 
@@ -640,10 +640,10 @@ static VOID CopyToAdapter(register struct 
bcm_mini_adapter *Adapter, /* <Pointer
 
        /* copy all the classifier in the Service Flow param  structure */
        for (i = 0; i < psfLocalSet->u8TotalClassifiers; i++) {
-               BCM_DEBUG_PRINT(Adapter, DBG_TYPE_OTHERS, CONN_MSG, DBG_LVL_ALL,
+               BCM_DEBUG_PRINT(ad, DBG_TYPE_OTHERS, CONN_MSG, DBG_LVL_ALL,
                                "Classifier index =%d", i);
                psfCSType = &psfLocalSet->cConvergenceSLTypes[i];
-               BCM_DEBUG_PRINT(Adapter, DBG_TYPE_OTHERS, CONN_MSG, DBG_LVL_ALL,
+               BCM_DEBUG_PRINT(ad, DBG_TYPE_OTHERS, CONN_MSG, DBG_LVL_ALL,
                                "Classifier index =%d", i);
 
                if 
(psfCSType->cCPacketClassificationRule.u8ClassifierRulePriority)
@@ -676,15 +676,15 @@ static VOID CopyToAdapter(register struct 
bcm_mini_adapter *Adapter, /* <Pointer
                case eAddClassifier:
                        /* Get a Free Classifier Index From Classifier table 
for this SF to add the Classifier */
                        /* Contained in this message */
-                       nClassifierIndex = SearchClsid(Adapter,
+                       nClassifierIndex = SearchClsid(ad,
                                        ulSFID,
                                        u16PacketClassificationRuleIndex);
 
                        if (nClassifierIndex > MAX_CLASSIFIERS) {
-                               nClassifierIndex = SearchFreeClsid(Adapter);
+                               nClassifierIndex = SearchFreeClsid(ad);
                                if (nClassifierIndex > MAX_CLASSIFIERS) {
                                        /* Failed To get a free Entry */
-                                       BCM_DEBUG_PRINT(Adapter,
+                                       BCM_DEBUG_PRINT(ad,
                                                        DBG_TYPE_OTHERS,
                                                        CONN_MSG,
                                                        DBG_LVL_ALL,
@@ -692,49 +692,49 @@ static VOID CopyToAdapter(register struct 
bcm_mini_adapter *Adapter, /* <Pointer
                                        break;
                                }
                                /* Copy the Classifier Rule for this service 
flow into our Classifier table maintained per SF. */
-                               CopyClassifierRuleToSF(Adapter, psfCSType,
+                               CopyClassifierRuleToSF(ad, psfCSType,
                                                uiSearchRuleIndex,
                                                nClassifierIndex);
                        } else {
                                /* This Classifier Already Exists and it is 
invalid to Add Classifier with existing PCRI */
-                               BCM_DEBUG_PRINT(Adapter, DBG_TYPE_OTHERS,
+                               BCM_DEBUG_PRINT(ad, DBG_TYPE_OTHERS,
                                                CONN_MSG,
                                                DBG_LVL_ALL,
-                                               "CopyToAdapter: Error The 
Specified Classifier Already Exists and attempted To Add Classifier with Same 
PCRI : 0x%x\n",
+                                               "CopyToad: Error The Specified 
Classifier Already Exists and attempted To Add Classifier with Same PCRI : 
0x%x\n",
                                                
u16PacketClassificationRuleIndex);
                        }
                        break;
                case eReplaceClassifier:
                        /* Get the Classifier Index From Classifier table for 
this SF and replace existing  Classifier */
                        /* with the new classifier Contained in this message */
-                       nClassifierIndex = SearchClsid(Adapter, ulSFID,
+                       nClassifierIndex = SearchClsid(ad, ulSFID,
                                        u16PacketClassificationRuleIndex);
                        if (nClassifierIndex > MAX_CLASSIFIERS) {
                                /* Failed To search the classifier */
-                               BCM_DEBUG_PRINT(Adapter, DBG_TYPE_OTHERS,
+                               BCM_DEBUG_PRINT(ad, DBG_TYPE_OTHERS,
                                                CONN_MSG, DBG_LVL_ALL,
                                                "Error Search for Classifier To 
be replaced failed");
                                break;
                        }
                        /* Copy the Classifier Rule for this service flow into 
our Classifier table maintained per SF. */
-                       CopyClassifierRuleToSF(Adapter, psfCSType,
+                       CopyClassifierRuleToSF(ad, psfCSType,
                                        uiSearchRuleIndex, nClassifierIndex);
                        break;
                case eDeleteClassifier:
                        /* Get the Classifier Index From Classifier table for 
this SF and replace existing  Classifier */
                        /* with the new classifier Contained in this message */
-                       nClassifierIndex = SearchClsid(Adapter, ulSFID,
+                       nClassifierIndex = SearchClsid(ad, ulSFID,
                                        u16PacketClassificationRuleIndex);
                        if (nClassifierIndex > MAX_CLASSIFIERS) {
                                /* Failed To search the classifier */
-                               BCM_DEBUG_PRINT(Adapter, DBG_TYPE_OTHERS,
+                               BCM_DEBUG_PRINT(ad, DBG_TYPE_OTHERS,
                                                CONN_MSG, DBG_LVL_ALL,
                                                "Error Search for Classifier To 
be deleted failed");
                                break;
                        }
 
                        /* Delete This classifier */
-                       DeleteClassifierRuleFromSF(Adapter, uiSearchRuleIndex,
+                       DeleteClassifierRuleFromSF(ad, uiSearchRuleIndex,
                                        nClassifierIndex);
                        break;
                default:
@@ -746,27 +746,27 @@ static VOID CopyToAdapter(register struct 
bcm_mini_adapter *Adapter, /* <Pointer
        /* Repeat parsing Classification Entries to process PHS Rules */
        for (i = 0; i < psfLocalSet->u8TotalClassifiers; i++) {
                psfCSType = &psfLocalSet->cConvergenceSLTypes[i];
-               BCM_DEBUG_PRINT(Adapter, DBG_TYPE_OTHERS, CONN_MSG, DBG_LVL_ALL,
+               BCM_DEBUG_PRINT(ad, DBG_TYPE_OTHERS, CONN_MSG, DBG_LVL_ALL,
                                "psfCSType->u8PhsDSCAction : 0x%x\n",
                                psfCSType->u8PhsDSCAction);
 
                switch (psfCSType->u8PhsDSCAction) {
                case eDeleteAllPHSRules:
-                       BCM_DEBUG_PRINT(Adapter, DBG_TYPE_OTHERS, CONN_MSG,
+                       BCM_DEBUG_PRINT(ad, DBG_TYPE_OTHERS, CONN_MSG,
                                        DBG_LVL_ALL,
                                        "Deleting All PHS Rules For VCID: 
0x%X\n",
                                        uVCID);
 
                        /* Delete All the PHS rules for this Service flow */
-                       PhsDeleteSFRules(&Adapter->stBCMPhsContext, uVCID);
+                       PhsDeleteSFRules(&ad->stBCMPhsContext, uVCID);
                        break;
                case eDeletePHSRule:
-                       BCM_DEBUG_PRINT(Adapter, DBG_TYPE_OTHERS, CONN_MSG,
+                       BCM_DEBUG_PRINT(ad, DBG_TYPE_OTHERS, CONN_MSG,
                                        DBG_LVL_ALL,
                                        "PHS DSC Action = Delete PHS Rule\n");
 
                        if (psfCSType->cPhsRule.u8PHSI)
-                               PhsDeletePHSRule(&Adapter->stBCMPhsContext,
+                               PhsDeletePHSRule(&ad->stBCMPhsContext,
                                                uVCID,
                                                
psfCSType->cCPacketClassificationRule.u8AssociatedPHSI);
 
@@ -783,7 +783,7 @@ static VOID CopyToAdapter(register struct bcm_mini_adapter 
*Adapter, /* <Pointer
                case eSetPHSRule:
                        if (psfCSType->cPhsRule.u8PHSI) {
                                /* Apply This PHS Rule to all classifiers whose 
Associated PHSI Match */
-                               apply_phs_rule_to_all_classifiers(Adapter,
+                               apply_phs_rule_to_all_classifiers(ad,
                                                uiSearchRuleIndex,
                                                uVCID,
                                                &sPhsRule,
@@ -842,17 +842,17 @@ static VOID CopyToAdapter(register struct 
bcm_mini_adapter *Adapter, /* <Pointer
                        curr_packinfo->uiMaxBucketSize = WIMAX_MAX_MTU*8;
        }
 
-       BCM_DEBUG_PRINT(Adapter, DBG_TYPE_OTHERS, CONN_MSG, DBG_LVL_ALL,
+       BCM_DEBUG_PRINT(ad, DBG_TYPE_OTHERS, CONN_MSG, DBG_LVL_ALL,
                        "LAT: %d, UGI: %d\n", curr_packinfo->uiMaxLatency,
                        UGIValue);
-       BCM_DEBUG_PRINT(Adapter, DBG_TYPE_OTHERS, CONN_MSG, DBG_LVL_ALL,
+       BCM_DEBUG_PRINT(ad, DBG_TYPE_OTHERS, CONN_MSG, DBG_LVL_ALL,
                        "uiMaxAllowedRate: 0x%x, u32MaxSustainedTrafficRate: 
0x%x ,uiMaxBucketSize: 0x%x",
                        curr_packinfo->uiMaxAllowedRate,
                        ntohl(psfLocalSet->u32MaxSustainedTrafficRate),
                        curr_packinfo->uiMaxBucketSize);
 
        /* copy the extended SF Parameters to Support MIBS */
-       CopyMIBSExtendedSFParameters(Adapter, psfLocalSet, uiSearchRuleIndex);
+       CopyMIBSExtendedSFParameters(ad, psfLocalSet, uiSearchRuleIndex);
 
        /* store header suppression enabled flag per SF */
        curr_packinfo->bHeaderSuppressionEnabled =
@@ -863,14 +863,14 @@ static VOID CopyToAdapter(register struct 
bcm_mini_adapter *Adapter, /* <Pointer
        curr_packinfo->pstSFIndication = pstAddIndication;
 
        /* Re Sort the SF list in PackInfo according to Traffic Priority */
-       SortPackInfo(Adapter);
+       SortPackInfo(ad);
 
        /* Re Sort the Classifier Rules table and re - arrange
         * according to Classifier Rule Priority
         */
-       SortClassifiers(Adapter);
-       DumpPhsRules(&Adapter->stBCMPhsContext);
-       BCM_DEBUG_PRINT(Adapter, DBG_TYPE_OTHERS, CONN_MSG, DBG_LVL_ALL,
+       SortClassifiers(ad);
+       DumpPhsRules(&ad->stBCMPhsContext);
+       BCM_DEBUG_PRINT(ad, DBG_TYPE_OTHERS, CONN_MSG, DBG_LVL_ALL,
                        "%s <=====", __func__);
 }
 
@@ -891,22 +891,22 @@ static VOID DumpCmControlPacket(PVOID pvBuffer)
        int nIndex;
        struct bcm_add_indication_alt *pstAddIndication;
        UINT nCurClassifierCnt;
-       struct bcm_mini_adapter *Adapter = GET_BCM_ADAPTER(gblpnetdev);
+       struct bcm_mini_adapter *ad = GET_BCM_ADAPTER(gblpnetdev);
 
        pstAddIndication = pvBuffer;
-       BCM_DEBUG_PRINT(Adapter, DBG_TYPE_OTHERS, DUMP_CONTROL, DBG_LVL_ALL, 
"======>");
-       BCM_DEBUG_PRINT(Adapter, DBG_TYPE_OTHERS, DUMP_CONTROL, DBG_LVL_ALL, 
"u8Type: 0x%X", pstAddIndication->u8Type);
-       BCM_DEBUG_PRINT(Adapter, DBG_TYPE_OTHERS, DUMP_CONTROL, DBG_LVL_ALL, 
"u8Direction: 0x%X", pstAddIndication->u8Direction);
-       BCM_DEBUG_PRINT(Adapter, DBG_TYPE_OTHERS, DUMP_CONTROL, DBG_LVL_ALL, 
"u16TID: 0x%X", ntohs(pstAddIndication->u16TID));
-       BCM_DEBUG_PRINT(Adapter, DBG_TYPE_OTHERS, DUMP_CONTROL, DBG_LVL_ALL, 
"u16CID: 0x%X", ntohs(pstAddIndication->u16CID));
-       BCM_DEBUG_PRINT(Adapter, DBG_TYPE_OTHERS, DUMP_CONTROL, DBG_LVL_ALL, 
"u16VCID: 0x%X", ntohs(pstAddIndication->u16VCID));
-       BCM_DEBUG_PRINT(Adapter, DBG_TYPE_OTHERS, DUMP_CONTROL, DBG_LVL_ALL, " 
AuthorizedSet--->");
-       BCM_DEBUG_PRINT(Adapter, DBG_TYPE_OTHERS, DUMP_CONTROL, DBG_LVL_ALL, 
"u32SFID: 0x%X", htonl(pstAddIndication->sfAuthorizedSet.u32SFID));
-       BCM_DEBUG_PRINT(Adapter, DBG_TYPE_OTHERS, DUMP_CONTROL, DBG_LVL_ALL, 
"u16CID: 0x%X", htons(pstAddIndication->sfAuthorizedSet.u16CID));
-       BCM_DEBUG_PRINT(Adapter, DBG_TYPE_OTHERS, DUMP_CONTROL, DBG_LVL_ALL, 
"u8ServiceClassNameLength: 0x%X",
+       BCM_DEBUG_PRINT(ad, DBG_TYPE_OTHERS, DUMP_CONTROL, DBG_LVL_ALL, 
"======>");
+       BCM_DEBUG_PRINT(ad, DBG_TYPE_OTHERS, DUMP_CONTROL, DBG_LVL_ALL, 
"u8Type: 0x%X", pstAddIndication->u8Type);
+       BCM_DEBUG_PRINT(ad, DBG_TYPE_OTHERS, DUMP_CONTROL, DBG_LVL_ALL, 
"u8Direction: 0x%X", pstAddIndication->u8Direction);
+       BCM_DEBUG_PRINT(ad, DBG_TYPE_OTHERS, DUMP_CONTROL, DBG_LVL_ALL, 
"u16TID: 0x%X", ntohs(pstAddIndication->u16TID));
+       BCM_DEBUG_PRINT(ad, DBG_TYPE_OTHERS, DUMP_CONTROL, DBG_LVL_ALL, 
"u16CID: 0x%X", ntohs(pstAddIndication->u16CID));
+       BCM_DEBUG_PRINT(ad, DBG_TYPE_OTHERS, DUMP_CONTROL, DBG_LVL_ALL, 
"u16VCID: 0x%X", ntohs(pstAddIndication->u16VCID));
+       BCM_DEBUG_PRINT(ad, DBG_TYPE_OTHERS, DUMP_CONTROL, DBG_LVL_ALL, " 
AuthorizedSet--->");
+       BCM_DEBUG_PRINT(ad, DBG_TYPE_OTHERS, DUMP_CONTROL, DBG_LVL_ALL, 
"u32SFID: 0x%X", htonl(pstAddIndication->sfAuthorizedSet.u32SFID));
+       BCM_DEBUG_PRINT(ad, DBG_TYPE_OTHERS, DUMP_CONTROL, DBG_LVL_ALL, 
"u16CID: 0x%X", htons(pstAddIndication->sfAuthorizedSet.u16CID));
+       BCM_DEBUG_PRINT(ad, DBG_TYPE_OTHERS, DUMP_CONTROL, DBG_LVL_ALL, 
"u8ServiceClassNameLength: 0x%X",
                        
pstAddIndication->sfAuthorizedSet.u8ServiceClassNameLength);
 
-       BCM_DEBUG_PRINT(Adapter, DBG_TYPE_OTHERS, DUMP_CONTROL, DBG_LVL_ALL, 
"u8ServiceClassName: 0x%X ,0x%X , 0x%X, 0x%X, 0x%X, 0x%X",
+       BCM_DEBUG_PRINT(ad, DBG_TYPE_OTHERS, DUMP_CONTROL, DBG_LVL_ALL, 
"u8ServiceClassName: 0x%X ,0x%X , 0x%X, 0x%X, 0x%X, 0x%X",
                        pstAddIndication->sfAuthorizedSet.u8ServiceClassName[0],
                        pstAddIndication->sfAuthorizedSet.u8ServiceClassName[1],
                        pstAddIndication->sfAuthorizedSet.u8ServiceClassName[2],
@@ -914,60 +914,60 @@ static VOID DumpCmControlPacket(PVOID pvBuffer)
                        pstAddIndication->sfAuthorizedSet.u8ServiceClassName[4],
                        
pstAddIndication->sfAuthorizedSet.u8ServiceClassName[5]);
 
-       BCM_DEBUG_PRINT(Adapter, DBG_TYPE_OTHERS, DUMP_CONTROL, DBG_LVL_ALL, 
"u8MBSService: 0x%X", pstAddIndication->sfAuthorizedSet.u8MBSService);
-       BCM_DEBUG_PRINT(Adapter, DBG_TYPE_OTHERS, DUMP_CONTROL, DBG_LVL_ALL, 
"u8QosParamSet: 0x%X", pstAddIndication->sfAuthorizedSet.u8QosParamSet);
-       BCM_DEBUG_PRINT(Adapter, DBG_TYPE_OTHERS, DUMP_CONTROL, DBG_LVL_ALL, 
"u8TrafficPriority: 0x%X, %p",
+       BCM_DEBUG_PRINT(ad, DBG_TYPE_OTHERS, DUMP_CONTROL, DBG_LVL_ALL, 
"u8MBSService: 0x%X", pstAddIndication->sfAuthorizedSet.u8MBSService);
+       BCM_DEBUG_PRINT(ad, DBG_TYPE_OTHERS, DUMP_CONTROL, DBG_LVL_ALL, 
"u8QosParamSet: 0x%X", pstAddIndication->sfAuthorizedSet.u8QosParamSet);
+       BCM_DEBUG_PRINT(ad, DBG_TYPE_OTHERS, DUMP_CONTROL, DBG_LVL_ALL, 
"u8TrafficPriority: 0x%X, %p",
                        pstAddIndication->sfAuthorizedSet.u8TrafficPriority, 
&pstAddIndication->sfAuthorizedSet.u8TrafficPriority);
-       BCM_DEBUG_PRINT(Adapter, DBG_TYPE_OTHERS, DUMP_CONTROL, DBG_LVL_ALL, 
"u32MaxSustainedTrafficRate: 0x%X 0x%p",
+       BCM_DEBUG_PRINT(ad, DBG_TYPE_OTHERS, DUMP_CONTROL, DBG_LVL_ALL, 
"u32MaxSustainedTrafficRate: 0x%X 0x%p",
                        
pstAddIndication->sfAuthorizedSet.u32MaxSustainedTrafficRate,
                        
&pstAddIndication->sfAuthorizedSet.u32MaxSustainedTrafficRate);
-       BCM_DEBUG_PRINT(Adapter, DBG_TYPE_OTHERS, DUMP_CONTROL, DBG_LVL_ALL, 
"u32MaxTrafficBurst: 0x%X", 
pstAddIndication->sfAuthorizedSet.u32MaxTrafficBurst);
-       BCM_DEBUG_PRINT(Adapter, DBG_TYPE_OTHERS, DUMP_CONTROL, DBG_LVL_ALL, 
"u32MinReservedTrafficRate : 0x%X",
+       BCM_DEBUG_PRINT(ad, DBG_TYPE_OTHERS, DUMP_CONTROL, DBG_LVL_ALL, 
"u32MaxTrafficBurst: 0x%X", 
pstAddIndication->sfAuthorizedSet.u32MaxTrafficBurst);
+       BCM_DEBUG_PRINT(ad, DBG_TYPE_OTHERS, DUMP_CONTROL, DBG_LVL_ALL, 
"u32MinReservedTrafficRate      : 0x%X",
                        
pstAddIndication->sfAuthorizedSet.u32MinReservedTrafficRate);
-       BCM_DEBUG_PRINT(Adapter, DBG_TYPE_OTHERS, DUMP_CONTROL, DBG_LVL_ALL, 
"u8VendorSpecificQoSParamLength: 0x%X",
+       BCM_DEBUG_PRINT(ad, DBG_TYPE_OTHERS, DUMP_CONTROL, DBG_LVL_ALL, 
"u8VendorSpecificQoSParamLength: 0x%X",
                        
pstAddIndication->sfAuthorizedSet.u8VendorSpecificQoSParamLength);
-       BCM_DEBUG_PRINT(Adapter, DBG_TYPE_OTHERS, DUMP_CONTROL, DBG_LVL_ALL, 
"u8VendorSpecificQoSParam: 0x%X",
+       BCM_DEBUG_PRINT(ad, DBG_TYPE_OTHERS, DUMP_CONTROL, DBG_LVL_ALL, 
"u8VendorSpecificQoSParam: 0x%X",
                        
pstAddIndication->sfAuthorizedSet.u8VendorSpecificQoSParam[0]);
-       BCM_DEBUG_PRINT(Adapter, DBG_TYPE_OTHERS, DUMP_CONTROL, DBG_LVL_ALL, 
"u8ServiceFlowSchedulingType: 0x%X",
+       BCM_DEBUG_PRINT(ad, DBG_TYPE_OTHERS, DUMP_CONTROL, DBG_LVL_ALL, 
"u8ServiceFlowSchedulingType: 0x%X",
                        
pstAddIndication->sfAuthorizedSet.u8ServiceFlowSchedulingType);
-       BCM_DEBUG_PRINT(Adapter, DBG_TYPE_OTHERS, DUMP_CONTROL, DBG_LVL_ALL, 
"u32ToleratedJitter: 0x%X", 
pstAddIndication->sfAuthorizedSet.u32ToleratedJitter);
-       BCM_DEBUG_PRINT(Adapter, DBG_TYPE_OTHERS, DUMP_CONTROL, DBG_LVL_ALL, 
"u32MaximumLatency: 0x%X", pstAddIndication->sfAuthorizedSet.u32MaximumLatency);
-       BCM_DEBUG_PRINT(Adapter, DBG_TYPE_OTHERS, DUMP_CONTROL, DBG_LVL_ALL, 
"u8FixedLengthVSVariableLengthSDUIndicator: 0x%X",
+       BCM_DEBUG_PRINT(ad, DBG_TYPE_OTHERS, DUMP_CONTROL, DBG_LVL_ALL, 
"u32ToleratedJitter: 0x%X", 
pstAddIndication->sfAuthorizedSet.u32ToleratedJitter);
+       BCM_DEBUG_PRINT(ad, DBG_TYPE_OTHERS, DUMP_CONTROL, DBG_LVL_ALL, 
"u32MaximumLatency: 0x%X", pstAddIndication->sfAuthorizedSet.u32MaximumLatency);
+       BCM_DEBUG_PRINT(ad, DBG_TYPE_OTHERS, DUMP_CONTROL, DBG_LVL_ALL, 
"u8FixedLengthVSVariableLengthSDUIndicator: 0x%X",
                        
pstAddIndication->sfAuthorizedSet.u8FixedLengthVSVariableLengthSDUIndicator);
-       BCM_DEBUG_PRINT(Adapter, DBG_TYPE_OTHERS, DUMP_CONTROL, DBG_LVL_ALL, 
"u8SDUSize: 0x%X", pstAddIndication->sfAuthorizedSet.u8SDUSize);
-       BCM_DEBUG_PRINT(Adapter, DBG_TYPE_OTHERS, DUMP_CONTROL, DBG_LVL_ALL, 
"u16TargetSAID: 0x%X", pstAddIndication->sfAuthorizedSet.u16TargetSAID);
-       BCM_DEBUG_PRINT(Adapter, DBG_TYPE_OTHERS, DUMP_CONTROL, DBG_LVL_ALL, 
"u8ARQEnable: 0x%X", pstAddIndication->sfAuthorizedSet.u8ARQEnable);
-       BCM_DEBUG_PRINT(Adapter, DBG_TYPE_OTHERS, DUMP_CONTROL, DBG_LVL_ALL, 
"u16ARQWindowSize: 0x%X", pstAddIndication->sfAuthorizedSet.u16ARQWindowSize);
-       BCM_DEBUG_PRINT(Adapter, DBG_TYPE_OTHERS, DUMP_CONTROL, DBG_LVL_ALL, 
"u16ARQRetryTxTimeOut: 0x%X", 
pstAddIndication->sfAuthorizedSet.u16ARQRetryTxTimeOut);
-       BCM_DEBUG_PRINT(Adapter, DBG_TYPE_OTHERS, DUMP_CONTROL, DBG_LVL_ALL, 
"u16ARQRetryRxTimeOut: 0x%X", 
pstAddIndication->sfAuthorizedSet.u16ARQRetryRxTimeOut);
-       BCM_DEBUG_PRINT(Adapter, DBG_TYPE_OTHERS, DUMP_CONTROL, DBG_LVL_ALL, 
"u16ARQBlockLifeTime: 0x%X", 
pstAddIndication->sfAuthorizedSet.u16ARQBlockLifeTime);
-       BCM_DEBUG_PRINT(Adapter, DBG_TYPE_OTHERS, DUMP_CONTROL, DBG_LVL_ALL, 
"u16ARQSyncLossTimeOut: 0x%X", 
pstAddIndication->sfAuthorizedSet.u16ARQSyncLossTimeOut);
-       BCM_DEBUG_PRINT(Adapter, DBG_TYPE_OTHERS, DUMP_CONTROL, DBG_LVL_ALL, 
"u8ARQDeliverInOrder: 0x%X", 
pstAddIndication->sfAuthorizedSet.u8ARQDeliverInOrder);
-       BCM_DEBUG_PRINT(Adapter, DBG_TYPE_OTHERS, DUMP_CONTROL, DBG_LVL_ALL, 
"u16ARQRxPurgeTimeOut: 0x%X", 
pstAddIndication->sfAuthorizedSet.u16ARQRxPurgeTimeOut);
-       BCM_DEBUG_PRINT(Adapter, DBG_TYPE_OTHERS, DUMP_CONTROL, DBG_LVL_ALL, 
"u16ARQBlockSize: 0x%X", pstAddIndication->sfAuthorizedSet.u16ARQBlockSize);
-       BCM_DEBUG_PRINT(Adapter, DBG_TYPE_OTHERS, DUMP_CONTROL, DBG_LVL_ALL, 
"u8CSSpecification: 0x%X", pstAddIndication->sfAuthorizedSet.u8CSSpecification);
-       BCM_DEBUG_PRINT(Adapter, DBG_TYPE_OTHERS, DUMP_CONTROL, DBG_LVL_ALL, 
"u8TypeOfDataDeliveryService: 0x%X",
+       BCM_DEBUG_PRINT(ad, DBG_TYPE_OTHERS, DUMP_CONTROL, DBG_LVL_ALL, 
"u8SDUSize: 0x%X",      pstAddIndication->sfAuthorizedSet.u8SDUSize);
+       BCM_DEBUG_PRINT(ad, DBG_TYPE_OTHERS, DUMP_CONTROL, DBG_LVL_ALL, 
"u16TargetSAID: 0x%X", pstAddIndication->sfAuthorizedSet.u16TargetSAID);
+       BCM_DEBUG_PRINT(ad, DBG_TYPE_OTHERS, DUMP_CONTROL, DBG_LVL_ALL, 
"u8ARQEnable: 0x%X", pstAddIndication->sfAuthorizedSet.u8ARQEnable);
+       BCM_DEBUG_PRINT(ad, DBG_TYPE_OTHERS, DUMP_CONTROL, DBG_LVL_ALL, 
"u16ARQWindowSize: 0x%X", pstAddIndication->sfAuthorizedSet.u16ARQWindowSize);
+       BCM_DEBUG_PRINT(ad, DBG_TYPE_OTHERS, DUMP_CONTROL, DBG_LVL_ALL, 
"u16ARQRetryTxTimeOut: 0x%X", 
pstAddIndication->sfAuthorizedSet.u16ARQRetryTxTimeOut);
+       BCM_DEBUG_PRINT(ad, DBG_TYPE_OTHERS, DUMP_CONTROL, DBG_LVL_ALL, 
"u16ARQRetryRxTimeOut: 0x%X", 
pstAddIndication->sfAuthorizedSet.u16ARQRetryRxTimeOut);
+       BCM_DEBUG_PRINT(ad, DBG_TYPE_OTHERS, DUMP_CONTROL, DBG_LVL_ALL, 
"u16ARQBlockLifeTime: 0x%X", 
pstAddIndication->sfAuthorizedSet.u16ARQBlockLifeTime);
+       BCM_DEBUG_PRINT(ad, DBG_TYPE_OTHERS, DUMP_CONTROL, DBG_LVL_ALL, 
"u16ARQSyncLossTimeOut: 0x%X", 
pstAddIndication->sfAuthorizedSet.u16ARQSyncLossTimeOut);
+       BCM_DEBUG_PRINT(ad, DBG_TYPE_OTHERS, DUMP_CONTROL, DBG_LVL_ALL, 
"u8ARQDeliverInOrder: 0x%X", 
pstAddIndication->sfAuthorizedSet.u8ARQDeliverInOrder);
+       BCM_DEBUG_PRINT(ad, DBG_TYPE_OTHERS, DUMP_CONTROL, DBG_LVL_ALL, 
"u16ARQRxPurgeTimeOut: 0x%X", 
pstAddIndication->sfAuthorizedSet.u16ARQRxPurgeTimeOut);
+       BCM_DEBUG_PRINT(ad, DBG_TYPE_OTHERS, DUMP_CONTROL, DBG_LVL_ALL, 
"u16ARQBlockSize: 0x%X", pstAddIndication->sfAuthorizedSet.u16ARQBlockSize);
+       BCM_DEBUG_PRINT(ad, DBG_TYPE_OTHERS, DUMP_CONTROL, DBG_LVL_ALL, 
"u8CSSpecification: 0x%X",      
pstAddIndication->sfAuthorizedSet.u8CSSpecification);
+       BCM_DEBUG_PRINT(ad, DBG_TYPE_OTHERS, DUMP_CONTROL, DBG_LVL_ALL, 
"u8TypeOfDataDeliveryService: 0x%X",
                        
pstAddIndication->sfAuthorizedSet.u8TypeOfDataDeliveryService);
-       BCM_DEBUG_PRINT(Adapter, DBG_TYPE_OTHERS, DUMP_CONTROL, DBG_LVL_ALL, 
"u16SDUInterArrivalTime: 0x%X", 
pstAddIndication->sfAuthorizedSet.u16SDUInterArrivalTime);
-       BCM_DEBUG_PRINT(Adapter, DBG_TYPE_OTHERS, DUMP_CONTROL, DBG_LVL_ALL, 
"u16TimeBase: 0x%X", pstAddIndication->sfAuthorizedSet.u16TimeBase);
-       BCM_DEBUG_PRINT(Adapter, DBG_TYPE_OTHERS, DUMP_CONTROL, DBG_LVL_ALL, 
"u8PagingPreference: 0x%X", 
pstAddIndication->sfAuthorizedSet.u8PagingPreference);
-       BCM_DEBUG_PRINT(Adapter, DBG_TYPE_OTHERS, DUMP_CONTROL, DBG_LVL_ALL, 
"u16UnsolicitedPollingInterval: 0x%X",
+       BCM_DEBUG_PRINT(ad, DBG_TYPE_OTHERS, DUMP_CONTROL, DBG_LVL_ALL, 
"u16SDUInterArrivalTime: 0x%X", 
pstAddIndication->sfAuthorizedSet.u16SDUInterArrivalTime);
+       BCM_DEBUG_PRINT(ad, DBG_TYPE_OTHERS, DUMP_CONTROL, DBG_LVL_ALL, 
"u16TimeBase: 0x%X", pstAddIndication->sfAuthorizedSet.u16TimeBase);
+       BCM_DEBUG_PRINT(ad, DBG_TYPE_OTHERS, DUMP_CONTROL, DBG_LVL_ALL, 
"u8PagingPreference: 0x%X", 
pstAddIndication->sfAuthorizedSet.u8PagingPreference);
+       BCM_DEBUG_PRINT(ad, DBG_TYPE_OTHERS, DUMP_CONTROL, DBG_LVL_ALL, 
"u16UnsolicitedPollingInterval: 0x%X",
                        
pstAddIndication->sfAuthorizedSet.u16UnsolicitedPollingInterval);
 
-       BCM_DEBUG_PRINT(Adapter, DBG_TYPE_OTHERS, DUMP_CONTROL, DBG_LVL_ALL, 
"sfAuthorizedSet.u8HARQChannelMapping %x  %x %x ",
+       BCM_DEBUG_PRINT(ad, DBG_TYPE_OTHERS, DUMP_CONTROL, DBG_LVL_ALL, 
"sfAuthorizedSet.u8HARQChannelMapping %x  %x %x ",
                        *(unsigned int 
*)pstAddIndication->sfAuthorizedSet.u8HARQChannelMapping,
                        *(unsigned int 
*)&pstAddIndication->sfAuthorizedSet.u8HARQChannelMapping[4],
                        *(USHORT 
*)&pstAddIndication->sfAuthorizedSet.u8HARQChannelMapping[8]);
-       BCM_DEBUG_PRINT(Adapter, DBG_TYPE_OTHERS, DUMP_CONTROL, DBG_LVL_ALL, 
"u8TrafficIndicationPreference: 0x%X",
+       BCM_DEBUG_PRINT(ad, DBG_TYPE_OTHERS, DUMP_CONTROL, DBG_LVL_ALL, 
"u8TrafficIndicationPreference: 0x%X",
                        
pstAddIndication->sfAuthorizedSet.u8TrafficIndicationPreference);
-       BCM_DEBUG_PRINT(Adapter, DBG_TYPE_OTHERS, DUMP_CONTROL, DBG_LVL_ALL, " 
Total Classifiers Received: 0x%X", 
pstAddIndication->sfAuthorizedSet.u8TotalClassifiers);
+       BCM_DEBUG_PRINT(ad, DBG_TYPE_OTHERS, DUMP_CONTROL, DBG_LVL_ALL, " Total 
Classifiers Received: 0x%X", 
pstAddIndication->sfAuthorizedSet.u8TotalClassifiers);
 
        nCurClassifierCnt = 
pstAddIndication->sfAuthorizedSet.u8TotalClassifiers;
        if (nCurClassifierCnt > MAX_CLASSIFIERS_IN_SF)
                nCurClassifierCnt = MAX_CLASSIFIERS_IN_SF;
 
-       BCM_DEBUG_PRINT(Adapter, DBG_TYPE_OTHERS, DUMP_CONTROL, DBG_LVL_ALL,  
"pstAddIndication->sfAuthorizedSet.bValid %d", 
pstAddIndication->sfAuthorizedSet.bValid);
-       BCM_DEBUG_PRINT(Adapter, DBG_TYPE_OTHERS, DUMP_CONTROL, DBG_LVL_ALL,  
"pstAddIndication->sfAuthorizedSet.u16MacOverhead %x", 
pstAddIndication->sfAuthorizedSet.u16MacOverhead);
+       BCM_DEBUG_PRINT(ad, DBG_TYPE_OTHERS, DUMP_CONTROL, DBG_LVL_ALL,  
"pstAddIndication->sfAuthorizedSet.bValid %d", 
pstAddIndication->sfAuthorizedSet.bValid);
+       BCM_DEBUG_PRINT(ad, DBG_TYPE_OTHERS, DUMP_CONTROL, DBG_LVL_ALL,  
"pstAddIndication->sfAuthorizedSet.u16MacOverhead %x", 
pstAddIndication->sfAuthorizedSet.u16MacOverhead);
        if (!pstAddIndication->sfAuthorizedSet.bValid)
                pstAddIndication->sfAuthorizedSet.bValid = 1;
        for (nIndex = 0; nIndex < nCurClassifierCnt; nIndex++) {
@@ -975,141 +975,141 @@ static VOID DumpCmControlPacket(PVOID pvBuffer)
 
                psfCSType =  
&pstAddIndication->sfAuthorizedSet.cConvergenceSLTypes[nIndex];
 
-               BCM_DEBUG_PRINT(Adapter, DBG_TYPE_OTHERS, DUMP_CONTROL, 
DBG_LVL_ALL, "psfCSType = %p", psfCSType);
-               BCM_DEBUG_PRINT(Adapter, DBG_TYPE_OTHERS, DUMP_CONTROL, 
DBG_LVL_ALL, "CCPacketClassificationRuleSI====>");
-               BCM_DEBUG_PRINT(Adapter, DBG_TYPE_OTHERS, DUMP_CONTROL, 
DBG_LVL_ALL, "u8ClassifierRulePriority: 0x%X ",
+               BCM_DEBUG_PRINT(ad, DBG_TYPE_OTHERS, DUMP_CONTROL, DBG_LVL_ALL, 
"psfCSType = %p", psfCSType);
+               BCM_DEBUG_PRINT(ad, DBG_TYPE_OTHERS, DUMP_CONTROL, DBG_LVL_ALL, 
"CCPacketClassificationRuleSI====>");
+               BCM_DEBUG_PRINT(ad, DBG_TYPE_OTHERS, DUMP_CONTROL, DBG_LVL_ALL, 
"u8ClassifierRulePriority: 0x%X ",
                                
psfCSType->cCPacketClassificationRule.u8ClassifierRulePriority);
-               BCM_DEBUG_PRINT(Adapter, DBG_TYPE_OTHERS, DUMP_CONTROL, 
DBG_LVL_ALL,  "u8IPTypeOfServiceLength: 0x%X ",
+               BCM_DEBUG_PRINT(ad, DBG_TYPE_OTHERS, DUMP_CONTROL, DBG_LVL_ALL, 
 "u8IPTypeOfServiceLength: 0x%X ",
                                
psfCSType->cCPacketClassificationRule.u8IPTypeOfServiceLength);
-               BCM_DEBUG_PRINT(Adapter, DBG_TYPE_OTHERS, DUMP_CONTROL, 
DBG_LVL_ALL, "u8IPTypeOfService[3]: 0x%X ,0x%X ,0x%X ",
+               BCM_DEBUG_PRINT(ad, DBG_TYPE_OTHERS, DUMP_CONTROL, DBG_LVL_ALL, 
"u8IPTypeOfService[3]: 0x%X ,0x%X ,0x%X ",
                                
psfCSType->cCPacketClassificationRule.u8IPTypeOfService[0],
                                
psfCSType->cCPacketClassificationRule.u8IPTypeOfService[1],
                                
psfCSType->cCPacketClassificationRule.u8IPTypeOfService[2]);
 
                for (uiLoopIndex = 0; uiLoopIndex < 1; uiLoopIndex++)
-                       BCM_DEBUG_PRINT(Adapter, DBG_TYPE_OTHERS, DUMP_CONTROL, 
DBG_LVL_ALL, "u8Protocol: 0x%02X ",
+                       BCM_DEBUG_PRINT(ad, DBG_TYPE_OTHERS, DUMP_CONTROL, 
DBG_LVL_ALL, "u8Protocol: 0x%02X ",
                                        
psfCSType->cCPacketClassificationRule.u8Protocol);
 
-               BCM_DEBUG_PRINT(Adapter, DBG_TYPE_OTHERS, DUMP_CONTROL, 
DBG_LVL_ALL, "u8IPMaskedSourceAddressLength: 0x%X ",
+               BCM_DEBUG_PRINT(ad, DBG_TYPE_OTHERS, DUMP_CONTROL, DBG_LVL_ALL, 
"u8IPMaskedSourceAddressLength: 0x%X ",
                                
psfCSType->cCPacketClassificationRule.u8IPMaskedSourceAddressLength);
 
                for (uiLoopIndex = 0; uiLoopIndex < 32; uiLoopIndex++)
-                       BCM_DEBUG_PRINT(Adapter, DBG_TYPE_OTHERS, DUMP_CONTROL, 
DBG_LVL_ALL, "u8IPMaskedSourceAddress[32]: 0x%02X ",
+                       BCM_DEBUG_PRINT(ad, DBG_TYPE_OTHERS, DUMP_CONTROL, 
DBG_LVL_ALL, "u8IPMaskedSourceAddress[32]: 0x%02X ",
                                        
psfCSType->cCPacketClassificationRule.u8IPMaskedSourceAddress[uiLoopIndex]);
 
-               BCM_DEBUG_PRINT(Adapter, DBG_TYPE_OTHERS, DUMP_CONTROL, 
DBG_LVL_ALL, "u8IPDestinationAddressLength: 0x%X ",
+               BCM_DEBUG_PRINT(ad, DBG_TYPE_OTHERS, DUMP_CONTROL, DBG_LVL_ALL, 
"u8IPDestinationAddressLength: 0x%X ",
                                
psfCSType->cCPacketClassificationRule.u8IPDestinationAddressLength);
 
                for (uiLoopIndex = 0; uiLoopIndex < 32; uiLoopIndex++)
-                       BCM_DEBUG_PRINT(Adapter, DBG_TYPE_OTHERS, DUMP_CONTROL, 
DBG_LVL_ALL, "u8IPDestinationAddress[32]: 0x%02X ",
+                       BCM_DEBUG_PRINT(ad, DBG_TYPE_OTHERS, DUMP_CONTROL, 
DBG_LVL_ALL, "u8IPDestinationAddress[32]: 0x%02X ",
                                        
psfCSType->cCPacketClassificationRule.u8IPDestinationAddress[uiLoopIndex]);
 
-               BCM_DEBUG_PRINT(Adapter, DBG_TYPE_OTHERS, DUMP_CONTROL, 
DBG_LVL_ALL, "u8ProtocolSourcePortRangeLength:0x%X ",
+               BCM_DEBUG_PRINT(ad, DBG_TYPE_OTHERS, DUMP_CONTROL, DBG_LVL_ALL, 
"u8ProtocolSourcePortRangeLength:0x%X ",
                                
psfCSType->cCPacketClassificationRule.u8ProtocolSourcePortRangeLength);
-               BCM_DEBUG_PRINT(Adapter, DBG_TYPE_OTHERS, DUMP_CONTROL, 
DBG_LVL_ALL, "u8ProtocolSourcePortRange[4]: 0x%02X ,0x%02X ,0x%02X ,0x%02X ",
+               BCM_DEBUG_PRINT(ad, DBG_TYPE_OTHERS, DUMP_CONTROL, DBG_LVL_ALL, 
"u8ProtocolSourcePortRange[4]: 0x%02X ,0x%02X ,0x%02X ,0x%02X ",
                                
psfCSType->cCPacketClassificationRule.u8ProtocolSourcePortRange[0],
                                
psfCSType->cCPacketClassificationRule.u8ProtocolSourcePortRange[1],
                                
psfCSType->cCPacketClassificationRule.u8ProtocolSourcePortRange[2],
                                
psfCSType->cCPacketClassificationRule.u8ProtocolSourcePortRange[3]);
 
-               BCM_DEBUG_PRINT(Adapter, DBG_TYPE_OTHERS, DUMP_CONTROL, 
DBG_LVL_ALL, "u8ProtocolDestPortRangeLength: 0x%02X ",
+               BCM_DEBUG_PRINT(ad, DBG_TYPE_OTHERS, DUMP_CONTROL, DBG_LVL_ALL, 
"u8ProtocolDestPortRangeLength: 0x%02X ",
                                
psfCSType->cCPacketClassificationRule.u8ProtocolDestPortRangeLength);
-               BCM_DEBUG_PRINT(Adapter, DBG_TYPE_OTHERS, DUMP_CONTROL, 
DBG_LVL_ALL, "u8ProtocolDestPortRange[4]: 0x%02X ,0x%02X ,0x%02X ,0x%02X ",
+               BCM_DEBUG_PRINT(ad, DBG_TYPE_OTHERS, DUMP_CONTROL, DBG_LVL_ALL, 
"u8ProtocolDestPortRange[4]: 0x%02X ,0x%02X ,0x%02X ,0x%02X ",
                                
psfCSType->cCPacketClassificationRule.u8ProtocolDestPortRange[0],
                                
psfCSType->cCPacketClassificationRule.u8ProtocolDestPortRange[1],
                                
psfCSType->cCPacketClassificationRule.u8ProtocolDestPortRange[2],
                                
psfCSType->cCPacketClassificationRule.u8ProtocolDestPortRange[3]);
 
-               BCM_DEBUG_PRINT(Adapter, DBG_TYPE_OTHERS, DUMP_CONTROL, 
DBG_LVL_ALL, "u8EthernetDestMacAddressLength: 0x%02X ",
+               BCM_DEBUG_PRINT(ad, DBG_TYPE_OTHERS, DUMP_CONTROL, DBG_LVL_ALL, 
"u8EthernetDestMacAddressLength: 0x%02X ",
                                
psfCSType->cCPacketClassificationRule.u8EthernetDestMacAddressLength);
 
-               BCM_DEBUG_PRINT(Adapter, DBG_TYPE_OTHERS, DUMP_CONTROL,
+               BCM_DEBUG_PRINT(ad, DBG_TYPE_OTHERS, DUMP_CONTROL,
                                DBG_LVL_ALL, "u8EthernetDestMacAddress[6]: %pM",
                                psfCSType->cCPacketClassificationRule.
                                                u8EthernetDestMacAddress);
 
-               BCM_DEBUG_PRINT(Adapter, DBG_TYPE_OTHERS, DUMP_CONTROL, 
DBG_LVL_ALL, "u8EthernetSourceMACAddressLength: 0x%02X ",
+               BCM_DEBUG_PRINT(ad, DBG_TYPE_OTHERS, DUMP_CONTROL, DBG_LVL_ALL, 
"u8EthernetSourceMACAddressLength: 0x%02X ",
                                
psfCSType->cCPacketClassificationRule.u8EthernetDestMacAddressLength);
 
-               BCM_DEBUG_PRINT(Adapter, DBG_TYPE_OTHERS, DUMP_CONTROL,
+               BCM_DEBUG_PRINT(ad, DBG_TYPE_OTHERS, DUMP_CONTROL,
                                DBG_LVL_ALL, "u8EthernetSourceMACAddress[6]: 
%pM",
                                psfCSType->cCPacketClassificationRule.
                                                u8EthernetSourceMACAddress);
 
-               BCM_DEBUG_PRINT(Adapter, DBG_TYPE_OTHERS, DUMP_CONTROL, 
DBG_LVL_ALL, "u8EthertypeLength: 0x%02X ",
+               BCM_DEBUG_PRINT(ad, DBG_TYPE_OTHERS, DUMP_CONTROL, DBG_LVL_ALL, 
"u8EthertypeLength: 0x%02X ",
                                
psfCSType->cCPacketClassificationRule.u8EthertypeLength);
-               BCM_DEBUG_PRINT(Adapter, DBG_TYPE_OTHERS, DUMP_CONTROL, 
DBG_LVL_ALL, "u8Ethertype[3]: 0x%02X ,0x%02X ,0x%02X ",
+               BCM_DEBUG_PRINT(ad, DBG_TYPE_OTHERS, DUMP_CONTROL, DBG_LVL_ALL, 
"u8Ethertype[3]: 0x%02X ,0x%02X ,0x%02X ",
                                
psfCSType->cCPacketClassificationRule.u8Ethertype[0],
                                
psfCSType->cCPacketClassificationRule.u8Ethertype[1],
                                
psfCSType->cCPacketClassificationRule.u8Ethertype[2]);
 
-               BCM_DEBUG_PRINT(Adapter, DBG_TYPE_OTHERS, DUMP_CONTROL, 
DBG_LVL_ALL, "u16UserPriority: 0x%X ", 
psfCSType->cCPacketClassificationRule.u16UserPriority);
-               BCM_DEBUG_PRINT(Adapter, DBG_TYPE_OTHERS, DUMP_CONTROL, 
DBG_LVL_ALL, "u16VLANID: 0x%X ", 
psfCSType->cCPacketClassificationRule.u16VLANID);
-               BCM_DEBUG_PRINT(Adapter, DBG_TYPE_OTHERS, DUMP_CONTROL, 
DBG_LVL_ALL, "u8AssociatedPHSI: 0x%02X ", 
psfCSType->cCPacketClassificationRule.u8AssociatedPHSI);
-               BCM_DEBUG_PRINT(Adapter, DBG_TYPE_OTHERS, DUMP_CONTROL, 
DBG_LVL_ALL, "u16PacketClassificationRuleIndex: 0x%X ",
+               BCM_DEBUG_PRINT(ad, DBG_TYPE_OTHERS, DUMP_CONTROL, DBG_LVL_ALL, 
"u16UserPriority: 0x%X ", 
psfCSType->cCPacketClassificationRule.u16UserPriority);
+               BCM_DEBUG_PRINT(ad, DBG_TYPE_OTHERS, DUMP_CONTROL, DBG_LVL_ALL, 
"u16VLANID: 0x%X ", psfCSType->cCPacketClassificationRule.u16VLANID);
+               BCM_DEBUG_PRINT(ad, DBG_TYPE_OTHERS, DUMP_CONTROL, DBG_LVL_ALL, 
"u8AssociatedPHSI: 0x%02X ", 
psfCSType->cCPacketClassificationRule.u8AssociatedPHSI);
+               BCM_DEBUG_PRINT(ad, DBG_TYPE_OTHERS, DUMP_CONTROL, DBG_LVL_ALL, 
"u16PacketClassificationRuleIndex: 0x%X ",
                                
psfCSType->cCPacketClassificationRule.u16PacketClassificationRuleIndex);
 
-               BCM_DEBUG_PRINT(Adapter, DBG_TYPE_OTHERS, DUMP_CONTROL, 
DBG_LVL_ALL, "u8VendorSpecificClassifierParamLength: 0x%X ",
+               BCM_DEBUG_PRINT(ad, DBG_TYPE_OTHERS, DUMP_CONTROL, DBG_LVL_ALL, 
"u8VendorSpecificClassifierParamLength: 0x%X ",
                                
psfCSType->cCPacketClassificationRule.u8VendorSpecificClassifierParamLength);
-               BCM_DEBUG_PRINT(Adapter, DBG_TYPE_OTHERS, DUMP_CONTROL, 
DBG_LVL_ALL, "u8VendorSpecificClassifierParam[1]: 0x%X ",
+               BCM_DEBUG_PRINT(ad, DBG_TYPE_OTHERS, DUMP_CONTROL, DBG_LVL_ALL, 
"u8VendorSpecificClassifierParam[1]: 0x%X ",
                                
psfCSType->cCPacketClassificationRule.u8VendorSpecificClassifierParam[0]);
 #ifdef VERSION_D5
-               BCM_DEBUG_PRINT(Adapter, DBG_TYPE_OTHERS, DUMP_CONTROL, 
DBG_LVL_ALL, "u8IPv6FlowLableLength: 0x%X ",
+               BCM_DEBUG_PRINT(ad, DBG_TYPE_OTHERS, DUMP_CONTROL, DBG_LVL_ALL, 
"u8IPv6FlowLableLength: 0x%X ",
                                
psfCSType->cCPacketClassificationRule.u8IPv6FlowLableLength);
-               BCM_DEBUG_PRINT(Adapter, DBG_TYPE_OTHERS, DUMP_CONTROL,
+               BCM_DEBUG_PRINT(ad, DBG_TYPE_OTHERS, DUMP_CONTROL,
                                DBG_LVL_ALL, "u8IPv6FlowLable[6]: 0x%*ph ",
                                6, psfCSType->cCPacketClassificationRule.
                                              u8IPv6FlowLable);
 #endif
        }
 
-       BCM_DEBUG_PRINT(Adapter, DBG_TYPE_OTHERS, DUMP_CONTROL, DBG_LVL_ALL, 
"bValid: 0x%02X", pstAddIndication->sfAuthorizedSet.bValid);
-       BCM_DEBUG_PRINT(Adapter, DBG_TYPE_OTHERS, DUMP_CONTROL, DBG_LVL_ALL, 
"AdmittedSet--->");
-       BCM_DEBUG_PRINT(Adapter, DBG_TYPE_OTHERS, DUMP_CONTROL, DBG_LVL_ALL, 
"u32SFID: 0x%X", pstAddIndication->sfAdmittedSet.u32SFID);
-       BCM_DEBUG_PRINT(Adapter, DBG_TYPE_OTHERS, DUMP_CONTROL, DBG_LVL_ALL, 
"u16CID: 0x%X", pstAddIndication->sfAdmittedSet.u16CID);
-       BCM_DEBUG_PRINT(Adapter, DBG_TYPE_OTHERS, DUMP_CONTROL, DBG_LVL_ALL, 
"u8ServiceClassNameLength: 0x%X",
+       BCM_DEBUG_PRINT(ad, DBG_TYPE_OTHERS, DUMP_CONTROL, DBG_LVL_ALL, 
"bValid: 0x%02X", pstAddIndication->sfAuthorizedSet.bValid);
+       BCM_DEBUG_PRINT(ad, DBG_TYPE_OTHERS, DUMP_CONTROL, DBG_LVL_ALL, 
"AdmittedSet--->");
+       BCM_DEBUG_PRINT(ad, DBG_TYPE_OTHERS, DUMP_CONTROL, DBG_LVL_ALL, 
"u32SFID: 0x%X", pstAddIndication->sfAdmittedSet.u32SFID);
+       BCM_DEBUG_PRINT(ad, DBG_TYPE_OTHERS, DUMP_CONTROL, DBG_LVL_ALL, 
"u16CID: 0x%X", pstAddIndication->sfAdmittedSet.u16CID);
+       BCM_DEBUG_PRINT(ad, DBG_TYPE_OTHERS, DUMP_CONTROL, DBG_LVL_ALL, 
"u8ServiceClassNameLength: 0x%X",
                        
pstAddIndication->sfAdmittedSet.u8ServiceClassNameLength);
-       BCM_DEBUG_PRINT(Adapter, DBG_TYPE_OTHERS, DUMP_CONTROL, DBG_LVL_ALL,
+       BCM_DEBUG_PRINT(ad, DBG_TYPE_OTHERS, DUMP_CONTROL, DBG_LVL_ALL,
                        "u8ServiceClassName: 0x%*ph",
                        6, pstAddIndication->sfAdmittedSet.u8ServiceClassName);
 
-       BCM_DEBUG_PRINT(Adapter, DBG_TYPE_OTHERS, DUMP_CONTROL, DBG_LVL_ALL, 
"u8MBSService: 0x%02X", pstAddIndication->sfAdmittedSet.u8MBSService);
-       BCM_DEBUG_PRINT(Adapter, DBG_TYPE_OTHERS, DUMP_CONTROL, DBG_LVL_ALL, 
"u8QosParamSet: 0x%02X", pstAddIndication->sfAdmittedSet.u8QosParamSet);
-       BCM_DEBUG_PRINT(Adapter, DBG_TYPE_OTHERS, DUMP_CONTROL, DBG_LVL_ALL, 
"u8TrafficPriority: 0x%02X", pstAddIndication->sfAdmittedSet.u8TrafficPriority);
-       BCM_DEBUG_PRINT(Adapter, DBG_TYPE_OTHERS, DUMP_CONTROL, DBG_LVL_ALL, 
"u32MaxTrafficBurst: 0x%X", pstAddIndication->sfAdmittedSet.u32MaxTrafficBurst);
-       BCM_DEBUG_PRINT(Adapter, DBG_TYPE_OTHERS, DUMP_CONTROL, DBG_LVL_ALL, 
"u32MinReservedTrafficRate: 0x%X",
+       BCM_DEBUG_PRINT(ad, DBG_TYPE_OTHERS, DUMP_CONTROL, DBG_LVL_ALL, 
"u8MBSService: 0x%02X", pstAddIndication->sfAdmittedSet.u8MBSService);
+       BCM_DEBUG_PRINT(ad, DBG_TYPE_OTHERS, DUMP_CONTROL, DBG_LVL_ALL, 
"u8QosParamSet: 0x%02X", pstAddIndication->sfAdmittedSet.u8QosParamSet);
+       BCM_DEBUG_PRINT(ad, DBG_TYPE_OTHERS, DUMP_CONTROL, DBG_LVL_ALL, 
"u8TrafficPriority: 0x%02X", pstAddIndication->sfAdmittedSet.u8TrafficPriority);
+       BCM_DEBUG_PRINT(ad, DBG_TYPE_OTHERS, DUMP_CONTROL, DBG_LVL_ALL, 
"u32MaxTrafficBurst: 0x%X", pstAddIndication->sfAdmittedSet.u32MaxTrafficBurst);
+       BCM_DEBUG_PRINT(ad, DBG_TYPE_OTHERS, DUMP_CONTROL, DBG_LVL_ALL, 
"u32MinReservedTrafficRate: 0x%X",
                        
pstAddIndication->sfAdmittedSet.u32MinReservedTrafficRate);
 
-       BCM_DEBUG_PRINT(Adapter, DBG_TYPE_OTHERS, DUMP_CONTROL, DBG_LVL_ALL, 
"u8VendorSpecificQoSParamLength: 0x%02X",
+       BCM_DEBUG_PRINT(ad, DBG_TYPE_OTHERS, DUMP_CONTROL, DBG_LVL_ALL, 
"u8VendorSpecificQoSParamLength: 0x%02X",
                        
pstAddIndication->sfAdmittedSet.u8VendorSpecificQoSParamLength);
-       BCM_DEBUG_PRINT(Adapter, DBG_TYPE_OTHERS, DUMP_CONTROL, DBG_LVL_ALL, 
"u8VendorSpecificQoSParam: 0x%02X",
+       BCM_DEBUG_PRINT(ad, DBG_TYPE_OTHERS, DUMP_CONTROL, DBG_LVL_ALL, 
"u8VendorSpecificQoSParam: 0x%02X",
                        
pstAddIndication->sfAdmittedSet.u8VendorSpecificQoSParam[0]);
-       BCM_DEBUG_PRINT(Adapter, DBG_TYPE_OTHERS, DUMP_CONTROL, DBG_LVL_ALL, 
"u8ServiceFlowSchedulingType: 0x%02X",
+       BCM_DEBUG_PRINT(ad, DBG_TYPE_OTHERS, DUMP_CONTROL, DBG_LVL_ALL, 
"u8ServiceFlowSchedulingType: 0x%02X",
                        
pstAddIndication->sfAdmittedSet.u8ServiceFlowSchedulingType);
-       BCM_DEBUG_PRINT(Adapter, DBG_TYPE_OTHERS, DUMP_CONTROL, DBG_LVL_ALL, 
"u32ToleratedJitter: 0x%X", pstAddIndication->sfAdmittedSet.u32ToleratedJitter);
-       BCM_DEBUG_PRINT(Adapter, DBG_TYPE_OTHERS, DUMP_CONTROL, DBG_LVL_ALL, 
"u32MaximumLatency: 0x%X", pstAddIndication->sfAdmittedSet.u32MaximumLatency);
-       BCM_DEBUG_PRINT(Adapter, DBG_TYPE_OTHERS, DUMP_CONTROL, DBG_LVL_ALL, 
"u8FixedLengthVSVariableLengthSDUIndicator: 0x%02X",
+       BCM_DEBUG_PRINT(ad, DBG_TYPE_OTHERS, DUMP_CONTROL, DBG_LVL_ALL, 
"u32ToleratedJitter: 0x%X", pstAddIndication->sfAdmittedSet.u32ToleratedJitter);
+       BCM_DEBUG_PRINT(ad, DBG_TYPE_OTHERS, DUMP_CONTROL, DBG_LVL_ALL, 
"u32MaximumLatency: 0x%X", pstAddIndication->sfAdmittedSet.u32MaximumLatency);
+       BCM_DEBUG_PRINT(ad, DBG_TYPE_OTHERS, DUMP_CONTROL, DBG_LVL_ALL, 
"u8FixedLengthVSVariableLengthSDUIndicator: 0x%02X",
                        
pstAddIndication->sfAdmittedSet.u8FixedLengthVSVariableLengthSDUIndicator);
-       BCM_DEBUG_PRINT(Adapter, DBG_TYPE_OTHERS, DUMP_CONTROL, DBG_LVL_ALL, 
"u8SDUSize: 0x%02X", pstAddIndication->sfAdmittedSet.u8SDUSize);
-       BCM_DEBUG_PRINT(Adapter, DBG_TYPE_OTHERS, DUMP_CONTROL, DBG_LVL_ALL, 
"u16TargetSAID: 0x%02X", pstAddIndication->sfAdmittedSet.u16TargetSAID);
-       BCM_DEBUG_PRINT(Adapter, DBG_TYPE_OTHERS, DUMP_CONTROL, DBG_LVL_ALL, 
"u8ARQEnable: 0x%02X", pstAddIndication->sfAdmittedSet.u8ARQEnable);
-       BCM_DEBUG_PRINT(Adapter, DBG_TYPE_OTHERS, DUMP_CONTROL, DBG_LVL_ALL, 
"u16ARQWindowSize: 0x%X", pstAddIndication->sfAdmittedSet.u16ARQWindowSize);
-       BCM_DEBUG_PRINT(Adapter, DBG_TYPE_OTHERS, DUMP_CONTROL, DBG_LVL_ALL, 
"u16ARQRetryTxTimeOut: 0x%X", 
pstAddIndication->sfAdmittedSet.u16ARQRetryTxTimeOut);
-       BCM_DEBUG_PRINT(Adapter, DBG_TYPE_OTHERS, DUMP_CONTROL, DBG_LVL_ALL, 
"u16ARQRetryRxTimeOut: 0x%X", 
pstAddIndication->sfAdmittedSet.u16ARQRetryRxTimeOut);
-       BCM_DEBUG_PRINT(Adapter, DBG_TYPE_OTHERS, DUMP_CONTROL, DBG_LVL_ALL, 
"u16ARQBlockLifeTime: 0x%X", 
pstAddIndication->sfAdmittedSet.u16ARQBlockLifeTime);
-       BCM_DEBUG_PRINT(Adapter, DBG_TYPE_OTHERS, DUMP_CONTROL, DBG_LVL_ALL, 
"u16ARQSyncLossTimeOut: 0x%X", 
pstAddIndication->sfAdmittedSet.u16ARQSyncLossTimeOut);
-       BCM_DEBUG_PRINT(Adapter, DBG_TYPE_OTHERS, DUMP_CONTROL, DBG_LVL_ALL, 
"u8ARQDeliverInOrder: 0x%02X", 
pstAddIndication->sfAdmittedSet.u8ARQDeliverInOrder);
-       BCM_DEBUG_PRINT(Adapter, DBG_TYPE_OTHERS, DUMP_CONTROL, DBG_LVL_ALL, 
"u16ARQRxPurgeTimeOut: 0x%X", 
pstAddIndication->sfAdmittedSet.u16ARQRxPurgeTimeOut);
-       BCM_DEBUG_PRINT(Adapter, DBG_TYPE_OTHERS, DUMP_CONTROL, DBG_LVL_ALL, 
"u16ARQBlockSize: 0x%X", pstAddIndication->sfAdmittedSet.u16ARQBlockSize);
-       BCM_DEBUG_PRINT(Adapter, DBG_TYPE_OTHERS, DUMP_CONTROL, DBG_LVL_ALL, 
"u8CSSpecification: 0x%02X", pstAddIndication->sfAdmittedSet.u8CSSpecification);
-       BCM_DEBUG_PRINT(Adapter, DBG_TYPE_OTHERS, DUMP_CONTROL, DBG_LVL_ALL, 
"u8TypeOfDataDeliveryService: 0x%02X",
+       BCM_DEBUG_PRINT(ad, DBG_TYPE_OTHERS, DUMP_CONTROL, DBG_LVL_ALL, 
"u8SDUSize: 0x%02X", pstAddIndication->sfAdmittedSet.u8SDUSize);
+       BCM_DEBUG_PRINT(ad, DBG_TYPE_OTHERS, DUMP_CONTROL, DBG_LVL_ALL, 
"u16TargetSAID: 0x%02X", pstAddIndication->sfAdmittedSet.u16TargetSAID);
+       BCM_DEBUG_PRINT(ad, DBG_TYPE_OTHERS, DUMP_CONTROL, DBG_LVL_ALL, 
"u8ARQEnable: 0x%02X", pstAddIndication->sfAdmittedSet.u8ARQEnable);
+       BCM_DEBUG_PRINT(ad, DBG_TYPE_OTHERS, DUMP_CONTROL, DBG_LVL_ALL, 
"u16ARQWindowSize: 0x%X", pstAddIndication->sfAdmittedSet.u16ARQWindowSize);
+       BCM_DEBUG_PRINT(ad, DBG_TYPE_OTHERS, DUMP_CONTROL, DBG_LVL_ALL, 
"u16ARQRetryTxTimeOut: 0x%X", 
pstAddIndication->sfAdmittedSet.u16ARQRetryTxTimeOut);
+       BCM_DEBUG_PRINT(ad, DBG_TYPE_OTHERS, DUMP_CONTROL, DBG_LVL_ALL, 
"u16ARQRetryRxTimeOut: 0x%X", 
pstAddIndication->sfAdmittedSet.u16ARQRetryRxTimeOut);
+       BCM_DEBUG_PRINT(ad, DBG_TYPE_OTHERS, DUMP_CONTROL, DBG_LVL_ALL, 
"u16ARQBlockLifeTime: 0x%X", 
pstAddIndication->sfAdmittedSet.u16ARQBlockLifeTime);
+       BCM_DEBUG_PRINT(ad, DBG_TYPE_OTHERS, DUMP_CONTROL, DBG_LVL_ALL, 
"u16ARQSyncLossTimeOut: 0x%X", 
pstAddIndication->sfAdmittedSet.u16ARQSyncLossTimeOut);
+       BCM_DEBUG_PRINT(ad, DBG_TYPE_OTHERS, DUMP_CONTROL, DBG_LVL_ALL, 
"u8ARQDeliverInOrder: 0x%02X", 
pstAddIndication->sfAdmittedSet.u8ARQDeliverInOrder);
+       BCM_DEBUG_PRINT(ad, DBG_TYPE_OTHERS, DUMP_CONTROL, DBG_LVL_ALL, 
"u16ARQRxPurgeTimeOut: 0x%X", 
pstAddIndication->sfAdmittedSet.u16ARQRxPurgeTimeOut);
+       BCM_DEBUG_PRINT(ad, DBG_TYPE_OTHERS, DUMP_CONTROL, DBG_LVL_ALL, 
"u16ARQBlockSize: 0x%X", pstAddIndication->sfAdmittedSet.u16ARQBlockSize);
+       BCM_DEBUG_PRINT(ad, DBG_TYPE_OTHERS, DUMP_CONTROL, DBG_LVL_ALL, 
"u8CSSpecification: 0x%02X", pstAddIndication->sfAdmittedSet.u8CSSpecification);
+       BCM_DEBUG_PRINT(ad, DBG_TYPE_OTHERS, DUMP_CONTROL, DBG_LVL_ALL, 
"u8TypeOfDataDeliveryService: 0x%02X",
                        
pstAddIndication->sfAdmittedSet.u8TypeOfDataDeliveryService);
-       BCM_DEBUG_PRINT(Adapter, DBG_TYPE_OTHERS, DUMP_CONTROL, DBG_LVL_ALL, 
"u16SDUInterArrivalTime: 0x%X", 
pstAddIndication->sfAdmittedSet.u16SDUInterArrivalTime);
-       BCM_DEBUG_PRINT(Adapter, DBG_TYPE_OTHERS, DUMP_CONTROL, DBG_LVL_ALL, 
"u16TimeBase: 0x%X", pstAddIndication->sfAdmittedSet.u16TimeBase);
-       BCM_DEBUG_PRINT(Adapter, DBG_TYPE_OTHERS, DUMP_CONTROL, DBG_LVL_ALL, 
"u8PagingPreference: 0x%X", pstAddIndication->sfAdmittedSet.u8PagingPreference);
-       BCM_DEBUG_PRINT(Adapter, DBG_TYPE_OTHERS, DUMP_CONTROL, DBG_LVL_ALL, 
"u8TrafficIndicationPreference: 0x%02X",
+       BCM_DEBUG_PRINT(ad, DBG_TYPE_OTHERS, DUMP_CONTROL, DBG_LVL_ALL, 
"u16SDUInterArrivalTime: 0x%X", 
pstAddIndication->sfAdmittedSet.u16SDUInterArrivalTime);
+       BCM_DEBUG_PRINT(ad, DBG_TYPE_OTHERS, DUMP_CONTROL, DBG_LVL_ALL, 
"u16TimeBase: 0x%X", pstAddIndication->sfAdmittedSet.u16TimeBase);
+       BCM_DEBUG_PRINT(ad, DBG_TYPE_OTHERS, DUMP_CONTROL, DBG_LVL_ALL, 
"u8PagingPreference: 0x%X", pstAddIndication->sfAdmittedSet.u8PagingPreference);
+       BCM_DEBUG_PRINT(ad, DBG_TYPE_OTHERS, DUMP_CONTROL, DBG_LVL_ALL, 
"u8TrafficIndicationPreference: 0x%02X",
                        
pstAddIndication->sfAdmittedSet.u8TrafficIndicationPreference);
-       BCM_DEBUG_PRINT(Adapter, DBG_TYPE_OTHERS, DUMP_CONTROL, DBG_LVL_ALL, " 
Total Classifiers Received: 0x%X", 
pstAddIndication->sfAdmittedSet.u8TotalClassifiers);
+       BCM_DEBUG_PRINT(ad, DBG_TYPE_OTHERS, DUMP_CONTROL, DBG_LVL_ALL, " Total 
Classifiers Received: 0x%X", 
pstAddIndication->sfAdmittedSet.u8TotalClassifiers);
 
        nCurClassifierCnt = pstAddIndication->sfAdmittedSet.u8TotalClassifiers;
        if (nCurClassifierCnt > MAX_CLASSIFIERS_IN_SF)
@@ -1119,134 +1119,134 @@ static VOID DumpCmControlPacket(PVOID pvBuffer)
                struct bcm_convergence_types *psfCSType = NULL;
 
                psfCSType =  
&pstAddIndication->sfAdmittedSet.cConvergenceSLTypes[nIndex];
-               BCM_DEBUG_PRINT(Adapter, DBG_TYPE_OTHERS, DUMP_CONTROL, 
DBG_LVL_ALL, " CCPacketClassificationRuleSI====>");
-               BCM_DEBUG_PRINT(Adapter, DBG_TYPE_OTHERS, DUMP_CONTROL, 
DBG_LVL_ALL, "u8ClassifierRulePriority: 0x%02X ",
+               BCM_DEBUG_PRINT(ad, DBG_TYPE_OTHERS, DUMP_CONTROL, DBG_LVL_ALL, 
" CCPacketClassificationRuleSI====>");
+               BCM_DEBUG_PRINT(ad, DBG_TYPE_OTHERS, DUMP_CONTROL, DBG_LVL_ALL, 
"u8ClassifierRulePriority: 0x%02X ",
                                
psfCSType->cCPacketClassificationRule.u8ClassifierRulePriority);
-               BCM_DEBUG_PRINT(Adapter, DBG_TYPE_OTHERS, DUMP_CONTROL, 
DBG_LVL_ALL, "u8IPTypeOfServiceLength: 0x%02X",
+               BCM_DEBUG_PRINT(ad, DBG_TYPE_OTHERS, DUMP_CONTROL, DBG_LVL_ALL, 
"u8IPTypeOfServiceLength: 0x%02X",
                                
psfCSType->cCPacketClassificationRule.u8IPTypeOfServiceLength);
-               BCM_DEBUG_PRINT(Adapter, DBG_TYPE_OTHERS, DUMP_CONTROL,
+               BCM_DEBUG_PRINT(ad, DBG_TYPE_OTHERS, DUMP_CONTROL,
                                DBG_LVL_ALL, "u8IPTypeOfService[3]: 0x%*ph",
                                3, psfCSType->cCPacketClassificationRule.
                                              u8IPTypeOfService);
                for (uiLoopIndex = 0; uiLoopIndex < 1; uiLoopIndex++)
-                       BCM_DEBUG_PRINT(Adapter, DBG_TYPE_OTHERS, DUMP_CONTROL, 
DBG_LVL_ALL, "u8Protocol: 0x%02X ", 
psfCSType->cCPacketClassificationRule.u8Protocol);
+                       BCM_DEBUG_PRINT(ad, DBG_TYPE_OTHERS, DUMP_CONTROL, 
DBG_LVL_ALL, "u8Protocol: 0x%02X ", 
psfCSType->cCPacketClassificationRule.u8Protocol);
 
-               BCM_DEBUG_PRINT(Adapter, DBG_TYPE_OTHERS, DUMP_CONTROL, 
DBG_LVL_ALL, "u8IPMaskedSourceAddressLength: 0x%02X ",
+               BCM_DEBUG_PRINT(ad, DBG_TYPE_OTHERS, DUMP_CONTROL, DBG_LVL_ALL, 
"u8IPMaskedSourceAddressLength: 0x%02X ",
                                
psfCSType->cCPacketClassificationRule.u8IPMaskedSourceAddressLength);
 
                for (uiLoopIndex = 0; uiLoopIndex < 32; uiLoopIndex++)
-                       BCM_DEBUG_PRINT(Adapter, DBG_TYPE_OTHERS, DUMP_CONTROL, 
DBG_LVL_ALL, "u8IPMaskedSourceAddress[32]: 0x%02X ",
+                       BCM_DEBUG_PRINT(ad, DBG_TYPE_OTHERS, DUMP_CONTROL, 
DBG_LVL_ALL, "u8IPMaskedSourceAddress[32]: 0x%02X ",
                                        
psfCSType->cCPacketClassificationRule.u8IPMaskedSourceAddress[uiLoopIndex]);
 
-               BCM_DEBUG_PRINT(Adapter, DBG_TYPE_OTHERS, DUMP_CONTROL, 
DBG_LVL_ALL, "u8IPDestinationAddressLength: 0x%02X ",
+               BCM_DEBUG_PRINT(ad, DBG_TYPE_OTHERS, DUMP_CONTROL, DBG_LVL_ALL, 
"u8IPDestinationAddressLength: 0x%02X ",
                                
psfCSType->cCPacketClassificationRule.u8IPDestinationAddressLength);
 
                for (uiLoopIndex = 0; uiLoopIndex < 32; uiLoopIndex++)
-                       BCM_DEBUG_PRINT(Adapter, DBG_TYPE_OTHERS, DUMP_CONTROL, 
DBG_LVL_ALL, "u8IPDestinationAddress[32]: 0x%02X ",
+                       BCM_DEBUG_PRINT(ad, DBG_TYPE_OTHERS, DUMP_CONTROL, 
DBG_LVL_ALL, "u8IPDestinationAddress[32]: 0x%02X ",
                                        
psfCSType->cCPacketClassificationRule.u8IPDestinationAddress[uiLoopIndex]);
 
-               BCM_DEBUG_PRINT(Adapter, DBG_TYPE_OTHERS, DUMP_CONTROL, 
DBG_LVL_ALL, "u8ProtocolSourcePortRangeLength: 0x%02X ",
+               BCM_DEBUG_PRINT(ad, DBG_TYPE_OTHERS, DUMP_CONTROL, DBG_LVL_ALL, 
"u8ProtocolSourcePortRangeLength: 0x%02X ",
                                
psfCSType->cCPacketClassificationRule.u8ProtocolSourcePortRangeLength);
 
-               BCM_DEBUG_PRINT(Adapter, DBG_TYPE_OTHERS, DUMP_CONTROL,
+               BCM_DEBUG_PRINT(ad, DBG_TYPE_OTHERS, DUMP_CONTROL,
                                DBG_LVL_ALL, "u8ProtocolSourcePortRange[4]: 
0x%*ph ",
                                4, psfCSType->cCPacketClassificationRule.
                                                u8ProtocolSourcePortRange);
 
-               BCM_DEBUG_PRINT(Adapter, DBG_TYPE_OTHERS, DUMP_CONTROL, 
DBG_LVL_ALL, "u8ProtocolDestPortRangeLength: 0x%02X ",
+               BCM_DEBUG_PRINT(ad, DBG_TYPE_OTHERS, DUMP_CONTROL, DBG_LVL_ALL, 
"u8ProtocolDestPortRangeLength: 0x%02X ",
                                
psfCSType->cCPacketClassificationRule.u8ProtocolDestPortRangeLength);
 
-               BCM_DEBUG_PRINT(Adapter, DBG_TYPE_OTHERS, DUMP_CONTROL,
+               BCM_DEBUG_PRINT(ad, DBG_TYPE_OTHERS, DUMP_CONTROL,
                                DBG_LVL_ALL, "u8ProtocolDestPortRange[4]: 
0x%*ph ",
                                4, psfCSType->cCPacketClassificationRule.
                                                u8ProtocolDestPortRange);
 
-               BCM_DEBUG_PRINT(Adapter, DBG_TYPE_OTHERS, DUMP_CONTROL, 
DBG_LVL_ALL, "u8EthernetDestMacAddressLength: 0x%02X ",
+               BCM_DEBUG_PRINT(ad, DBG_TYPE_OTHERS, DUMP_CONTROL, DBG_LVL_ALL, 
"u8EthernetDestMacAddressLength: 0x%02X ",
                                
psfCSType->cCPacketClassificationRule.u8EthernetDestMacAddressLength);
 
-               BCM_DEBUG_PRINT(Adapter, DBG_TYPE_OTHERS, DUMP_CONTROL,
+               BCM_DEBUG_PRINT(ad, DBG_TYPE_OTHERS, DUMP_CONTROL,
                                DBG_LVL_ALL, "u8EthernetDestMacAddress[6]: %pM",
                                psfCSType->cCPacketClassificationRule.
                                                u8EthernetDestMacAddress);
 
-               BCM_DEBUG_PRINT(Adapter, DBG_TYPE_OTHERS, DUMP_CONTROL, 
DBG_LVL_ALL, "u8EthernetSourceMACAddressLength: 0x%02X ",
+               BCM_DEBUG_PRINT(ad, DBG_TYPE_OTHERS, DUMP_CONTROL, DBG_LVL_ALL, 
"u8EthernetSourceMACAddressLength: 0x%02X ",
                                
psfCSType->cCPacketClassificationRule.u8EthernetDestMacAddressLength);
 
-               BCM_DEBUG_PRINT(Adapter, DBG_TYPE_OTHERS, DUMP_CONTROL,
+               BCM_DEBUG_PRINT(ad, DBG_TYPE_OTHERS, DUMP_CONTROL,
                                DBG_LVL_ALL, "u8EthernetSourceMACAddress[6]: 
%pM",
                                psfCSType->cCPacketClassificationRule.
                                                u8EthernetSourceMACAddress);
 
-               BCM_DEBUG_PRINT(Adapter, DBG_TYPE_OTHERS, DUMP_CONTROL, 
DBG_LVL_ALL, "u8EthertypeLength: 0x%02X ", 
psfCSType->cCPacketClassificationRule.u8EthertypeLength);
-               BCM_DEBUG_PRINT(Adapter, DBG_TYPE_OTHERS, DUMP_CONTROL,
+               BCM_DEBUG_PRINT(ad, DBG_TYPE_OTHERS, DUMP_CONTROL, DBG_LVL_ALL, 
"u8EthertypeLength: 0x%02X ", 
psfCSType->cCPacketClassificationRule.u8EthertypeLength);
+               BCM_DEBUG_PRINT(ad, DBG_TYPE_OTHERS, DUMP_CONTROL,
                                DBG_LVL_ALL, "u8Ethertype[3]: 0x%*ph",
                                3, psfCSType->cCPacketClassificationRule.
                                              u8Ethertype);
 
-               BCM_DEBUG_PRINT(Adapter, DBG_TYPE_OTHERS, DUMP_CONTROL, 
DBG_LVL_ALL, "u16UserPriority: 0x%X ", 
psfCSType->cCPacketClassificationRule.u16UserPriority);
-               BCM_DEBUG_PRINT(Adapter, DBG_TYPE_OTHERS, DUMP_CONTROL, 
DBG_LVL_ALL, "u16VLANID: 0x%X ", 
psfCSType->cCPacketClassificationRule.u16VLANID);
-               BCM_DEBUG_PRINT(Adapter, DBG_TYPE_OTHERS, DUMP_CONTROL, 
DBG_LVL_ALL, "u8AssociatedPHSI: 0x%02X ", 
psfCSType->cCPacketClassificationRule.u8AssociatedPHSI);
-               BCM_DEBUG_PRINT(Adapter, DBG_TYPE_OTHERS, DUMP_CONTROL, 
DBG_LVL_ALL, "u16PacketClassificationRuleIndex: 0x%X ",
+               BCM_DEBUG_PRINT(ad, DBG_TYPE_OTHERS, DUMP_CONTROL, DBG_LVL_ALL, 
"u16UserPriority: 0x%X ", 
psfCSType->cCPacketClassificationRule.u16UserPriority);
+               BCM_DEBUG_PRINT(ad, DBG_TYPE_OTHERS, DUMP_CONTROL, DBG_LVL_ALL, 
"u16VLANID: 0x%X ", psfCSType->cCPacketClassificationRule.u16VLANID);
+               BCM_DEBUG_PRINT(ad, DBG_TYPE_OTHERS, DUMP_CONTROL, DBG_LVL_ALL, 
"u8AssociatedPHSI: 0x%02X ", 
psfCSType->cCPacketClassificationRule.u8AssociatedPHSI);
+               BCM_DEBUG_PRINT(ad, DBG_TYPE_OTHERS, DUMP_CONTROL, DBG_LVL_ALL, 
"u16PacketClassificationRuleIndex: 0x%X ",
                                
psfCSType->cCPacketClassificationRule.u16PacketClassificationRuleIndex);
-               BCM_DEBUG_PRINT(Adapter, DBG_TYPE_OTHERS, DUMP_CONTROL, 
DBG_LVL_ALL, "u8VendorSpecificClassifierParamLength: 0x%02X",
+               BCM_DEBUG_PRINT(ad, DBG_TYPE_OTHERS, DUMP_CONTROL, DBG_LVL_ALL, 
"u8VendorSpecificClassifierParamLength: 0x%02X",
                                
psfCSType->cCPacketClassificationRule.u8VendorSpecificClassifierParamLength);
-               BCM_DEBUG_PRINT(Adapter, DBG_TYPE_OTHERS, DUMP_CONTROL, 
DBG_LVL_ALL, "u8VendorSpecificClassifierParam[1]: 0x%02X ",
+               BCM_DEBUG_PRINT(ad, DBG_TYPE_OTHERS, DUMP_CONTROL, DBG_LVL_ALL, 
"u8VendorSpecificClassifierParam[1]: 0x%02X ",
                                
psfCSType->cCPacketClassificationRule.u8VendorSpecificClassifierParam[0]);
 #ifdef VERSION_D5
-               BCM_DEBUG_PRINT(Adapter, DBG_TYPE_OTHERS, DUMP_CONTROL, 
DBG_LVL_ALL, "u8IPv6FlowLableLength: 0x%X ",
+               BCM_DEBUG_PRINT(ad, DBG_TYPE_OTHERS, DUMP_CONTROL, DBG_LVL_ALL, 
"u8IPv6FlowLableLength: 0x%X ",
                                
psfCSType->cCPacketClassificationRule.u8IPv6FlowLableLength);
-               BCM_DEBUG_PRINT(Adapter, DBG_TYPE_OTHERS, DUMP_CONTROL,
+               BCM_DEBUG_PRINT(ad, DBG_TYPE_OTHERS, DUMP_CONTROL,
                                DBG_LVL_ALL, "u8IPv6FlowLable[6]: 0x%*ph ",
                                6, psfCSType->cCPacketClassificationRule.
                                              u8IPv6FlowLable);
 #endif
        }
 
-       BCM_DEBUG_PRINT(Adapter, DBG_TYPE_OTHERS, DUMP_CONTROL, DBG_LVL_ALL, 
"bValid: 0x%X", pstAddIndication->sfAdmittedSet.bValid);
-       BCM_DEBUG_PRINT(Adapter, DBG_TYPE_OTHERS, DUMP_CONTROL, DBG_LVL_ALL, " 
ActiveSet--->");
-       BCM_DEBUG_PRINT(Adapter, DBG_TYPE_OTHERS, DUMP_CONTROL, DBG_LVL_ALL, 
"u32SFID: 0x%X", pstAddIndication->sfActiveSet.u32SFID);
-       BCM_DEBUG_PRINT(Adapter, DBG_TYPE_OTHERS, DUMP_CONTROL, DBG_LVL_ALL, 
"u16CID: 0x%X", pstAddIndication->sfActiveSet.u16CID);
-       BCM_DEBUG_PRINT(Adapter, DBG_TYPE_OTHERS, DUMP_CONTROL, DBG_LVL_ALL, 
"u8ServiceClassNameLength: 0x%X", 
pstAddIndication->sfActiveSet.u8ServiceClassNameLength);
-       BCM_DEBUG_PRINT(Adapter, DBG_TYPE_OTHERS, DUMP_CONTROL, DBG_LVL_ALL,
+       BCM_DEBUG_PRINT(ad, DBG_TYPE_OTHERS, DUMP_CONTROL, DBG_LVL_ALL, 
"bValid: 0x%X", pstAddIndication->sfAdmittedSet.bValid);
+       BCM_DEBUG_PRINT(ad, DBG_TYPE_OTHERS, DUMP_CONTROL, DBG_LVL_ALL, " 
ActiveSet--->");
+       BCM_DEBUG_PRINT(ad, DBG_TYPE_OTHERS, DUMP_CONTROL, DBG_LVL_ALL, 
"u32SFID: 0x%X", pstAddIndication->sfActiveSet.u32SFID);
+       BCM_DEBUG_PRINT(ad, DBG_TYPE_OTHERS, DUMP_CONTROL, DBG_LVL_ALL, 
"u16CID: 0x%X", pstAddIndication->sfActiveSet.u16CID);
+       BCM_DEBUG_PRINT(ad, DBG_TYPE_OTHERS, DUMP_CONTROL, DBG_LVL_ALL, 
"u8ServiceClassNameLength: 0x%X", 
pstAddIndication->sfActiveSet.u8ServiceClassNameLength);
+       BCM_DEBUG_PRINT(ad, DBG_TYPE_OTHERS, DUMP_CONTROL, DBG_LVL_ALL,
                        "u8ServiceClassName: 0x%*ph",
                        6, pstAddIndication->sfActiveSet.u8ServiceClassName);
 
-       BCM_DEBUG_PRINT(Adapter, DBG_TYPE_OTHERS, DUMP_CONTROL, DBG_LVL_ALL, 
"u8MBSService: 0x%02X", pstAddIndication->sfActiveSet.u8MBSService);
-       BCM_DEBUG_PRINT(Adapter, DBG_TYPE_OTHERS, DUMP_CONTROL, DBG_LVL_ALL, 
"u8QosParamSet: 0x%02X", pstAddIndication->sfActiveSet.u8QosParamSet);
-       BCM_DEBUG_PRINT(Adapter, DBG_TYPE_OTHERS, DUMP_CONTROL, DBG_LVL_ALL, 
"u8TrafficPriority: 0x%02X", pstAddIndication->sfActiveSet.u8TrafficPriority);
-       BCM_DEBUG_PRINT(Adapter, DBG_TYPE_OTHERS, DUMP_CONTROL, DBG_LVL_ALL, 
"u32MaxTrafficBurst: 0x%X", pstAddIndication->sfActiveSet.u32MaxTrafficBurst);
-       BCM_DEBUG_PRINT(Adapter, DBG_TYPE_OTHERS, DUMP_CONTROL, DBG_LVL_ALL, 
"u32MinReservedTrafficRate: 0x%X",
+       BCM_DEBUG_PRINT(ad, DBG_TYPE_OTHERS, DUMP_CONTROL, DBG_LVL_ALL, 
"u8MBSService: 0x%02X", pstAddIndication->sfActiveSet.u8MBSService);
+       BCM_DEBUG_PRINT(ad, DBG_TYPE_OTHERS, DUMP_CONTROL, DBG_LVL_ALL, 
"u8QosParamSet: 0x%02X", pstAddIndication->sfActiveSet.u8QosParamSet);
+       BCM_DEBUG_PRINT(ad, DBG_TYPE_OTHERS, DUMP_CONTROL, DBG_LVL_ALL, 
"u8TrafficPriority: 0x%02X", pstAddIndication->sfActiveSet.u8TrafficPriority);
+       BCM_DEBUG_PRINT(ad, DBG_TYPE_OTHERS, DUMP_CONTROL, DBG_LVL_ALL, 
"u32MaxTrafficBurst: 0x%X", pstAddIndication->sfActiveSet.u32MaxTrafficBurst);
+       BCM_DEBUG_PRINT(ad, DBG_TYPE_OTHERS, DUMP_CONTROL, DBG_LVL_ALL, 
"u32MinReservedTrafficRate: 0x%X",
                        
pstAddIndication->sfActiveSet.u32MinReservedTrafficRate);
-       BCM_DEBUG_PRINT(Adapter, DBG_TYPE_OTHERS, DUMP_CONTROL, DBG_LVL_ALL, 
"u8VendorSpecificQoSParamLength: 0x%02X",
+       BCM_DEBUG_PRINT(ad, DBG_TYPE_OTHERS, DUMP_CONTROL, DBG_LVL_ALL, 
"u8VendorSpecificQoSParamLength: 0x%02X",
                        
pstAddIndication->sfActiveSet.u8VendorSpecificQoSParamLength);
-       BCM_DEBUG_PRINT(Adapter, DBG_TYPE_OTHERS, DUMP_CONTROL, DBG_LVL_ALL, 
"u8VendorSpecificQoSParam: 0x%02X",
+       BCM_DEBUG_PRINT(ad, DBG_TYPE_OTHERS, DUMP_CONTROL, DBG_LVL_ALL, 
"u8VendorSpecificQoSParam: 0x%02X",
                        
pstAddIndication->sfActiveSet.u8VendorSpecificQoSParam[0]);
-       BCM_DEBUG_PRINT(Adapter, DBG_TYPE_OTHERS, DUMP_CONTROL, DBG_LVL_ALL, 
"u8ServiceFlowSchedulingType: 0x%02X",
+       BCM_DEBUG_PRINT(ad, DBG_TYPE_OTHERS, DUMP_CONTROL, DBG_LVL_ALL, 
"u8ServiceFlowSchedulingType: 0x%02X",
                        
pstAddIndication->sfActiveSet.u8ServiceFlowSchedulingType);
-       BCM_DEBUG_PRINT(Adapter, DBG_TYPE_OTHERS, DUMP_CONTROL, DBG_LVL_ALL, 
"u32ToleratedJitter: 0x%X", pstAddIndication->sfActiveSet.u32ToleratedJitter);
-       BCM_DEBUG_PRINT(Adapter, DBG_TYPE_OTHERS, DUMP_CONTROL, DBG_LVL_ALL, 
"u32MaximumLatency: 0x%X", pstAddIndication->sfActiveSet.u32MaximumLatency);
-       BCM_DEBUG_PRINT(Adapter, DBG_TYPE_OTHERS, DUMP_CONTROL, DBG_LVL_ALL, 
"u8FixedLengthVSVariableLengthSDUIndicator: 0x%02X",
+       BCM_DEBUG_PRINT(ad, DBG_TYPE_OTHERS, DUMP_CONTROL, DBG_LVL_ALL, 
"u32ToleratedJitter: 0x%X", pstAddIndication->sfActiveSet.u32ToleratedJitter);
+       BCM_DEBUG_PRINT(ad, DBG_TYPE_OTHERS, DUMP_CONTROL, DBG_LVL_ALL, 
"u32MaximumLatency: 0x%X",      
pstAddIndication->sfActiveSet.u32MaximumLatency);
+       BCM_DEBUG_PRINT(ad, DBG_TYPE_OTHERS, DUMP_CONTROL, DBG_LVL_ALL, 
"u8FixedLengthVSVariableLengthSDUIndicator: 0x%02X",
                        
pstAddIndication->sfActiveSet.u8FixedLengthVSVariableLengthSDUIndicator);
-       BCM_DEBUG_PRINT(Adapter, DBG_TYPE_OTHERS, DUMP_CONTROL, DBG_LVL_ALL, 
"u8SDUSize: 0x%X", pstAddIndication->sfActiveSet.u8SDUSize);
-       BCM_DEBUG_PRINT(Adapter, DBG_TYPE_OTHERS, DUMP_CONTROL, DBG_LVL_ALL, " 
u16TargetSAID: 0x%X", pstAddIndication->sfActiveSet.u16TargetSAID);
-       BCM_DEBUG_PRINT(Adapter, DBG_TYPE_OTHERS, DUMP_CONTROL, DBG_LVL_ALL, " 
u8ARQEnable: 0x%X", pstAddIndication->sfActiveSet.u8ARQEnable);
-       BCM_DEBUG_PRINT(Adapter, DBG_TYPE_OTHERS, DUMP_CONTROL, DBG_LVL_ALL, " 
u16ARQWindowSize: 0x%X", pstAddIndication->sfActiveSet.u16ARQWindowSize);
-       BCM_DEBUG_PRINT(Adapter, DBG_TYPE_OTHERS, DUMP_CONTROL, DBG_LVL_ALL, " 
u16ARQRetryTxTimeOut: 0x%X", 
pstAddIndication->sfActiveSet.u16ARQRetryTxTimeOut);
-       BCM_DEBUG_PRINT(Adapter, DBG_TYPE_OTHERS, DUMP_CONTROL, DBG_LVL_ALL, " 
u16ARQRetryRxTimeOut: 0x%X", 
pstAddIndication->sfActiveSet.u16ARQRetryRxTimeOut);
-       BCM_DEBUG_PRINT(Adapter, DBG_TYPE_OTHERS, DUMP_CONTROL, DBG_LVL_ALL, " 
u16ARQBlockLifeTime: 0x%X", pstAddIndication->sfActiveSet.u16ARQBlockLifeTime);
-       BCM_DEBUG_PRINT(Adapter, DBG_TYPE_OTHERS, DUMP_CONTROL, DBG_LVL_ALL, " 
u16ARQSyncLossTimeOut: 0x%X", 
pstAddIndication->sfActiveSet.u16ARQSyncLossTimeOut);
-       BCM_DEBUG_PRINT(Adapter, DBG_TYPE_OTHERS, DUMP_CONTROL, DBG_LVL_ALL, " 
u8ARQDeliverInOrder: 0x%X", pstAddIndication->sfActiveSet.u8ARQDeliverInOrder);
-       BCM_DEBUG_PRINT(Adapter, DBG_TYPE_OTHERS, DUMP_CONTROL, DBG_LVL_ALL, " 
u16ARQRxPurgeTimeOut: 0x%X", 
pstAddIndication->sfActiveSet.u16ARQRxPurgeTimeOut);
-       BCM_DEBUG_PRINT(Adapter, DBG_TYPE_OTHERS, DUMP_CONTROL, DBG_LVL_ALL, " 
u16ARQBlockSize: 0x%X", pstAddIndication->sfActiveSet.u16ARQBlockSize);
-       BCM_DEBUG_PRINT(Adapter, DBG_TYPE_OTHERS, DUMP_CONTROL, DBG_LVL_ALL, " 
u8CSSpecification: 0x%X", pstAddIndication->sfActiveSet.u8CSSpecification);
-       BCM_DEBUG_PRINT(Adapter, DBG_TYPE_OTHERS, DUMP_CONTROL, DBG_LVL_ALL, " 
u8TypeOfDataDeliveryService: 0x%X",
+       BCM_DEBUG_PRINT(ad, DBG_TYPE_OTHERS, DUMP_CONTROL, DBG_LVL_ALL, 
"u8SDUSize: 0x%X",      pstAddIndication->sfActiveSet.u8SDUSize);
+       BCM_DEBUG_PRINT(ad, DBG_TYPE_OTHERS, DUMP_CONTROL, DBG_LVL_ALL, " 
u16TargetSAID: 0x%X", pstAddIndication->sfActiveSet.u16TargetSAID);
+       BCM_DEBUG_PRINT(ad, DBG_TYPE_OTHERS, DUMP_CONTROL, DBG_LVL_ALL, " 
u8ARQEnable: 0x%X", pstAddIndication->sfActiveSet.u8ARQEnable);
+       BCM_DEBUG_PRINT(ad, DBG_TYPE_OTHERS, DUMP_CONTROL, DBG_LVL_ALL, " 
u16ARQWindowSize: 0x%X", pstAddIndication->sfActiveSet.u16ARQWindowSize);
+       BCM_DEBUG_PRINT(ad, DBG_TYPE_OTHERS, DUMP_CONTROL, DBG_LVL_ALL, " 
u16ARQRetryTxTimeOut: 0x%X", 
pstAddIndication->sfActiveSet.u16ARQRetryTxTimeOut);
+       BCM_DEBUG_PRINT(ad, DBG_TYPE_OTHERS, DUMP_CONTROL, DBG_LVL_ALL, " 
u16ARQRetryRxTimeOut: 0x%X", 
pstAddIndication->sfActiveSet.u16ARQRetryRxTimeOut);
+       BCM_DEBUG_PRINT(ad, DBG_TYPE_OTHERS, DUMP_CONTROL, DBG_LVL_ALL, " 
u16ARQBlockLifeTime: 0x%X", pstAddIndication->sfActiveSet.u16ARQBlockLifeTime);
+       BCM_DEBUG_PRINT(ad, DBG_TYPE_OTHERS, DUMP_CONTROL, DBG_LVL_ALL, " 
u16ARQSyncLossTimeOut: 0x%X", 
pstAddIndication->sfActiveSet.u16ARQSyncLossTimeOut);
+       BCM_DEBUG_PRINT(ad, DBG_TYPE_OTHERS, DUMP_CONTROL, DBG_LVL_ALL, " 
u8ARQDeliverInOrder: 0x%X", pstAddIndication->sfActiveSet.u8ARQDeliverInOrder);
+       BCM_DEBUG_PRINT(ad, DBG_TYPE_OTHERS, DUMP_CONTROL, DBG_LVL_ALL, " 
u16ARQRxPurgeTimeOut: 0x%X", 
pstAddIndication->sfActiveSet.u16ARQRxPurgeTimeOut);
+       BCM_DEBUG_PRINT(ad, DBG_TYPE_OTHERS, DUMP_CONTROL, DBG_LVL_ALL, " 
u16ARQBlockSize: 0x%X", pstAddIndication->sfActiveSet.u16ARQBlockSize);
+       BCM_DEBUG_PRINT(ad, DBG_TYPE_OTHERS, DUMP_CONTROL, DBG_LVL_ALL, " 
u8CSSpecification: 0x%X", pstAddIndication->sfActiveSet.u8CSSpecification);
+       BCM_DEBUG_PRINT(ad, DBG_TYPE_OTHERS, DUMP_CONTROL, DBG_LVL_ALL, " 
u8TypeOfDataDeliveryService: 0x%X",
                        
pstAddIndication->sfActiveSet.u8TypeOfDataDeliveryService);
-       BCM_DEBUG_PRINT(Adapter, DBG_TYPE_OTHERS, DUMP_CONTROL, DBG_LVL_ALL, " 
u16SDUInterArrivalTime: 0x%X", 
pstAddIndication->sfActiveSet.u16SDUInterArrivalTime);
-       BCM_DEBUG_PRINT(Adapter, DBG_TYPE_OTHERS, DUMP_CONTROL, DBG_LVL_ALL, " 
u16TimeBase: 0x%X", pstAddIndication->sfActiveSet.u16TimeBase);
-       BCM_DEBUG_PRINT(Adapter, DBG_TYPE_OTHERS, DUMP_CONTROL, DBG_LVL_ALL, " 
u8PagingPreference: 0x%X", pstAddIndication->sfActiveSet.u8PagingPreference);
-       BCM_DEBUG_PRINT(Adapter, DBG_TYPE_OTHERS, DUMP_CONTROL, DBG_LVL_ALL, " 
u8TrafficIndicationPreference: 0x%X",
+       BCM_DEBUG_PRINT(ad, DBG_TYPE_OTHERS, DUMP_CONTROL, DBG_LVL_ALL, " 
u16SDUInterArrivalTime: 0x%X", 
pstAddIndication->sfActiveSet.u16SDUInterArrivalTime);
+       BCM_DEBUG_PRINT(ad, DBG_TYPE_OTHERS, DUMP_CONTROL, DBG_LVL_ALL, " 
u16TimeBase: 0x%X", pstAddIndication->sfActiveSet.u16TimeBase);
+       BCM_DEBUG_PRINT(ad, DBG_TYPE_OTHERS, DUMP_CONTROL, DBG_LVL_ALL, " 
u8PagingPreference: 0x%X", pstAddIndication->sfActiveSet.u8PagingPreference);
+       BCM_DEBUG_PRINT(ad, DBG_TYPE_OTHERS, DUMP_CONTROL, DBG_LVL_ALL, " 
u8TrafficIndicationPreference: 0x%X",
                        
pstAddIndication->sfActiveSet.u8TrafficIndicationPreference);
-       BCM_DEBUG_PRINT(Adapter, DBG_TYPE_OTHERS, DUMP_CONTROL, DBG_LVL_ALL, " 
Total Classifiers Received: 0x%X", 
pstAddIndication->sfActiveSet.u8TotalClassifiers);
+       BCM_DEBUG_PRINT(ad, DBG_TYPE_OTHERS, DUMP_CONTROL, DBG_LVL_ALL, " Total 
Classifiers Received: 0x%X", pstAddIndication->sfActiveSet.u8TotalClassifiers);
 
        nCurClassifierCnt = pstAddIndication->sfActiveSet.u8TotalClassifiers;
        if (nCurClassifierCnt > MAX_CLASSIFIERS_IN_SF)
@@ -1259,15 +1259,15 @@ static VOID DumpCmControlPacket(PVOID pvBuffer)
                psfCSType = 
&pstAddIndication->sfActiveSet.cConvergenceSLTypes[nIndex];
                clsRule = &psfCSType->cCPacketClassificationRule;
 
-               BCM_DEBUG_PRINT(Adapter, DBG_TYPE_OTHERS, DUMP_CONTROL,
+               BCM_DEBUG_PRINT(ad, DBG_TYPE_OTHERS, DUMP_CONTROL,
                                DBG_LVL_ALL, " 
CCPacketClassificationRuleSI====>");
-               BCM_DEBUG_PRINT(Adapter, DBG_TYPE_OTHERS, DUMP_CONTROL,
+               BCM_DEBUG_PRINT(ad, DBG_TYPE_OTHERS, DUMP_CONTROL,
                                DBG_LVL_ALL, " u8ClassifierRulePriority: 0x%X ",
                                clsRule->u8ClassifierRulePriority);
-               BCM_DEBUG_PRINT(Adapter, DBG_TYPE_OTHERS, DUMP_CONTROL,
+               BCM_DEBUG_PRINT(ad, DBG_TYPE_OTHERS, DUMP_CONTROL,
                                DBG_LVL_ALL, " u8IPTypeOfServiceLength: 0x%X ",
                                clsRule->u8IPTypeOfServiceLength);
-               BCM_DEBUG_PRINT(Adapter, DBG_TYPE_OTHERS, DUMP_CONTROL,
+               BCM_DEBUG_PRINT(ad, DBG_TYPE_OTHERS, DUMP_CONTROL,
                                DBG_LVL_ALL,
                                " u8IPTypeOfService[3]: 0x%X ,0x%X ,0x%X ",
                                clsRule->u8IPTypeOfService[0],
@@ -1275,39 +1275,39 @@ static VOID DumpCmControlPacket(PVOID pvBuffer)
                                clsRule->u8IPTypeOfService[2]);
 
                for (uiLoopIndex = 0; uiLoopIndex < 1; uiLoopIndex++)
-                       BCM_DEBUG_PRINT(Adapter, DBG_TYPE_OTHERS, DUMP_CONTROL,
+                       BCM_DEBUG_PRINT(ad, DBG_TYPE_OTHERS, DUMP_CONTROL,
                                        DBG_LVL_ALL,
                                        " u8Protocol: 0x%X ",
                                        clsRule->u8Protocol);
 
-               BCM_DEBUG_PRINT(Adapter, DBG_TYPE_OTHERS, DUMP_CONTROL,
+               BCM_DEBUG_PRINT(ad, DBG_TYPE_OTHERS, DUMP_CONTROL,
                                DBG_LVL_ALL,
                                "u8IPMaskedSourceAddressLength: 0x%X ",
                                clsRule->u8IPMaskedSourceAddressLength);
 
                for (uiLoopIndex = 0; uiLoopIndex < 32; uiLoopIndex++)
-                       BCM_DEBUG_PRINT(Adapter, DBG_TYPE_OTHERS, DUMP_CONTROL,
+                       BCM_DEBUG_PRINT(ad, DBG_TYPE_OTHERS, DUMP_CONTROL,
                                        DBG_LVL_ALL,
                                        "u8IPMaskedSourceAddress[32]: 0x%X ",
                                        
clsRule->u8IPMaskedSourceAddress[uiLoopIndex]);
 
-               BCM_DEBUG_PRINT(Adapter, DBG_TYPE_OTHERS, DUMP_CONTROL,
+               BCM_DEBUG_PRINT(ad, DBG_TYPE_OTHERS, DUMP_CONTROL,
                                DBG_LVL_ALL,
                                "u8IPDestinationAddressLength: 0x%02X ",
                                clsRule->u8IPDestinationAddressLength);
 
                for (uiLoopIndex = 0; uiLoopIndex < 32; uiLoopIndex++)
-                       BCM_DEBUG_PRINT(Adapter, DBG_TYPE_OTHERS, DUMP_CONTROL,
+                       BCM_DEBUG_PRINT(ad, DBG_TYPE_OTHERS, DUMP_CONTROL,
                                        DBG_LVL_ALL,
                                        " u8IPDestinationAddress[32]:0x%X ",
                                        
clsRule->u8IPDestinationAddress[uiLoopIndex]);
 
-               BCM_DEBUG_PRINT(Adapter, DBG_TYPE_OTHERS, DUMP_CONTROL,
+               BCM_DEBUG_PRINT(ad, DBG_TYPE_OTHERS, DUMP_CONTROL,
                                DBG_LVL_ALL,
                                " u8ProtocolSourcePortRangeLength: 0x%X ",
                                clsRule->u8ProtocolSourcePortRangeLength);
 
-               BCM_DEBUG_PRINT(Adapter, DBG_TYPE_OTHERS, DUMP_CONTROL,
+               BCM_DEBUG_PRINT(ad, DBG_TYPE_OTHERS, DUMP_CONTROL,
                                DBG_LVL_ALL,
                                " u8ProtocolSourcePortRange[4]: 0x%X ,0x%X 
,0x%X ,0x%X ",
                                clsRule->u8ProtocolSourcePortRange[0],
@@ -1315,11 +1315,11 @@ static VOID DumpCmControlPacket(PVOID pvBuffer)
                                clsRule->u8ProtocolSourcePortRange[2],
                                clsRule->u8ProtocolSourcePortRange[3]);
 
-               BCM_DEBUG_PRINT(Adapter, DBG_TYPE_OTHERS, DUMP_CONTROL,
+               BCM_DEBUG_PRINT(ad, DBG_TYPE_OTHERS, DUMP_CONTROL,
                                DBG_LVL_ALL,
                                " u8ProtocolDestPortRangeLength: 0x%X ",
                                clsRule->u8ProtocolDestPortRangeLength);
-               BCM_DEBUG_PRINT(Adapter, DBG_TYPE_OTHERS, DUMP_CONTROL,
+               BCM_DEBUG_PRINT(ad, DBG_TYPE_OTHERS, DUMP_CONTROL,
                                DBG_LVL_ALL,
                                " u8ProtocolDestPortRange[4]: 0x%X ,0x%X ,0x%X 
,0x%X ",
                                clsRule->u8ProtocolDestPortRange[0],
@@ -1327,11 +1327,11 @@ static VOID DumpCmControlPacket(PVOID pvBuffer)
                                clsRule->u8ProtocolDestPortRange[2],
                                clsRule->u8ProtocolDestPortRange[3]);
 
-               BCM_DEBUG_PRINT(Adapter, DBG_TYPE_OTHERS, DUMP_CONTROL,
+               BCM_DEBUG_PRINT(ad, DBG_TYPE_OTHERS, DUMP_CONTROL,
                                DBG_LVL_ALL,
                                " u8EthernetDestMacAddressLength: 0x%X ",
                                clsRule->u8EthernetDestMacAddressLength);
-               BCM_DEBUG_PRINT(Adapter, DBG_TYPE_OTHERS, DUMP_CONTROL,
+               BCM_DEBUG_PRINT(ad, DBG_TYPE_OTHERS, DUMP_CONTROL,
                                DBG_LVL_ALL,
                                " u8EthernetDestMacAddress[6]: 0x%X ,0x%X ,0x%X 
,0x%X ,0x%X ,0x%X",
                                clsRule->u8EthernetDestMacAddress[0],
@@ -1341,11 +1341,11 @@ static VOID DumpCmControlPacket(PVOID pvBuffer)
                                clsRule->u8EthernetDestMacAddress[4],
                                clsRule->u8EthernetDestMacAddress[5]);
 
-               BCM_DEBUG_PRINT(Adapter, DBG_TYPE_OTHERS, DUMP_CONTROL,
+               BCM_DEBUG_PRINT(ad, DBG_TYPE_OTHERS, DUMP_CONTROL,
                                DBG_LVL_ALL,
                                " u8EthernetSourceMACAddressLength: 0x%X ",
                                clsRule->u8EthernetDestMacAddressLength);
-               BCM_DEBUG_PRINT(Adapter, DBG_TYPE_OTHERS, DUMP_CONTROL,
+               BCM_DEBUG_PRINT(ad, DBG_TYPE_OTHERS, DUMP_CONTROL,
                                DBG_LVL_ALL,
                                "u8EthernetSourceMACAddress[6]: 0x%X ,0x%X 
,0x%X ,0x%X ,0x%X ,0x%X",
                                clsRule->u8EthernetSourceMACAddress[0],
@@ -1355,42 +1355,42 @@ static VOID DumpCmControlPacket(PVOID pvBuffer)
                                clsRule->u8EthernetSourceMACAddress[4],
                                clsRule->u8EthernetSourceMACAddress[5]);
 
-               BCM_DEBUG_PRINT(Adapter, DBG_TYPE_OTHERS, DUMP_CONTROL,
+               BCM_DEBUG_PRINT(ad, DBG_TYPE_OTHERS, DUMP_CONTROL,
                                DBG_LVL_ALL, " u8EthertypeLength: 0x%X ",
                                clsRule->u8EthertypeLength);
-               BCM_DEBUG_PRINT(Adapter, DBG_TYPE_OTHERS, DUMP_CONTROL,
+               BCM_DEBUG_PRINT(ad, DBG_TYPE_OTHERS, DUMP_CONTROL,
                                DBG_LVL_ALL,
                                " u8Ethertype[3]: 0x%X ,0x%X ,0x%X ",
                                clsRule->u8Ethertype[0],
                                clsRule->u8Ethertype[1],
                                clsRule->u8Ethertype[2]);
-               BCM_DEBUG_PRINT(Adapter, DBG_TYPE_OTHERS, DUMP_CONTROL,
+               BCM_DEBUG_PRINT(ad, DBG_TYPE_OTHERS, DUMP_CONTROL,
                                DBG_LVL_ALL, " u16UserPriority: 0x%X ",
                                clsRule->u16UserPriority);
-               BCM_DEBUG_PRINT(Adapter, DBG_TYPE_OTHERS, DUMP_CONTROL,
+               BCM_DEBUG_PRINT(ad, DBG_TYPE_OTHERS, DUMP_CONTROL,
                                DBG_LVL_ALL, " u16VLANID: 0x%X ",
                                clsRule->u16VLANID);
-               BCM_DEBUG_PRINT(Adapter, DBG_TYPE_OTHERS, DUMP_CONTROL,
+               BCM_DEBUG_PRINT(ad, DBG_TYPE_OTHERS, DUMP_CONTROL,
                                DBG_LVL_ALL, " u8AssociatedPHSI: 0x%X ",
                                clsRule->u8AssociatedPHSI);
-               BCM_DEBUG_PRINT(Adapter, DBG_TYPE_OTHERS, DUMP_CONTROL,
+               BCM_DEBUG_PRINT(ad, DBG_TYPE_OTHERS, DUMP_CONTROL,
                                DBG_LVL_ALL,
                                " u16PacketClassificationRuleIndex:0x%X ",
                                clsRule->u16PacketClassificationRuleIndex);
 
-               BCM_DEBUG_PRINT(Adapter, DBG_TYPE_OTHERS, DUMP_CONTROL,
+               BCM_DEBUG_PRINT(ad, DBG_TYPE_OTHERS, DUMP_CONTROL,
                                DBG_LVL_ALL,
                                " u8VendorSpecificClassifierParamLength:0x%X ",
                                clsRule->u8VendorSpecificClassifierParamLength);
-               BCM_DEBUG_PRINT(Adapter, DBG_TYPE_OTHERS, DUMP_CONTROL,
+               BCM_DEBUG_PRINT(ad, DBG_TYPE_OTHERS, DUMP_CONTROL,
                                DBG_LVL_ALL,
                                " u8VendorSpecificClassifierParam[1]:0x%X ",
                                clsRule->u8VendorSpecificClassifierParam[0]);
 #ifdef VERSION_D5
-               BCM_DEBUG_PRINT(Adapter, DBG_TYPE_OTHERS, DUMP_CONTROL,
+               BCM_DEBUG_PRINT(ad, DBG_TYPE_OTHERS, DUMP_CONTROL,
                                DBG_LVL_ALL, " u8IPv6FlowLableLength: 0x%X ",
                                clsRule->u8IPv6FlowLableLength);
-               BCM_DEBUG_PRINT(Adapter, DBG_TYPE_OTHERS, DUMP_CONTROL,
+               BCM_DEBUG_PRINT(ad, DBG_TYPE_OTHERS, DUMP_CONTROL,
                                DBG_LVL_ALL,
                                " u8IPv6FlowLable[6]: 0x%X ,0x%X ,0x%X ,0x%X 
,0x%X ,0x%X ",
                                clsRule->u8IPv6FlowLable[0],
@@ -1402,30 +1402,30 @@ static VOID DumpCmControlPacket(PVOID pvBuffer)
 #endif
        }
 
-       BCM_DEBUG_PRINT(Adapter, DBG_TYPE_OTHERS, DUMP_CONTROL, DBG_LVL_ALL,
+       BCM_DEBUG_PRINT(ad, DBG_TYPE_OTHERS, DUMP_CONTROL, DBG_LVL_ALL,
                        " bValid: 0x%X", pstAddIndication->sfActiveSet.bValid);
 }
 
-static inline ULONG RestoreSFParam(struct bcm_mini_adapter *Adapter,
+static inline ULONG RestoreSFParam(struct bcm_mini_adapter *ad,
                ULONG ulAddrSFParamSet, PUCHAR pucDestBuffer)
 {
        UINT  nBytesToRead = sizeof(struct bcm_connect_mgr_params);
 
        if (ulAddrSFParamSet == 0 || NULL == pucDestBuffer) {
-               BCM_DEBUG_PRINT(Adapter, DBG_TYPE_OTHERS, CONN_MSG, DBG_LVL_ALL,
+               BCM_DEBUG_PRINT(ad, DBG_TYPE_OTHERS, CONN_MSG, DBG_LVL_ALL,
                                "Got Param address as 0!!");
                return 0;
        }
        ulAddrSFParamSet = ntohl(ulAddrSFParamSet);
 
        /* Read out the SF Param Set At the indicated Location */
-       if (rdm(Adapter, ulAddrSFParamSet, (PUCHAR)pucDestBuffer, nBytesToRead) 
< 0)
+       if (rdm(ad, ulAddrSFParamSet, (PUCHAR)pucDestBuffer, nBytesToRead) < 0)
                return STATUS_FAILURE;
 
        return 1;
 }
 
-static ULONG StoreSFParam(struct bcm_mini_adapter *Adapter, PUCHAR 
pucSrcBuffer,
+static ULONG StoreSFParam(struct bcm_mini_adapter *ad, PUCHAR pucSrcBuffer,
                ULONG ulAddrSFParamSet)
 {
        UINT nBytesToWrite = sizeof(struct bcm_connect_mgr_params);
@@ -1434,16 +1434,16 @@ static ULONG StoreSFParam(struct bcm_mini_adapter 
*Adapter, PUCHAR pucSrcBuffer,
        if (ulAddrSFParamSet == 0 || NULL == pucSrcBuffer)
                return 0;
 
-       ret = wrm(Adapter, ulAddrSFParamSet, (u8 *)pucSrcBuffer, nBytesToWrite);
+       ret = wrm(ad, ulAddrSFParamSet, (u8 *)pucSrcBuffer, nBytesToWrite);
        if (ret < 0) {
-               BCM_DEBUG_PRINT(Adapter, DBG_TYPE_OTHERS, CONN_MSG, DBG_LVL_ALL,
+               BCM_DEBUG_PRINT(ad, DBG_TYPE_OTHERS, CONN_MSG, DBG_LVL_ALL,
                                "%s:%d WRM failed", __func__, __LINE__);
                return ret;
        }
        return 1;
 }
 
-ULONG StoreCmControlResponseMessage(struct bcm_mini_adapter *Adapter,
+ULONG StoreCmControlResponseMessage(struct bcm_mini_adapter *ad,
                PVOID pvBuffer, UINT *puBufferLength)
 {
        struct bcm_add_indication_alt *pstAddIndicationAlt = NULL;
@@ -1462,11 +1462,11 @@ ULONG StoreCmControlResponseMessage(struct 
bcm_mini_adapter *Adapter,
                pstDeletionRequest = pvBuffer;
 
                ulSFID = ntohl(pstDeletionRequest->u32SFID);
-               uiSearchRuleIndex = SearchSfid(Adapter, ulSFID);
+               uiSearchRuleIndex = SearchSfid(ad, ulSFID);
 
                if (uiSearchRuleIndex < NO_OF_QUEUES) {
-                       deleteSFBySfid(Adapter, uiSearchRuleIndex);
-                       Adapter->u32TotalDSD++;
+                       deleteSFBySfid(ad, uiSearchRuleIndex);
+                       ad->u32TotalDSD++;
                }
                return 1;
        }
@@ -1485,14 +1485,14 @@ ULONG StoreCmControlResponseMessage(struct 
bcm_mini_adapter *Adapter,
 
        /* AUTHORIZED SET */
        pstAddIndication->psfAuthorizedSet = (struct bcm_connect_mgr_params *)
-                       GetNextTargetBufferLocation(Adapter,
+                       GetNextTargetBufferLocation(ad,
                                        pstAddIndicationAlt->u16TID);
        if (!pstAddIndication->psfAuthorizedSet) {
                kfree(pstAddIndication);
                return 0;
        }
 
-       if (StoreSFParam(Adapter, (PUCHAR)&pstAddIndicationAlt->sfAuthorizedSet,
+       if (StoreSFParam(ad, (PUCHAR)&pstAddIndicationAlt->sfAuthorizedSet,
                                (ULONG)pstAddIndication->psfAuthorizedSet) != 
1) {
                kfree(pstAddIndication);
                return 0;
@@ -1530,13 +1530,13 @@ ULONG StoreCmControlResponseMessage(struct 
bcm_mini_adapter *Adapter,
 
        /* ADMITTED SET */
        pstAddIndication->psfAdmittedSet = (struct bcm_connect_mgr_params *)
-               GetNextTargetBufferLocation(Adapter,
+               GetNextTargetBufferLocation(ad,
                                pstAddIndicationAlt->u16TID);
        if (!pstAddIndication->psfAdmittedSet) {
                kfree(pstAddIndication);
                return 0;
        }
-       if (StoreSFParam(Adapter, (PUCHAR)&pstAddIndicationAlt->sfAdmittedSet,
+       if (StoreSFParam(ad, (PUCHAR)&pstAddIndicationAlt->sfAdmittedSet,
                                (ULONG)pstAddIndication->psfAdmittedSet) != 1) {
                kfree(pstAddIndication);
                return 0;
@@ -1548,13 +1548,13 @@ ULONG StoreCmControlResponseMessage(struct 
bcm_mini_adapter *Adapter,
 
        /* ACTIVE SET */
        pstAddIndication->psfActiveSet = (struct bcm_connect_mgr_params *)
-               GetNextTargetBufferLocation(Adapter,
+               GetNextTargetBufferLocation(ad,
                                pstAddIndicationAlt->u16TID);
        if (!pstAddIndication->psfActiveSet) {
                kfree(pstAddIndication);
                return 0;
        }
-       if (StoreSFParam(Adapter, (PUCHAR)&pstAddIndicationAlt->sfActiveSet,
+       if (StoreSFParam(ad, (PUCHAR)&pstAddIndicationAlt->sfActiveSet,
                                (ULONG)pstAddIndication->psfActiveSet) != 1) {
                kfree(pstAddIndication);
                return 0;
@@ -1571,7 +1571,7 @@ ULONG StoreCmControlResponseMessage(struct 
bcm_mini_adapter *Adapter,
 }
 
 static inline struct bcm_add_indication_alt
-*RestoreCmControlResponseMessage(register struct bcm_mini_adapter *Adapter,
+*RestoreCmControlResponseMessage(register struct bcm_mini_adapter *ad,
                register PVOID pvBuffer)
 {
        ULONG ulStatus = 0;
@@ -1579,14 +1579,14 @@ static inline struct bcm_add_indication_alt
        struct bcm_add_indication_alt *pstAddIndicationDest = NULL;
 
        pstAddIndication = pvBuffer;
-       BCM_DEBUG_PRINT(Adapter, DBG_TYPE_OTHERS, CONN_MSG, DBG_LVL_ALL,
+       BCM_DEBUG_PRINT(ad, DBG_TYPE_OTHERS, CONN_MSG, DBG_LVL_ALL,
                        "=====>");
        if ((pstAddIndication->u8Type == DSD_REQ) ||
                (pstAddIndication->u8Type == DSD_RSP) ||
                (pstAddIndication->u8Type == DSD_ACK))
                return pvBuffer;
 
-       BCM_DEBUG_PRINT(Adapter, DBG_TYPE_OTHERS, CONN_MSG, DBG_LVL_ALL,
+       BCM_DEBUG_PRINT(ad, DBG_TYPE_OTHERS, CONN_MSG, DBG_LVL_ALL,
                        "Inside RestoreCmControlResponseMessage ");
        /*
         * Need to Allocate memory to contain the SUPER Large structures
@@ -1599,33 +1599,33 @@ static inline struct bcm_add_indication_alt
                memset(pstAddIndicationDest, 0,
                                sizeof(struct bcm_add_indication_alt));
        } else {
-               BCM_DEBUG_PRINT(Adapter, DBG_TYPE_OTHERS, CONN_MSG,
+               BCM_DEBUG_PRINT(ad, DBG_TYPE_OTHERS, CONN_MSG,
                                DBG_LVL_ALL,
                                "Failed to allocate memory for SF Add 
Indication Structure ");
                return NULL;
        }
-       BCM_DEBUG_PRINT(Adapter, DBG_TYPE_OTHERS, CONN_MSG, DBG_LVL_ALL,
+       BCM_DEBUG_PRINT(ad, DBG_TYPE_OTHERS, CONN_MSG, DBG_LVL_ALL,
                        "AddIndication-u8Type : 0x%X",
                        pstAddIndication->u8Type);
-       BCM_DEBUG_PRINT(Adapter, DBG_TYPE_OTHERS, CONN_MSG, DBG_LVL_ALL,
+       BCM_DEBUG_PRINT(ad, DBG_TYPE_OTHERS, CONN_MSG, DBG_LVL_ALL,
                        "AddIndication-u8Direction : 0x%X",
                        pstAddIndication->eConnectionDir);
-       BCM_DEBUG_PRINT(Adapter, DBG_TYPE_OTHERS, CONN_MSG, DBG_LVL_ALL,
+       BCM_DEBUG_PRINT(ad, DBG_TYPE_OTHERS, CONN_MSG, DBG_LVL_ALL,
                        "AddIndication-u8TID : 0x%X",
                        ntohs(pstAddIndication->u16TID));
-       BCM_DEBUG_PRINT(Adapter, DBG_TYPE_OTHERS, CONN_MSG, DBG_LVL_ALL,
+       BCM_DEBUG_PRINT(ad, DBG_TYPE_OTHERS, CONN_MSG, DBG_LVL_ALL,
                        "AddIndication-u8CID : 0x%X",
                        ntohs(pstAddIndication->u16CID));
-       BCM_DEBUG_PRINT(Adapter, DBG_TYPE_OTHERS, CONN_MSG, DBG_LVL_ALL,
+       BCM_DEBUG_PRINT(ad, DBG_TYPE_OTHERS, CONN_MSG, DBG_LVL_ALL,
                        "AddIndication-u16VCID : 0x%X",
                        ntohs(pstAddIndication->u16VCID));
-       BCM_DEBUG_PRINT(Adapter, DBG_TYPE_OTHERS, CONN_MSG, DBG_LVL_ALL,
+       BCM_DEBUG_PRINT(ad, DBG_TYPE_OTHERS, CONN_MSG, DBG_LVL_ALL,
                        "AddIndication-autorized set loc : %p",
                        pstAddIndication->psfAuthorizedSet);
-       BCM_DEBUG_PRINT(Adapter, DBG_TYPE_OTHERS, CONN_MSG, DBG_LVL_ALL,
+       BCM_DEBUG_PRINT(ad, DBG_TYPE_OTHERS, CONN_MSG, DBG_LVL_ALL,
                        "AddIndication-admitted set loc : %p",
                        pstAddIndication->psfAdmittedSet);
-       BCM_DEBUG_PRINT(Adapter, DBG_TYPE_OTHERS, CONN_MSG, DBG_LVL_ALL,
+       BCM_DEBUG_PRINT(ad, DBG_TYPE_OTHERS, CONN_MSG, DBG_LVL_ALL,
                        "AddIndication-Active set loc : %p",
                        pstAddIndication->psfActiveSet);
 
@@ -1636,9 +1636,9 @@ static inline struct bcm_add_indication_alt
        pstAddIndicationDest->u16VCID = pstAddIndication->u16VCID;
        pstAddIndicationDest->u8CC = pstAddIndication->u8CC;
 
-       BCM_DEBUG_PRINT(Adapter, DBG_TYPE_OTHERS, CONN_MSG, DBG_LVL_ALL,
+       BCM_DEBUG_PRINT(ad, DBG_TYPE_OTHERS, CONN_MSG, DBG_LVL_ALL,
                        "Restoring Active Set ");
-       ulStatus = RestoreSFParam(Adapter,
+       ulStatus = RestoreSFParam(ad,
                        (ULONG)pstAddIndication->psfActiveSet,
                        (PUCHAR)&pstAddIndicationDest->sfActiveSet);
        if (ulStatus != 1)
@@ -1648,9 +1648,9 @@ static inline struct bcm_add_indication_alt
                pstAddIndicationDest->sfActiveSet.u8TotalClassifiers =
                        MAX_CLASSIFIERS_IN_SF;
 
-       BCM_DEBUG_PRINT(Adapter, DBG_TYPE_OTHERS, CONN_MSG, DBG_LVL_ALL,
+       BCM_DEBUG_PRINT(ad, DBG_TYPE_OTHERS, CONN_MSG, DBG_LVL_ALL,
                        "Restoring Admitted Set ");
-       ulStatus = RestoreSFParam(Adapter,
+       ulStatus = RestoreSFParam(ad,
                        (ULONG)pstAddIndication->psfAdmittedSet,
                        (PUCHAR)&pstAddIndicationDest->sfAdmittedSet);
        if (ulStatus != 1)
@@ -1660,9 +1660,9 @@ static inline struct bcm_add_indication_alt
                pstAddIndicationDest->sfAdmittedSet.u8TotalClassifiers =
                        MAX_CLASSIFIERS_IN_SF;
 
-       BCM_DEBUG_PRINT(Adapter, DBG_TYPE_OTHERS, CONN_MSG, DBG_LVL_ALL,
+       BCM_DEBUG_PRINT(ad, DBG_TYPE_OTHERS, CONN_MSG, DBG_LVL_ALL,
                        "Restoring Authorized Set ");
-       ulStatus = RestoreSFParam(Adapter,
+       ulStatus = RestoreSFParam(ad,
                        (ULONG)pstAddIndication->psfAuthorizedSet,
                        (PUCHAR)&pstAddIndicationDest->sfAuthorizedSet);
        if (ulStatus != 1)
@@ -1672,144 +1672,144 @@ static inline struct bcm_add_indication_alt
                pstAddIndicationDest->sfAuthorizedSet.u8TotalClassifiers =
                        MAX_CLASSIFIERS_IN_SF;
 
-       BCM_DEBUG_PRINT(Adapter, DBG_TYPE_OTHERS, CONN_MSG, DBG_LVL_ALL,
+       BCM_DEBUG_PRINT(ad, DBG_TYPE_OTHERS, CONN_MSG, DBG_LVL_ALL,
                        "Dumping the whole raw packet");
-       BCM_DEBUG_PRINT(Adapter, DBG_TYPE_OTHERS, CONN_MSG, DBG_LVL_ALL,
+       BCM_DEBUG_PRINT(ad, DBG_TYPE_OTHERS, CONN_MSG, DBG_LVL_ALL,
                "============================================================");
-       BCM_DEBUG_PRINT(Adapter, DBG_TYPE_OTHERS, CONN_MSG, DBG_LVL_ALL,
+       BCM_DEBUG_PRINT(ad, DBG_TYPE_OTHERS, CONN_MSG, DBG_LVL_ALL,
                        " pstAddIndicationDest->sfActiveSet size  %zx %p",
                        sizeof(*pstAddIndicationDest), pstAddIndicationDest);
-       /* BCM_DEBUG_PRINT_BUFFER(Adapter,DBG_TYPE_OTHERS, CONN_MSG,
+       /* BCM_DEBUG_PRINT_BUFFER(ad,DBG_TYPE_OTHERS, CONN_MSG,
         *              DBG_LVL_ALL, (unsigned char *)pstAddIndicationDest,
         *              sizeof(*pstAddIndicationDest));
         */
-       BCM_DEBUG_PRINT(Adapter, DBG_TYPE_OTHERS, CONN_MSG, DBG_LVL_ALL,
+       BCM_DEBUG_PRINT(ad, DBG_TYPE_OTHERS, CONN_MSG, DBG_LVL_ALL,
                        
"============================================================");
        return pstAddIndicationDest;
 failed_restore_sf_param:
        kfree(pstAddIndicationDest);
-       BCM_DEBUG_PRINT(Adapter, DBG_TYPE_OTHERS, CONN_MSG, DBG_LVL_ALL,
+       BCM_DEBUG_PRINT(ad, DBG_TYPE_OTHERS, CONN_MSG, DBG_LVL_ALL,
                        "<=====");
        return NULL;
 }
 
-ULONG SetUpTargetDsxBuffers(struct bcm_mini_adapter *Adapter)
+ULONG SetUpTargetDsxBuffers(struct bcm_mini_adapter *ad)
 {
        ULONG ulTargetDsxBuffersBase = 0;
        ULONG ulCntTargetBuffers;
        ULONG i;
        int Status;
 
-       if (!Adapter) {
-               BCM_DEBUG_PRINT(Adapter, DBG_TYPE_OTHERS, CONN_MSG, DBG_LVL_ALL,
-                               "Adapter was NULL!!!");
+       if (!ad) {
+               BCM_DEBUG_PRINT(ad, DBG_TYPE_OTHERS, CONN_MSG, DBG_LVL_ALL,
+                               "ad was NULL!!!");
                return 0;
        }
 
-       if (Adapter->astTargetDsxBuffer[0].ulTargetDsxBuffer)
+       if (ad->astTargetDsxBuffer[0].ulTargetDsxBuffer)
                return 1;
 
-       BCM_DEBUG_PRINT(Adapter, DBG_TYPE_OTHERS, CONN_MSG, DBG_LVL_ALL,
+       BCM_DEBUG_PRINT(ad, DBG_TYPE_OTHERS, CONN_MSG, DBG_LVL_ALL,
                        "Size of Each DSX Buffer(Also size of connection 
manager parameters): %zx ",
                        sizeof(struct bcm_connect_mgr_params));
-       BCM_DEBUG_PRINT(Adapter, DBG_TYPE_OTHERS, CONN_MSG, DBG_LVL_ALL,
+       BCM_DEBUG_PRINT(ad, DBG_TYPE_OTHERS, CONN_MSG, DBG_LVL_ALL,
                        "Reading DSX buffer From Target location %x ",
                        DSX_MESSAGE_EXCHANGE_BUFFER);
 
-       Status = rdmalt(Adapter, DSX_MESSAGE_EXCHANGE_BUFFER,
+       Status = rdmalt(ad, DSX_MESSAGE_EXCHANGE_BUFFER,
                        (PUINT)&ulTargetDsxBuffersBase, sizeof(UINT));
        if (Status < 0) {
-               BCM_DEBUG_PRINT(Adapter, DBG_TYPE_OTHERS, CONN_MSG, DBG_LVL_ALL,
+               BCM_DEBUG_PRINT(ad, DBG_TYPE_OTHERS, CONN_MSG, DBG_LVL_ALL,
                                "RDM failed!!");
                return 0;
        }
 
-       BCM_DEBUG_PRINT(Adapter, DBG_TYPE_OTHERS, CONN_MSG, DBG_LVL_ALL,
+       BCM_DEBUG_PRINT(ad, DBG_TYPE_OTHERS, CONN_MSG, DBG_LVL_ALL,
                        "Base Address Of DSX  Target Buffer : 0x%lx",
                        ulTargetDsxBuffersBase);
-       BCM_DEBUG_PRINT(Adapter, DBG_TYPE_OTHERS, CONN_MSG, DBG_LVL_ALL,
+       BCM_DEBUG_PRINT(ad, DBG_TYPE_OTHERS, CONN_MSG, DBG_LVL_ALL,
                        "Tgt Buffer is Now %lx :", ulTargetDsxBuffersBase);
        ulCntTargetBuffers = DSX_MESSAGE_EXCHANGE_BUFFER_SIZE /
                sizeof(struct bcm_connect_mgr_params);
 
-       Adapter->ulTotalTargetBuffersAvailable =
+       ad->ulTotalTargetBuffersAvailable =
                ulCntTargetBuffers > MAX_TARGET_DSX_BUFFERS ?
                MAX_TARGET_DSX_BUFFERS : ulCntTargetBuffers;
 
-       BCM_DEBUG_PRINT(Adapter, DBG_TYPE_OTHERS, CONN_MSG, DBG_LVL_ALL,
+       BCM_DEBUG_PRINT(ad, DBG_TYPE_OTHERS, CONN_MSG, DBG_LVL_ALL,
                        " Total Target DSX Buffer setup %lx ",
-                       Adapter->ulTotalTargetBuffersAvailable);
+                       ad->ulTotalTargetBuffersAvailable);
 
-       for (i = 0; i < Adapter->ulTotalTargetBuffersAvailable; i++) {
-               Adapter->astTargetDsxBuffer[i].ulTargetDsxBuffer = 
ulTargetDsxBuffersBase;
-               Adapter->astTargetDsxBuffer[i].valid = 1;
-               Adapter->astTargetDsxBuffer[i].tid = 0;
+       for (i = 0; i < ad->ulTotalTargetBuffersAvailable; i++) {
+               ad->astTargetDsxBuffer[i].ulTargetDsxBuffer = 
ulTargetDsxBuffersBase;
+               ad->astTargetDsxBuffer[i].valid = 1;
+               ad->astTargetDsxBuffer[i].tid = 0;
                ulTargetDsxBuffersBase += sizeof(struct bcm_connect_mgr_params);
-               BCM_DEBUG_PRINT(Adapter, DBG_TYPE_OTHERS, CONN_MSG, 
DBG_LVL_ALL, "  Target DSX Buffer %lx setup at 0x%lx",
-                               i, 
Adapter->astTargetDsxBuffer[i].ulTargetDsxBuffer);
+               BCM_DEBUG_PRINT(ad, DBG_TYPE_OTHERS, CONN_MSG, DBG_LVL_ALL, "  
Target DSX Buffer %lx setup at 0x%lx",
+                               i, ad->astTargetDsxBuffer[i].ulTargetDsxBuffer);
        }
-       Adapter->ulCurrentTargetBuffer = 0;
-       Adapter->ulFreeTargetBufferCnt = Adapter->ulTotalTargetBuffersAvailable;
+       ad->ulCurrentTargetBuffer = 0;
+       ad->ulFreeTargetBufferCnt = ad->ulTotalTargetBuffersAvailable;
        return 1;
 }
 
-static ULONG GetNextTargetBufferLocation(struct bcm_mini_adapter *Adapter,
+static ULONG GetNextTargetBufferLocation(struct bcm_mini_adapter *ad,
                B_UINT16 tid)
 {
        ULONG dsx_buf;
        ULONG idx, max_try;
 
-       if ((Adapter->ulTotalTargetBuffersAvailable == 0)
-                       || (Adapter->ulFreeTargetBufferCnt == 0)) {
-               ClearTargetDSXBuffer(Adapter, tid, false);
+       if ((ad->ulTotalTargetBuffersAvailable == 0)
+                       || (ad->ulFreeTargetBufferCnt == 0)) {
+               ClearTargetDSXBuffer(ad, tid, false);
                return 0;
        }
 
-       idx = Adapter->ulCurrentTargetBuffer;
-       max_try = Adapter->ulTotalTargetBuffersAvailable;
-       while ((max_try) && (Adapter->astTargetDsxBuffer[idx].valid != 1)) {
-               idx = (idx+1) % Adapter->ulTotalTargetBuffersAvailable;
+       idx = ad->ulCurrentTargetBuffer;
+       max_try = ad->ulTotalTargetBuffersAvailable;
+       while ((max_try) && (ad->astTargetDsxBuffer[idx].valid != 1)) {
+               idx = (idx+1) % ad->ulTotalTargetBuffersAvailable;
                max_try--;
        }
 
        if (max_try == 0) {
-               BCM_DEBUG_PRINT(Adapter, DBG_TYPE_PRINTK, 0, 0,
+               BCM_DEBUG_PRINT(ad, DBG_TYPE_PRINTK, 0, 0,
                                "\n GetNextTargetBufferLocation : Error No Free 
Target DSX Buffers FreeCnt : %lx ",
-                               Adapter->ulFreeTargetBufferCnt);
-               ClearTargetDSXBuffer(Adapter, tid, false);
+                               ad->ulFreeTargetBufferCnt);
+               ClearTargetDSXBuffer(ad, tid, false);
                return 0;
        }
 
-       dsx_buf = Adapter->astTargetDsxBuffer[idx].ulTargetDsxBuffer;
-       Adapter->astTargetDsxBuffer[idx].valid = 0;
-       Adapter->astTargetDsxBuffer[idx].tid = tid;
-       Adapter->ulFreeTargetBufferCnt--;
-       idx = (idx+1)%Adapter->ulTotalTargetBuffersAvailable;
-       Adapter->ulCurrentTargetBuffer = idx;
-       BCM_DEBUG_PRINT(Adapter, DBG_TYPE_PRINTK, 0, 0,
+       dsx_buf = ad->astTargetDsxBuffer[idx].ulTargetDsxBuffer;
+       ad->astTargetDsxBuffer[idx].valid = 0;
+       ad->astTargetDsxBuffer[idx].tid = tid;
+       ad->ulFreeTargetBufferCnt--;
+       idx = (idx+1)%ad->ulTotalTargetBuffersAvailable;
+       ad->ulCurrentTargetBuffer = idx;
+       BCM_DEBUG_PRINT(ad, DBG_TYPE_PRINTK, 0, 0,
                        "GetNextTargetBufferLocation :Returning address %lx tid 
%d\n",
                        dsx_buf, tid);
 
        return dsx_buf;
 }
 
-int AllocAdapterDsxBuffer(struct bcm_mini_adapter *Adapter)
+int AllocAdapterDsxBuffer(struct bcm_mini_adapter *ad)
 {
        /*
         * Need to Allocate memory to contain the SUPER Large structures
         * Our driver can't create these structures on Stack
         */
-       Adapter->caDsxReqResp = kmalloc(sizeof(struct bcm_add_indication_alt)
+       ad->caDsxReqResp = kmalloc(sizeof(struct bcm_add_indication_alt)
                        + LEADER_SIZE, GFP_KERNEL);
-       if (!Adapter->caDsxReqResp)
+       if (!ad->caDsxReqResp)
                return -ENOMEM;
 
        return 0;
 }
 
-int FreeAdapterDsxBuffer(struct bcm_mini_adapter *Adapter)
+int FreeadDsxBuffer(struct bcm_mini_adapter *ad)
 {
-       kfree(Adapter->caDsxReqResp);
+       kfree(ad->caDsxReqResp);
        return 0;
 }
 
@@ -1819,7 +1819,7 @@ int FreeAdapterDsxBuffer(struct bcm_mini_adapter *Adapter)
  * for the Connection Management.
  * @return - Queue index for the free SFID else returns Invalid Index.
  */
-bool CmControlResponseMessage(struct bcm_mini_adapter *Adapter,  /* <Pointer 
to the Adapter structure */
+bool CmControlResponseMessage(struct bcm_mini_adapter *ad,  /* <Pointer to the 
ad structure */
                                PVOID pvBuffer /* Starting Address of the 
Buffer, that contains the AddIndication Data */)
 {
        struct bcm_connect_mgr_params *psfLocalSet = NULL;
@@ -1833,92 +1833,92 @@ bool CmControlResponseMessage(struct bcm_mini_adapter 
*Adapter,  /* <Pointer to
         * Otherwise the message contains a target address from where we need to
         * read out the rest of the service flow param structure
         */
-       pstAddIndication = RestoreCmControlResponseMessage(Adapter, pvBuffer);
+       pstAddIndication = RestoreCmControlResponseMessage(ad, pvBuffer);
        if (pstAddIndication == NULL) {
-               ClearTargetDSXBuffer(Adapter, ((struct bcm_add_indication 
*)pvBuffer)->u16TID, false);
-               BCM_DEBUG_PRINT(Adapter, DBG_TYPE_PRINTK, 0, 0, "Error in 
restoring Service Flow param structure from DSx message");
+               ClearTargetDSXBuffer(ad, ((struct bcm_add_indication 
*)pvBuffer)->u16TID, false);
+               BCM_DEBUG_PRINT(ad, DBG_TYPE_PRINTK, 0, 0, "Error in restoring 
Service Flow param structure from DSx message");
                return false;
        }
 
        DumpCmControlPacket(pstAddIndication);
-       BCM_DEBUG_PRINT(Adapter, DBG_TYPE_OTHERS, CONN_MSG, DBG_LVL_ALL, 
"====>");
-       pLeader = (struct bcm_leader *)Adapter->caDsxReqResp;
+       BCM_DEBUG_PRINT(ad, DBG_TYPE_OTHERS, CONN_MSG, DBG_LVL_ALL, "====>");
+       pLeader = (struct bcm_leader *)ad->caDsxReqResp;
 
        pLeader->Status = CM_CONTROL_NEWDSX_MULTICLASSIFIER_REQ;
        pLeader->Vcid = 0;
 
-       ClearTargetDSXBuffer(Adapter, pstAddIndication->u16TID, false);
-       BCM_DEBUG_PRINT(Adapter, DBG_TYPE_PRINTK, 0, 0, "### TID RECEIVED 
%d\n", pstAddIndication->u16TID);
+       ClearTargetDSXBuffer(ad, pstAddIndication->u16TID, false);
+       BCM_DEBUG_PRINT(ad, DBG_TYPE_PRINTK, 0, 0, "### TID RECEIVED %d\n", 
pstAddIndication->u16TID);
        switch (pstAddIndication->u8Type) {
        case DSA_REQ:
                pLeader->PLength = sizeof(struct bcm_add_indication_alt);
-               BCM_DEBUG_PRINT(Adapter, DBG_TYPE_OTHERS, CONN_MSG, 
DBG_LVL_ALL, "Sending DSA Response....\n");
-               BCM_DEBUG_PRINT(Adapter, DBG_TYPE_OTHERS, CONN_MSG, 
DBG_LVL_ALL, "SENDING DSA RESPONSE TO MAC %d", pLeader->PLength);
-               *((struct bcm_add_indication_alt 
*)&(Adapter->caDsxReqResp[LEADER_SIZE]))
+               BCM_DEBUG_PRINT(ad, DBG_TYPE_OTHERS, CONN_MSG, DBG_LVL_ALL, 
"Sending DSA Response....\n");
+               BCM_DEBUG_PRINT(ad, DBG_TYPE_OTHERS, CONN_MSG, DBG_LVL_ALL, 
"SENDING DSA RESPONSE TO MAC %d", pLeader->PLength);
+               *((struct bcm_add_indication_alt 
*)&(ad->caDsxReqResp[LEADER_SIZE]))
                        = *pstAddIndication;
-               ((struct bcm_add_indication_alt 
*)&(Adapter->caDsxReqResp[LEADER_SIZE]))->u8Type = DSA_RSP;
+               ((struct bcm_add_indication_alt 
*)&(ad->caDsxReqResp[LEADER_SIZE]))->u8Type = DSA_RSP;
 
-               BCM_DEBUG_PRINT(Adapter, DBG_TYPE_OTHERS, CONN_MSG, 
DBG_LVL_ALL, " VCID = %x", ntohs(pstAddIndication->u16VCID));
-               CopyBufferToControlPacket(Adapter, 
(PVOID)Adapter->caDsxReqResp);
+               BCM_DEBUG_PRINT(ad, DBG_TYPE_OTHERS, CONN_MSG, DBG_LVL_ALL, " 
VCID = %x", ntohs(pstAddIndication->u16VCID));
+               CopyBufferToControlPacket(ad, (PVOID)ad->caDsxReqResp);
                kfree(pstAddIndication);
                break;
        case DSA_RSP:
                pLeader->PLength = sizeof(struct bcm_add_indication_alt);
-               BCM_DEBUG_PRINT(Adapter, DBG_TYPE_OTHERS, CONN_MSG, 
DBG_LVL_ALL, "SENDING DSA ACK TO MAC %d",
+               BCM_DEBUG_PRINT(ad, DBG_TYPE_OTHERS, CONN_MSG, DBG_LVL_ALL, 
"SENDING DSA ACK TO MAC %d",
                                pLeader->PLength);
-               *((struct bcm_add_indication_alt 
*)&(Adapter->caDsxReqResp[LEADER_SIZE]))
+               *((struct bcm_add_indication_alt 
*)&(ad->caDsxReqResp[LEADER_SIZE]))
                        = *pstAddIndication;
-               ((struct bcm_add_indication_alt 
*)&(Adapter->caDsxReqResp[LEADER_SIZE]))->u8Type = DSA_ACK;
+               ((struct bcm_add_indication_alt 
*)&(ad->caDsxReqResp[LEADER_SIZE]))->u8Type = DSA_ACK;
                /* FALLTHROUGH */
        case DSA_ACK:
-               BCM_DEBUG_PRINT(Adapter, DBG_TYPE_OTHERS, CONN_MSG, 
DBG_LVL_ALL, "VCID:0x%X",
+               BCM_DEBUG_PRINT(ad, DBG_TYPE_OTHERS, CONN_MSG, DBG_LVL_ALL, 
"VCID:0x%X",
                                ntohs(pstAddIndication->u16VCID));
-               uiSearchRuleIndex = SearchFreeSfid(Adapter);
-               BCM_DEBUG_PRINT(Adapter, DBG_TYPE_OTHERS, CONN_MSG, 
DBG_LVL_ALL, "uiSearchRuleIndex:0x%X ",
+               uiSearchRuleIndex = SearchFreeSfid(ad);
+               BCM_DEBUG_PRINT(ad, DBG_TYPE_OTHERS, CONN_MSG, DBG_LVL_ALL, 
"uiSearchRuleIndex:0x%X ",
                                uiSearchRuleIndex);
-               BCM_DEBUG_PRINT(Adapter, DBG_TYPE_OTHERS, CONN_MSG, 
DBG_LVL_ALL, "Direction:0x%X ",
+               BCM_DEBUG_PRINT(ad, DBG_TYPE_OTHERS, CONN_MSG, DBG_LVL_ALL, 
"Direction:0x%X ",
                                pstAddIndication->u8Direction);
                if (uiSearchRuleIndex < NO_OF_QUEUES) {
-                       Adapter->PackInfo[uiSearchRuleIndex].ucDirection =
+                       ad->PackInfo[uiSearchRuleIndex].ucDirection =
                                pstAddIndication->u8Direction;
-                       BCM_DEBUG_PRINT(Adapter, DBG_TYPE_OTHERS, CONN_MSG, 
DBG_LVL_ALL, "bValid:0x%X ",
+                       BCM_DEBUG_PRINT(ad, DBG_TYPE_OTHERS, CONN_MSG, 
DBG_LVL_ALL, "bValid:0x%X ",
                                        pstAddIndication->sfActiveSet.bValid);
                        if (pstAddIndication->sfActiveSet.bValid == TRUE)
-                               Adapter->PackInfo[uiSearchRuleIndex].bActiveSet 
= TRUE;
+                               ad->PackInfo[uiSearchRuleIndex].bActiveSet = 
TRUE;
 
                        if (pstAddIndication->sfAuthorizedSet.bValid == TRUE)
-                               
Adapter->PackInfo[uiSearchRuleIndex].bAuthorizedSet = TRUE;
+                               ad->PackInfo[uiSearchRuleIndex].bAuthorizedSet 
= TRUE;
 
                        if (pstAddIndication->sfAdmittedSet.bValid == TRUE)
-                               
Adapter->PackInfo[uiSearchRuleIndex].bAdmittedSet = TRUE;
+                               ad->PackInfo[uiSearchRuleIndex].bAdmittedSet = 
TRUE;
 
                        if (pstAddIndication->sfActiveSet.bValid == false) {
-                               Adapter->PackInfo[uiSearchRuleIndex].bActive = 
false;
-                               
Adapter->PackInfo[uiSearchRuleIndex].bActivateRequestSent = false;
+                               ad->PackInfo[uiSearchRuleIndex].bActive = false;
+                               
ad->PackInfo[uiSearchRuleIndex].bActivateRequestSent = false;
                                if (pstAddIndication->sfAdmittedSet.bValid)
                                        psfLocalSet = 
&pstAddIndication->sfAdmittedSet;
                                else if 
(pstAddIndication->sfAuthorizedSet.bValid)
                                        psfLocalSet = 
&pstAddIndication->sfAuthorizedSet;
                        } else {
                                psfLocalSet = &pstAddIndication->sfActiveSet;
-                               Adapter->PackInfo[uiSearchRuleIndex].bActive = 
TRUE;
+                               ad->PackInfo[uiSearchRuleIndex].bActive = TRUE;
                        }
 
                        if (!psfLocalSet) {
-                               BCM_DEBUG_PRINT(Adapter, DBG_TYPE_PRINTK, 0, 0, 
"No set is valid\n");
-                               Adapter->PackInfo[uiSearchRuleIndex].bActive = 
false;
-                               Adapter->PackInfo[uiSearchRuleIndex].bValid = 
false;
-                               
Adapter->PackInfo[uiSearchRuleIndex].usVCID_Value = 0;
+                               BCM_DEBUG_PRINT(ad, DBG_TYPE_PRINTK, 0, 0, "No 
set is valid\n");
+                               ad->PackInfo[uiSearchRuleIndex].bActive = false;
+                               ad->PackInfo[uiSearchRuleIndex].bValid = false;
+                               ad->PackInfo[uiSearchRuleIndex].usVCID_Value = 
0;
                                kfree(pstAddIndication);
                        } else if (psfLocalSet->bValid && 
(pstAddIndication->u8CC == 0)) {
-                               BCM_DEBUG_PRINT(Adapter, DBG_TYPE_OTHERS, 
CONN_MSG, DBG_LVL_ALL, "DSA ACK");
-                               
Adapter->PackInfo[uiSearchRuleIndex].usVCID_Value = 
ntohs(pstAddIndication->u16VCID);
-                               Adapter->PackInfo[uiSearchRuleIndex].usCID = 
ntohs(pstAddIndication->u16CID);
+                               BCM_DEBUG_PRINT(ad, DBG_TYPE_OTHERS, CONN_MSG, 
DBG_LVL_ALL, "DSA ACK");
+                               ad->PackInfo[uiSearchRuleIndex].usVCID_Value = 
ntohs(pstAddIndication->u16VCID);
+                               ad->PackInfo[uiSearchRuleIndex].usCID = 
ntohs(pstAddIndication->u16CID);
 
                                if (UPLINK_DIR == pstAddIndication->u8Direction)
-                                       
atomic_set(&Adapter->PackInfo[uiSearchRuleIndex].uiPerSFTxResourceCount, 
DEFAULT_PERSFCOUNT);
+                                       
atomic_set(&ad->PackInfo[uiSearchRuleIndex].uiPerSFTxResourceCount, 
DEFAULT_PERSFCOUNT);
 
-                               CopyToAdapter(Adapter, psfLocalSet, 
uiSearchRuleIndex, DSA_ACK, pstAddIndication);
+                               CopyToAdapter(ad, psfLocalSet, 
uiSearchRuleIndex, DSA_ACK, pstAddIndication);
                                /* don't free pstAddIndication */
 
                                /* Inside CopyToAdapter, Sorting of all the SFs 
take place.
@@ -1930,26 +1930,26 @@ bool CmControlResponseMessage(struct bcm_mini_adapter 
*Adapter,  /* <Pointer to
 
                                if (pstAddIndication->sfActiveSet.bValid == 
TRUE) {
                                        if (UPLINK_DIR == 
pstAddIndication->u8Direction) {
-                                               if (!Adapter->LinkUpStatus) {
-                                                       
netif_carrier_on(Adapter->dev);
-                                                       
netif_start_queue(Adapter->dev);
-                                                       Adapter->LinkUpStatus = 
1;
-                                                       if 
(netif_msg_link(Adapter))
-                                                               pr_info(PFX 
"%s: link up\n", Adapter->dev->name);
-                                                       
atomic_set(&Adapter->TxPktAvail, 1);
-                                                       
wake_up(&Adapter->tx_packet_wait_queue);
-                                                       
Adapter->liTimeSinceLastNetEntry = get_seconds();
+                                               if (!ad->LinkUpStatus) {
+                                                       
netif_carrier_on(ad->dev);
+                                                       
netif_start_queue(ad->dev);
+                                                       ad->LinkUpStatus = 1;
+                                                       if (netif_msg_link(ad))
+                                                               pr_info(PFX 
"%s: link up\n", ad->dev->name);
+                                                       
atomic_set(&ad->TxPktAvail, 1);
+                                                       
wake_up(&ad->tx_packet_wait_queue);
+                                                       
ad->liTimeSinceLastNetEntry = get_seconds();
                                                }
                                        }
                                }
                        } else {
-                               Adapter->PackInfo[uiSearchRuleIndex].bActive = 
false;
-                               Adapter->PackInfo[uiSearchRuleIndex].bValid = 
false;
-                               
Adapter->PackInfo[uiSearchRuleIndex].usVCID_Value = 0;
+                               ad->PackInfo[uiSearchRuleIndex].bActive = false;
+                               ad->PackInfo[uiSearchRuleIndex].bValid = false;
+                               ad->PackInfo[uiSearchRuleIndex].usVCID_Value = 
0;
                                kfree(pstAddIndication);
                        }
                } else {
-                       BCM_DEBUG_PRINT(Adapter, DBG_TYPE_PRINTK, 0, 0, "DSA 
ACK did not get valid SFID");
+                       BCM_DEBUG_PRINT(ad, DBG_TYPE_PRINTK, 0, 0, "DSA ACK did 
not get valid SFID");
                        kfree(pstAddIndication);
                        return false;
                }
@@ -1957,41 +1957,41 @@ bool CmControlResponseMessage(struct bcm_mini_adapter 
*Adapter,  /* <Pointer to
        case DSC_REQ:
                pLeader->PLength = sizeof(struct bcm_change_indication);
                pstChangeIndication = (struct bcm_change_indication 
*)pstAddIndication;
-               BCM_DEBUG_PRINT(Adapter, DBG_TYPE_OTHERS, CONN_MSG, 
DBG_LVL_ALL, "SENDING DSC RESPONSE TO MAC %d", pLeader->PLength);
+               BCM_DEBUG_PRINT(ad, DBG_TYPE_OTHERS, CONN_MSG, DBG_LVL_ALL, 
"SENDING DSC RESPONSE TO MAC %d", pLeader->PLength);
 
-               *((struct bcm_change_indication 
*)&(Adapter->caDsxReqResp[LEADER_SIZE])) = *pstChangeIndication;
-               ((struct bcm_change_indication 
*)&(Adapter->caDsxReqResp[LEADER_SIZE]))->u8Type = DSC_RSP;
+               *((struct bcm_change_indication 
*)&(ad->caDsxReqResp[LEADER_SIZE])) = *pstChangeIndication;
+               ((struct bcm_change_indication 
*)&(ad->caDsxReqResp[LEADER_SIZE]))->u8Type = DSC_RSP;
 
-               CopyBufferToControlPacket(Adapter, 
(PVOID)Adapter->caDsxReqResp);
+               CopyBufferToControlPacket(ad, (PVOID)ad->caDsxReqResp);
                kfree(pstAddIndication);
                break;
        case DSC_RSP:
                pLeader->PLength = sizeof(struct bcm_change_indication);
                pstChangeIndication = (struct bcm_change_indication 
*)pstAddIndication;
-               BCM_DEBUG_PRINT(Adapter, DBG_TYPE_OTHERS, CONN_MSG, 
DBG_LVL_ALL, "SENDING DSC ACK TO MAC %d", pLeader->PLength);
-               *((struct bcm_change_indication 
*)&(Adapter->caDsxReqResp[LEADER_SIZE])) = *pstChangeIndication;
-               ((struct bcm_change_indication 
*)&(Adapter->caDsxReqResp[LEADER_SIZE]))->u8Type = DSC_ACK;
+               BCM_DEBUG_PRINT(ad, DBG_TYPE_OTHERS, CONN_MSG, DBG_LVL_ALL, 
"SENDING DSC ACK TO MAC %d", pLeader->PLength);
+               *((struct bcm_change_indication 
*)&(ad->caDsxReqResp[LEADER_SIZE])) = *pstChangeIndication;
+               ((struct bcm_change_indication 
*)&(ad->caDsxReqResp[LEADER_SIZE]))->u8Type = DSC_ACK;
                /* FALLTHROUGH */
        case DSC_ACK:
                pstChangeIndication = (struct bcm_change_indication 
*)pstAddIndication;
-               uiSearchRuleIndex = SearchSfid(Adapter, 
ntohl(pstChangeIndication->sfActiveSet.u32SFID));
+               uiSearchRuleIndex = SearchSfid(ad, 
ntohl(pstChangeIndication->sfActiveSet.u32SFID));
                if (uiSearchRuleIndex > NO_OF_QUEUES-1)
-                       BCM_DEBUG_PRINT(Adapter, DBG_TYPE_PRINTK, 0, 0, "SF 
doesn't exist for which DSC_ACK is received");
+                       BCM_DEBUG_PRINT(ad, DBG_TYPE_PRINTK, 0, 0, "SF doesn't 
exist for which DSC_ACK is received");
 
                if (uiSearchRuleIndex < NO_OF_QUEUES) {
-                       Adapter->PackInfo[uiSearchRuleIndex].ucDirection = 
pstChangeIndication->u8Direction;
+                       ad->PackInfo[uiSearchRuleIndex].ucDirection = 
pstChangeIndication->u8Direction;
                        if (pstChangeIndication->sfActiveSet.bValid == TRUE)
-                               Adapter->PackInfo[uiSearchRuleIndex].bActiveSet 
= TRUE;
+                               ad->PackInfo[uiSearchRuleIndex].bActiveSet = 
TRUE;
 
                        if (pstChangeIndication->sfAuthorizedSet.bValid == TRUE)
-                               
Adapter->PackInfo[uiSearchRuleIndex].bAuthorizedSet = TRUE;
+                               ad->PackInfo[uiSearchRuleIndex].bAuthorizedSet 
= TRUE;
 
                        if (pstChangeIndication->sfAdmittedSet.bValid == TRUE)
-                               
Adapter->PackInfo[uiSearchRuleIndex].bAdmittedSet = TRUE;
+                               ad->PackInfo[uiSearchRuleIndex].bAdmittedSet = 
TRUE;
 
                        if (pstChangeIndication->sfActiveSet.bValid == false) {
-                               Adapter->PackInfo[uiSearchRuleIndex].bActive = 
false;
-                               
Adapter->PackInfo[uiSearchRuleIndex].bActivateRequestSent = false;
+                               ad->PackInfo[uiSearchRuleIndex].bActive = false;
+                               
ad->PackInfo[uiSearchRuleIndex].bActivateRequestSent = false;
 
                                if (pstChangeIndication->sfAdmittedSet.bValid)
                                        psfLocalSet = 
&pstChangeIndication->sfAdmittedSet;
@@ -1999,57 +1999,57 @@ bool CmControlResponseMessage(struct bcm_mini_adapter 
*Adapter,  /* <Pointer to
                                        psfLocalSet = 
&pstChangeIndication->sfAuthorizedSet;
                        } else {
                                psfLocalSet = &pstChangeIndication->sfActiveSet;
-                               Adapter->PackInfo[uiSearchRuleIndex].bActive = 
TRUE;
+                               ad->PackInfo[uiSearchRuleIndex].bActive = TRUE;
                        }
 
                        if (!psfLocalSet) {
-                               BCM_DEBUG_PRINT(Adapter, DBG_TYPE_PRINTK, 0, 0, 
"No set is valid\n");
-                               Adapter->PackInfo[uiSearchRuleIndex].bActive = 
false;
-                               Adapter->PackInfo[uiSearchRuleIndex].bValid = 
false;
-                               
Adapter->PackInfo[uiSearchRuleIndex].usVCID_Value = 0;
+                               BCM_DEBUG_PRINT(ad, DBG_TYPE_PRINTK, 0, 0, "No 
set is valid\n");
+                               ad->PackInfo[uiSearchRuleIndex].bActive = false;
+                               ad->PackInfo[uiSearchRuleIndex].bValid = false;
+                               ad->PackInfo[uiSearchRuleIndex].usVCID_Value = 
0;
                                kfree(pstAddIndication);
                        } else if (psfLocalSet->bValid && 
(pstChangeIndication->u8CC == 0)) {
-                               
Adapter->PackInfo[uiSearchRuleIndex].usVCID_Value = 
ntohs(pstChangeIndication->u16VCID);
-                               BCM_DEBUG_PRINT(Adapter, DBG_TYPE_PRINTK, 0, 0, 
"CC field is %d bvalid = %d\n",
+                               ad->PackInfo[uiSearchRuleIndex].usVCID_Value = 
ntohs(pstChangeIndication->u16VCID);
+                               BCM_DEBUG_PRINT(ad, DBG_TYPE_PRINTK, 0, 0, "CC 
field is %d bvalid = %d\n",
                                                pstChangeIndication->u8CC, 
psfLocalSet->bValid);
-                               BCM_DEBUG_PRINT(Adapter, DBG_TYPE_PRINTK, 0, 0, 
"VCID= %d\n", ntohs(pstChangeIndication->u16VCID));
-                               Adapter->PackInfo[uiSearchRuleIndex].usCID = 
ntohs(pstChangeIndication->u16CID);
-                               CopyToAdapter(Adapter, psfLocalSet, 
uiSearchRuleIndex, DSC_ACK, pstAddIndication);
+                               BCM_DEBUG_PRINT(ad, DBG_TYPE_PRINTK, 0, 0, 
"VCID= %d\n", ntohs(pstChangeIndication->u16VCID));
+                               ad->PackInfo[uiSearchRuleIndex].usCID = 
ntohs(pstChangeIndication->u16CID);
+                               CopyToAdapter(ad, psfLocalSet, 
uiSearchRuleIndex, DSC_ACK, pstAddIndication);
 
                                *(PULONG)(((PUCHAR)pvBuffer)+1) = 
psfLocalSet->u32SFID;
                        } else if (pstChangeIndication->u8CC == 6) {
-                               deleteSFBySfid(Adapter, uiSearchRuleIndex);
+                               deleteSFBySfid(ad, uiSearchRuleIndex);
                                kfree(pstAddIndication);
                        }
                } else {
-                       BCM_DEBUG_PRINT(Adapter, DBG_TYPE_PRINTK, 0, 0, "DSC 
ACK did not get valid SFID");
+                       BCM_DEBUG_PRINT(ad, DBG_TYPE_PRINTK, 0, 0, "DSC ACK did 
not get valid SFID");
                        kfree(pstAddIndication);
                        return false;
                }
                break;
        case DSD_REQ:
                pLeader->PLength = sizeof(struct bcm_del_indication);
-               *((struct bcm_del_indication 
*)&(Adapter->caDsxReqResp[LEADER_SIZE])) = *((struct bcm_del_indication 
*)pstAddIndication);
+               *((struct bcm_del_indication 
*)&(ad->caDsxReqResp[LEADER_SIZE])) = *((struct bcm_del_indication 
*)pstAddIndication);
 
                ulSFID = ntohl(((struct bcm_del_indication 
*)pstAddIndication)->u32SFID);
-               uiSearchRuleIndex = SearchSfid(Adapter, ulSFID);
-               BCM_DEBUG_PRINT(Adapter, DBG_TYPE_OTHERS, CONN_MSG, 
DBG_LVL_ALL, "DSD - Removing connection %x", uiSearchRuleIndex);
+               uiSearchRuleIndex = SearchSfid(ad, ulSFID);
+               BCM_DEBUG_PRINT(ad, DBG_TYPE_OTHERS, CONN_MSG, DBG_LVL_ALL, 
"DSD - Removing connection %x", uiSearchRuleIndex);
 
                if (uiSearchRuleIndex < NO_OF_QUEUES) {
                        /* Delete All Classifiers Associated with this SFID */
-                       deleteSFBySfid(Adapter, uiSearchRuleIndex);
-                       Adapter->u32TotalDSD++;
+                       deleteSFBySfid(ad, uiSearchRuleIndex);
+                       ad->u32TotalDSD++;
                }
 
-               BCM_DEBUG_PRINT(Adapter, DBG_TYPE_OTHERS, CONN_MSG, 
DBG_LVL_ALL, "SENDING DSD RESPONSE TO MAC");
-               ((struct bcm_del_indication 
*)&(Adapter->caDsxReqResp[LEADER_SIZE]))->u8Type = DSD_RSP;
-               CopyBufferToControlPacket(Adapter, 
(PVOID)Adapter->caDsxReqResp);
+               BCM_DEBUG_PRINT(ad, DBG_TYPE_OTHERS, CONN_MSG, DBG_LVL_ALL, 
"SENDING DSD RESPONSE TO MAC");
+               ((struct bcm_del_indication 
*)&(ad->caDsxReqResp[LEADER_SIZE]))->u8Type = DSD_RSP;
+               CopyBufferToControlPacket(ad, (PVOID)ad->caDsxReqResp);
                /* FALLTHROUGH */
        case DSD_RSP:
                /* Do nothing as SF has already got Deleted */
                break;
        case DSD_ACK:
-               BCM_DEBUG_PRINT(Adapter, DBG_TYPE_OTHERS, CONN_MSG, 
DBG_LVL_ALL, "DSD ACK Rcd, let App handle it\n");
+               BCM_DEBUG_PRINT(ad, DBG_TYPE_OTHERS, CONN_MSG, DBG_LVL_ALL, 
"DSD ACK Rcd, let App handle it\n");
                break;
        default:
                kfree(pstAddIndication);
@@ -2058,27 +2058,27 @@ bool CmControlResponseMessage(struct bcm_mini_adapter 
*Adapter,  /* <Pointer to
        return TRUE;
 }
 
-int get_dsx_sf_data_to_application(struct bcm_mini_adapter *Adapter,
+int get_dsx_sf_data_to_application(struct bcm_mini_adapter *ad,
                UINT uiSFId, void __user *user_buffer)
 {
        int status = 0;
        struct bcm_packet_info *psSfInfo = NULL;
 
-       BCM_DEBUG_PRINT(Adapter, DBG_TYPE_OTHERS, CONN_MSG, DBG_LVL_ALL,
+       BCM_DEBUG_PRINT(ad, DBG_TYPE_OTHERS, CONN_MSG, DBG_LVL_ALL,
                        "status =%d", status);
-       status = SearchSfid(Adapter, uiSFId);
+       status = SearchSfid(ad, uiSFId);
        if (status >= NO_OF_QUEUES) {
-               BCM_DEBUG_PRINT(Adapter, DBG_TYPE_OTHERS, CONN_MSG, DBG_LVL_ALL,
+               BCM_DEBUG_PRINT(ad, DBG_TYPE_OTHERS, CONN_MSG, DBG_LVL_ALL,
                                "SFID %d not present in queue !!!", uiSFId);
                return -EINVAL;
        }
-       BCM_DEBUG_PRINT(Adapter, DBG_TYPE_OTHERS, CONN_MSG, DBG_LVL_ALL,
+       BCM_DEBUG_PRINT(ad, DBG_TYPE_OTHERS, CONN_MSG, DBG_LVL_ALL,
                        "status =%d", status);
-       psSfInfo = &Adapter->PackInfo[status];
+       psSfInfo = &ad->PackInfo[status];
        if (psSfInfo->pstSFIndication
                        && copy_to_user(user_buffer, psSfInfo->pstSFIndication,
                                sizeof(struct bcm_add_indication_alt))) {
-               BCM_DEBUG_PRINT(Adapter, DBG_TYPE_PRINTK, 0, 0,
+               BCM_DEBUG_PRINT(ad, DBG_TYPE_PRINTK, 0, 0,
                                "copy to user failed SFID %d, present in queue 
!!!",
                                uiSFId);
                status = -EFAULT;
@@ -2087,7 +2087,7 @@ int get_dsx_sf_data_to_application(struct 
bcm_mini_adapter *Adapter,
        return STATUS_SUCCESS;
 }
 
-VOID OverrideServiceFlowParams(struct bcm_mini_adapter *Adapter,
+VOID OverrideServiceFlowParams(struct bcm_mini_adapter *ad,
                PUINT puiBuffer)
 {
        B_UINT32 u32NumofSFsinMsg = ntohl(*(puiBuffer + 1));
@@ -2096,7 +2096,7 @@ VOID OverrideServiceFlowParams(struct bcm_mini_adapter 
*Adapter,
        ULONG ulSFID = 0;
 
        puiBuffer += 2;
-       BCM_DEBUG_PRINT(Adapter, DBG_TYPE_OTHERS, CONN_MSG, DBG_LVL_ALL,
+       BCM_DEBUG_PRINT(ad, DBG_TYPE_OTHERS, CONN_MSG, DBG_LVL_ALL,
                        "u32NumofSFsinMsg: 0x%x\n", u32NumofSFsinMsg);
 
        while (u32NumofSFsinMsg != 0 && u32NumofSFsinMsg < NO_OF_QUEUES) {
@@ -2105,13 +2105,13 @@ VOID OverrideServiceFlowParams(struct bcm_mini_adapter 
*Adapter,
                puiBuffer = (PUINT)(pHostInfo + 1);
 
                ulSFID = ntohl(pHostInfo->SFID);
-               uiSearchRuleIndex = SearchSfid(Adapter, ulSFID);
-               BCM_DEBUG_PRINT(Adapter, DBG_TYPE_OTHERS, CONN_MSG, DBG_LVL_ALL,
+               uiSearchRuleIndex = SearchSfid(ad, ulSFID);
+               BCM_DEBUG_PRINT(ad, DBG_TYPE_OTHERS, CONN_MSG, DBG_LVL_ALL,
                                "SFID: 0x%lx\n", ulSFID);
 
                if (uiSearchRuleIndex >= NO_OF_QUEUES
                                || uiSearchRuleIndex == HiPriority) {
-                       BCM_DEBUG_PRINT(Adapter, DBG_TYPE_OTHERS, CONN_MSG,
+                       BCM_DEBUG_PRINT(ad, DBG_TYPE_OTHERS, CONN_MSG,
                                        DBG_LVL_ALL,
                                        "The SFID <%lx> doesn't exist in host 
entry or is Invalid\n",
                                        ulSFID);
@@ -2119,18 +2119,18 @@ VOID OverrideServiceFlowParams(struct bcm_mini_adapter 
*Adapter,
                }
 
                if (pHostInfo->RetainSF == false) {
-                       BCM_DEBUG_PRINT(Adapter, DBG_TYPE_OTHERS, CONN_MSG,
+                       BCM_DEBUG_PRINT(ad, DBG_TYPE_OTHERS, CONN_MSG,
                                        DBG_LVL_ALL, "Going to Delete SF");
-                       deleteSFBySfid(Adapter, uiSearchRuleIndex);
+                       deleteSFBySfid(ad, uiSearchRuleIndex);
                } else {
                        struct bcm_packet_info *packinfo =
-                               &Adapter->PackInfo[uiSearchRuleIndex];
+                               &ad->PackInfo[uiSearchRuleIndex];
 
                        packinfo->usVCID_Value = ntohs(pHostInfo->VCID);
                        packinfo->usCID = ntohs(pHostInfo->newCID);
                        packinfo->bActive = false;
 
-                       BCM_DEBUG_PRINT(Adapter, DBG_TYPE_OTHERS, CONN_MSG,
+                       BCM_DEBUG_PRINT(ad, DBG_TYPE_OTHERS, CONN_MSG,
                                        DBG_LVL_ALL,
                                        "pHostInfo->QoSParamSet: 0x%x\n",
                                        pHostInfo->QoSParamSet);
@@ -2167,7 +2167,7 @@ static void restore_endianess_of_pstClassifierEntry(
 }
 
 static void apply_phs_rule_to_all_classifiers(
-               register struct bcm_mini_adapter *Adapter,              /* 
<Pointer to the Adapter structure */
+               register struct bcm_mini_adapter *ad,           /* <Pointer to 
the ad structure */
                register UINT uiSearchRuleIndex,                        /* 
<Index of Queue, to which this data belongs */
                USHORT uVCID,
                struct bcm_phs_rule *sPhsRule,
@@ -2180,11 +2180,11 @@ static void apply_phs_rule_to_all_classifiers(
        if (pstAddIndication->u8Direction == UPLINK_DIR) {
                for (uiClassifierIndex = 0; uiClassifierIndex < 
MAX_CLASSIFIERS; uiClassifierIndex++) {
                        curr_classifier =
-                               &Adapter->astClassifierTable[uiClassifierIndex];
+                               &ad->astClassifierTable[uiClassifierIndex];
                        if ((curr_classifier->bUsed) &&
-                               (curr_classifier->ulSFID == 
Adapter->PackInfo[uiSearchRuleIndex].ulSFID) &&
+                               (curr_classifier->ulSFID == 
ad->PackInfo[uiSearchRuleIndex].ulSFID) &&
                                (curr_classifier->u8AssociatedPHSI == 
cPhsRule->u8PHSI)) {
-                               BCM_DEBUG_PRINT(Adapter, DBG_TYPE_OTHERS, 
CONN_MSG, DBG_LVL_ALL,
+                               BCM_DEBUG_PRINT(ad, DBG_TYPE_OTHERS, CONN_MSG, 
DBG_LVL_ALL,
                                                "Adding PHS Rule For 
Classifier: 0x%x cPhsRule.u8PHSI: 0x%x\n",
                                                
curr_classifier->uiClassifierRuleIndex,
                                                cPhsRule->u8PHSI);
@@ -2208,7 +2208,7 @@ static void apply_phs_rule_to_all_classifiers(
                                /* Store The PHS Rule for this classifier */
 
                                PhsUpdateClassifierRule(
-                                       &Adapter->stBCMPhsContext,
+                                       &ad->stBCMPhsContext,
                                        uVCID,
                                        curr_classifier->uiClassifierRuleIndex,
                                        sPhsRule,
@@ -2245,7 +2245,7 @@ static void apply_phs_rule_to_all_classifiers(
                 * To support multiple PHS rule, passing u8PHSI.
                 */
                PhsUpdateClassifierRule(
-                       &Adapter->stBCMPhsContext,
+                       &ad->stBCMPhsContext,
                        uVCID,
                        sPhsRule->u8PHSI,
                        sPhsRule,
-- 
2.1.0

_______________________________________________
devel mailing list
de...@linuxdriverproject.org
http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel

Reply via email to