[PATCH 01/34] staging: bcm: Reindent source

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

 



Use emacs to properly reindent the source using:

beginning-of-buffer-mark
set-mark-command
end-of-buffer-mak
c-indent-line-or-region

Update Debug.h logging macros

git diff -w shows only Debug.h modifications.

Signed-off-by: Joe Perches <joe@xxxxxxxxxxx>
---
 drivers/staging/bcm/Adapter.h                  |  232 ++--
 drivers/staging/bcm/Bcmchar.c                  |  222 ++--
 drivers/staging/bcm/Bcmnet.c                   |   28 +-
 drivers/staging/bcm/CmHost.c                   |  908 ++++++------
 drivers/staging/bcm/CmHost.h                   |  114 +-
 drivers/staging/bcm/DDRInit.c                  | 1886 ++++++++++++------------
 drivers/staging/bcm/Debug.h                    |   23 +-
 drivers/staging/bcm/HandleControlPacket.c      |   36 +-
 drivers/staging/bcm/HostMIBSInterface.h        |   10 +-
 drivers/staging/bcm/IPv6Protocol.c             |  184 ++--
 drivers/staging/bcm/IPv6ProtocolHdr.h          |    4 +-
 drivers/staging/bcm/InterfaceAdapter.h         |   42 +-
 drivers/staging/bcm/InterfaceDld.c             |    2 +-
 drivers/staging/bcm/InterfaceIdleMode.c        |   66 +-
 drivers/staging/bcm/InterfaceInit.c            |   20 +-
 drivers/staging/bcm/InterfaceIsr.c             |  118 +-
 drivers/staging/bcm/InterfaceMisc.c            |   40 +-
 drivers/staging/bcm/InterfaceMisc.h            |   32 +-
 drivers/staging/bcm/InterfaceRx.c              |   44 +-
 drivers/staging/bcm/InterfaceTx.c              |   26 +-
 drivers/staging/bcm/Ioctl.h                    |   56 +-
 drivers/staging/bcm/LeakyBucket.c              |  136 +-
 drivers/staging/bcm/Macros.h                   |    4 +-
 drivers/staging/bcm/Misc.c                     |  174 ++--
 drivers/staging/bcm/PHSDefines.h               |   32 +-
 drivers/staging/bcm/PHSModule.c                |  606 ++++----
 drivers/staging/bcm/PHSModule.h                |   24 +-
 drivers/staging/bcm/Protocol.h                 |   16 +-
 drivers/staging/bcm/Prototypes.h               |   24 +-
 drivers/staging/bcm/Qos.c                      |  344 +++---
 drivers/staging/bcm/Queue.h                    |   46 +-
 drivers/staging/bcm/Transmit.c                 |  116 +-
 drivers/staging/bcm/Typedefs.h                 |    4 +-
 drivers/staging/bcm/Version.h                  |    6 +-
 drivers/staging/bcm/cntrl_SignalingInterface.h |  252 ++--
 drivers/staging/bcm/headers.h                  |    4 +-
 drivers/staging/bcm/hostmibs.c                 |    2 +-
 drivers/staging/bcm/led_control.c              |  256 ++--
 drivers/staging/bcm/led_control.h              |   32 +-
 drivers/staging/bcm/nvm.c                      | 1578 ++++++++++----------
 drivers/staging/bcm/nvm.h                      |   28 +-
 drivers/staging/bcm/sort.c                     |    4 +-
 drivers/staging/bcm/target_params.h            |   94 +-
 drivers/staging/bcm/vendorspecificextn.c       |    6 +-
 drivers/staging/bcm/vendorspecificextn.h       |    6 +-
 45 files changed, 3945 insertions(+), 3942 deletions(-)

diff --git a/drivers/staging/bcm/Adapter.h b/drivers/staging/bcm/Adapter.h
index 2e8382c..d3c3f89 100644
--- a/drivers/staging/bcm/Adapter.h
+++ b/drivers/staging/bcm/Adapter.h
@@ -41,22 +41,22 @@ typedef struct link_request LINK_REQUEST, *PLINK_REQUEST;
 //classification extension is added
 typedef struct _ADD_CONNECTION
 {
-    ULONG 		SrcIpAddressCount;
-    ULONG 		SrcIpAddress[MAX_CONNECTIONS];
-    ULONG 		SrcIpMask[MAX_CONNECTIONS];
+	ULONG 		SrcIpAddressCount;
+	ULONG 		SrcIpAddress[MAX_CONNECTIONS];
+	ULONG 		SrcIpMask[MAX_CONNECTIONS];
 
-    ULONG 		DestIpAddressCount;
-    ULONG 		DestIpAddress[MAX_CONNECTIONS];
-    ULONG 		DestIpMask[MAX_CONNECTIONS];
+	ULONG 		DestIpAddressCount;
+	ULONG 		DestIpAddress[MAX_CONNECTIONS];
+	ULONG 		DestIpMask[MAX_CONNECTIONS];
 
-    USHORT 		SrcPortBegin;
-    USHORT 		SrcPortEnd;
+	USHORT 		SrcPortBegin;
+	USHORT 		SrcPortEnd;
 
-    USHORT 		DestPortBegin;
-    USHORT 		DestPortEnd;
+	USHORT 		DestPortBegin;
+	USHORT 		DestPortEnd;
 
-    UCHAR 		SrcTOS;
-    UCHAR 		SrcProtocol;
+	UCHAR 		SrcTOS;
+	UCHAR 		SrcProtocol;
 } ADD_CONNECTION,*PADD_CONNECTION;
 
 
@@ -75,13 +75,13 @@ typedef struct _CLASSIFICATION_RULE
 
 typedef struct _CLASSIFICATION_ONLY
 {
-    USHORT 		usVcid;
-    ULONG  		DestIpAddress;
-    ULONG  		DestIpMask;
-    USHORT 		usPortLo;
-    USHORT 		usPortHi;
-    BOOLEAN		bIpVersion;
-    UCHAR		ucDestinationAddress[16];
+	USHORT 		usVcid;
+	ULONG  		DestIpAddress;
+	ULONG  		DestIpMask;
+	USHORT 		usPortLo;
+	USHORT 		usPortHi;
+	BOOLEAN		bIpVersion;
+	UCHAR		ucDestinationAddress[16];
 } CLASSIFICATION_ONLY, *PCLASSIFICATION_ONLY;
 
 
@@ -92,7 +92,7 @@ typedef struct _CLASSIFICATION_ONLY
 
 typedef union _U_IP_ADDRESS
 {
-    struct
+	struct
 	{
 		ULONG				ulIpv4Addr[MAX_IP_RANGE_LENGTH];//Source Ip Address Range
 		ULONG               ulIpv4Mask[MAX_IP_RANGE_LENGTH];//Source Ip Mask Address Range
@@ -137,21 +137,21 @@ typedef struct _S_CLASSIFIER_RULE
 	UCHAR           ucIPSourceAddressLength;//Ip Source Address Length
 
 	U_IP_ADDRESS    stDestIpAddress;
-    UCHAR           ucIPDestinationAddressLength;//Ip Destination Address Length
-    UCHAR           ucIPTypeOfServiceLength;//Type of service Length
-    UCHAR           ucTosLow;//Tos Low
-    UCHAR           ucTosHigh;//Tos High
+	UCHAR           ucIPDestinationAddressLength;//Ip Destination Address Length
+	UCHAR           ucIPTypeOfServiceLength;//Type of service Length
+	UCHAR           ucTosLow;//Tos Low
+	UCHAR           ucTosHigh;//Tos High
 	UCHAR           ucTosMask;//Tos Mask
 
-    UCHAR           ucProtocolLength;//protocol Length
-    UCHAR           ucProtocol[MAX_PROTOCOL_LENGTH];//protocol Length
-    USHORT			usSrcPortRangeLo[MAX_PORT_RANGE];
+	UCHAR           ucProtocolLength;//protocol Length
+	UCHAR           ucProtocol[MAX_PROTOCOL_LENGTH];//protocol Length
+	USHORT			usSrcPortRangeLo[MAX_PORT_RANGE];
 	USHORT			usSrcPortRangeHi[MAX_PORT_RANGE];
-    UCHAR           ucSrcPortRangeLength;
+	UCHAR           ucSrcPortRangeLength;
 
-    USHORT			usDestPortRangeLo[MAX_PORT_RANGE];
+	USHORT			usDestPortRangeLo[MAX_PORT_RANGE];
 	USHORT			usDestPortRangeHi[MAX_PORT_RANGE];
-    UCHAR           ucDestPortRangeLength;
+	UCHAR           ucDestPortRangeLength;
 
 	BOOLEAN			bProtocolValid;
 	BOOLEAN			bTOSValid;
@@ -266,12 +266,12 @@ typedef struct _packet_info PacketInfo;
 
 typedef struct _PER_TARANG_DATA
 {
-    struct _PER_TARANG_DATA * next;
-    struct _MINI_ADAPTER * Adapter;
-    struct sk_buff*     RxAppControlHead;
-    struct sk_buff*     RxAppControlTail;
-    volatile INT        AppCtrlQueueLen;
-    BOOLEAN             MacTracingEnabled;
+	struct _PER_TARANG_DATA * next;
+	struct _MINI_ADAPTER * Adapter;
+	struct sk_buff*     RxAppControlHead;
+	struct sk_buff*     RxAppControlTail;
+	volatile INT        AppCtrlQueueLen;
+	BOOLEAN             MacTracingEnabled;
 	BOOLEAN				bApplicationToExit;
 	S_MIBS_DROPPED_APP_CNTRL_MESSAGES stDroppedAppCntrlMsgs;
 	ULONG 				RxCntrlMsgBitMask;
@@ -281,80 +281,80 @@ typedef struct _PER_TARANG_DATA
 #ifdef REL_4_1
 typedef struct _TARGET_PARAMS
 {
-      B_UINT32 m_u32CfgVersion;
+	B_UINT32 m_u32CfgVersion;
 
-      // Scanning Related Params
-      B_UINT32 m_u32CenterFrequency;
-      B_UINT32 m_u32BandAScan;
-      B_UINT32 m_u32BandBScan;
-      B_UINT32 m_u32BandCScan;
+	// Scanning Related Params
+	B_UINT32 m_u32CenterFrequency;
+	B_UINT32 m_u32BandAScan;
+	B_UINT32 m_u32BandBScan;
+	B_UINT32 m_u32BandCScan;
 
-      // QoS Params
-      B_UINT32 m_u32minGrantsize;	// size of minimum grant is 0 or 6
-      B_UINT32 m_u32PHSEnable;
+	// QoS Params
+	B_UINT32 m_u32minGrantsize;	// size of minimum grant is 0 or 6
+	B_UINT32 m_u32PHSEnable;
 
-      // HO Params
-      B_UINT32 m_u32HoEnable;
-      B_UINT32 m_u32HoReserved1;
-      B_UINT32 m_u32HoReserved2;
+	// HO Params
+	B_UINT32 m_u32HoEnable;
+	B_UINT32 m_u32HoReserved1;
+	B_UINT32 m_u32HoReserved2;
 
 	// Power Control Params
-      B_UINT32 m_u32MimoEnable;
-      B_UINT32 m_u32SecurityEnable;
+	B_UINT32 m_u32MimoEnable;
+	B_UINT32 m_u32SecurityEnable;
 	/*
-     * bit 1: 1 Idlemode enable;
-     * bit 2: 1 Sleepmode Enable
-     */
-      B_UINT32 m_u32PowerSavingModesEnable;
-	  /* PowerSaving Mode Options:
-	     bit 0 = 1: CPE mode - to keep pcmcia if alive;
-	     bit 1 = 1: CINR reporing in Idlemode Msg
-	     bit 2 = 1: Default PSC Enable in sleepmode*/
-      B_UINT32 m_u32PowerSavingModeOptions;
-
-      B_UINT32 m_u32ArqEnable;
-
-      // From Version #3, the HARQ section renamed as general
-      B_UINT32 m_u32HarqEnable;
-       // EEPROM Param Location
-       B_UINT32  m_u32EEPROMFlag;
-       /* BINARY TYPE - 4th MSByte:
-        * Interface Type -  3rd MSByte:
-        * Vendor Type - 2nd MSByte
-        */
-       // Unused - LSByte
-      B_UINT32   m_u32Customize;
-      B_UINT32   m_u32ConfigBW;  /* In Hz */
-      B_UINT32   m_u32ShutDownTimer;
-
-
-      B_UINT32  m_u32RadioParameter;
-      B_UINT32  m_u32PhyParameter1;
-      B_UINT32  m_u32PhyParameter2;
-      B_UINT32  m_u32PhyParameter3;
+	 * bit 1: 1 Idlemode enable;
+	 * bit 2: 1 Sleepmode Enable
+	 */
+	B_UINT32 m_u32PowerSavingModesEnable;
+	/* PowerSaving Mode Options:
+	   bit 0 = 1: CPE mode - to keep pcmcia if alive;
+	   bit 1 = 1: CINR reporing in Idlemode Msg
+	   bit 2 = 1: Default PSC Enable in sleepmode*/
+	B_UINT32 m_u32PowerSavingModeOptions;
+
+	B_UINT32 m_u32ArqEnable;
+
+	// From Version #3, the HARQ section renamed as general
+	B_UINT32 m_u32HarqEnable;
+	// EEPROM Param Location
+	B_UINT32  m_u32EEPROMFlag;
+	/* BINARY TYPE - 4th MSByte:
+	 * Interface Type -  3rd MSByte:
+	 * Vendor Type - 2nd MSByte
+	 */
+	// Unused - LSByte
+	B_UINT32   m_u32Customize;
+	B_UINT32   m_u32ConfigBW;  /* In Hz */
+	B_UINT32   m_u32ShutDownTimer;
+
+
+	B_UINT32  m_u32RadioParameter;
+	B_UINT32  m_u32PhyParameter1;
+	B_UINT32  m_u32PhyParameter2;
+	B_UINT32  m_u32PhyParameter3;
 
 	/* in eval mode only;
-     * lower 16bits = basic cid for testing;
-     * then bit 16 is test cqich,
-     * bit 17  test init rang;
-     * bit 18 test periodic rang
-     * bit 19 is test harq ack/nack
-     */
-    B_UINT32	  m_u32TestOptions;
+	 * lower 16bits = basic cid for testing;
+	 * then bit 16 is test cqich,
+	 * bit 17  test init rang;
+	 * bit 18 test periodic rang
+	 * bit 19 is test harq ack/nack
+	 */
+	B_UINT32	  m_u32TestOptions;
 
 	B_UINT32 m_u32MaxMACDataperDLFrame;
 	B_UINT32 m_u32MaxMACDataperULFrame;
 
 	B_UINT32 m_u32Corr2MacFlags;
 
-    //adding driver params.
-    B_UINT32 HostDrvrConfig1;
-    B_UINT32 HostDrvrConfig2;
-    B_UINT32 HostDrvrConfig3;
-    B_UINT32 HostDrvrConfig4;
-    B_UINT32 HostDrvrConfig5;
-    B_UINT32 HostDrvrConfig6;
-    B_UINT32 m_u32SegmentedPUSCenable;
+	//adding driver params.
+	B_UINT32 HostDrvrConfig1;
+	B_UINT32 HostDrvrConfig2;
+	B_UINT32 HostDrvrConfig3;
+	B_UINT32 HostDrvrConfig4;
+	B_UINT32 HostDrvrConfig5;
+	B_UINT32 HostDrvrConfig6;
+	B_UINT32 m_u32SegmentedPUSCenable;
 
 	//	BAMC enable - but 4.x does not support this feature
 	//	This is added just to sync 4.x and 5.x CFGs
@@ -364,9 +364,9 @@ typedef struct _TARGET_PARAMS
 
 typedef struct _STTARGETDSXBUFFER
 {
-    ULONG ulTargetDsxBuffer;
-    B_UINT16 tid;
-    BOOLEAN valid;
+	ULONG ulTargetDsxBuffer;
+	B_UINT16 tid;
+	BOOLEAN valid;
 }STTARGETDSXBUFFER, *PSTTARGETDSXBUFFER;
 
 typedef INT (*FP_FLASH_WRITE)(struct _MINI_ADAPTER*,UINT,PVOID);
@@ -374,7 +374,7 @@ typedef INT (*FP_FLASH_WRITE)(struct _MINI_ADAPTER*,UINT,PVOID);
 typedef INT (*FP_FLASH_WRITE_STATUS)(struct _MINI_ADAPTER*,UINT,PVOID);
 
 /**
-Driver adapter data structure
+   Driver adapter data structure
 */
 struct _MINI_ADAPTER
 {
@@ -481,19 +481,19 @@ struct _MINI_ADAPTER
 	/* Interface Specific */
 	PVOID				pvInterfaceAdapter;
 	int (*bcm_file_download)( PVOID,
-                        struct file *,
-                        unsigned int);
+				  struct file *,
+				  unsigned int);
 	int (*bcm_file_readback_from_chip)( PVOID,
-                        struct file *,
-                        unsigned int);
+					    struct file *,
+					    unsigned int);
 	INT (*interface_rdm)(PVOID,
-			UINT ,
-			PVOID ,
-			INT);
+			     UINT ,
+			     PVOID ,
+			     INT);
 	INT (*interface_wrm)(PVOID,
-			UINT ,
-			PVOID ,
-			INT);
+			     UINT ,
+			     PVOID ,
+			     INT);
 	int (*interface_transmit)(PVOID, PVOID , UINT);
 	BOOLEAN			IdleMode;
 	BOOLEAN			bDregRequestSentInIdleMode;
@@ -524,8 +524,8 @@ struct _MINI_ADAPTER
 	BOOLEAN			bStatusWrite;
 	UINT			uiNVMDSDSize;
 	UINT			uiVendorExtnFlag;
-	 //it will always represent chosen DSD at any point of time.
-	 // Generally it is Active DSD but in case of NVM RD/WR it might be different.
+	//it will always represent chosen DSD at any point of time.
+	// Generally it is Active DSD but in case of NVM RD/WR it might be different.
 	UINT			ulFlashCalStart;
 	ULONG                   ulFlashControlSectionStart;
 	ULONG                   ulFlashWriteSize;
@@ -566,7 +566,7 @@ struct _MINI_ADAPTER
 	ULONG	liDrainCalculated;
 	UINT gpioBitMap;
 
-    S_BCM_DEBUG_STATE stDebugState;
+	S_BCM_DEBUG_STATE stDebugState;
 
 };
 typedef struct _MINI_ADAPTER MINI_ADAPTER, *PMINI_ADAPTER;
@@ -574,9 +574,9 @@ typedef struct _MINI_ADAPTER MINI_ADAPTER, *PMINI_ADAPTER;
 #define GET_BCM_ADAPTER(net_dev)	netdev_priv(net_dev)
 
 struct _ETH_HEADER_STRUC {
-    UCHAR       au8DestinationAddress[6];
-    UCHAR       au8SourceAddress[6];
-    USHORT      u16Etype;
+	UCHAR       au8DestinationAddress[6];
+	UCHAR       au8SourceAddress[6];
+	USHORT      u16Etype;
 }__attribute__((packed));
 typedef struct _ETH_HEADER_STRUC ETH_HEADER_STRUC, *PETH_HEADER_STRUC;
 
diff --git a/drivers/staging/bcm/Bcmchar.c b/drivers/staging/bcm/Bcmchar.c
index bc653aa..13ded44 100644
--- a/drivers/staging/bcm/Bcmchar.c
+++ b/drivers/staging/bcm/Bcmchar.c
@@ -1,15 +1,15 @@
 #include "headers.h"
 /***************************************************************
-* Function	  - bcm_char_open()
-*
-* Description - This is the "open" entry point for the character
-*				driver.
-*
-* Parameters  - inode: Pointer to the Inode structure of char device
-*				filp : File pointer of the char device
-*
-* Returns	  - Zero(Success)
-****************************************************************/
+ * Function	  - bcm_char_open()
+ *
+ * Description - This is the "open" entry point for the character
+ *				driver.
+ *
+ * Parameters  - inode: Pointer to the Inode structure of char device
+ *				filp : File pointer of the char device
+ *
+ * Returns	  - Zero(Success)
+ ****************************************************************/
 
 static int bcm_char_open(struct inode *inode, struct file * filp)
 {
@@ -199,7 +199,7 @@ static long bcm_char_ioctl(struct file *filp, UINT cmd, ULONG arg)
 		return Status;
 
 	switch (cmd) {
-	/* Rdms for Swin Idle... */
+		/* Rdms for Swin Idle... */
 	case IOCTL_BCM_REGISTER_READ_PRIVATE: {
 		RDM_BUFFER  sRdmBuffer = {0};
 		PCHAR temp_buff;
@@ -217,7 +217,7 @@ static long bcm_char_ioctl(struct file *filp, UINT cmd, ULONG arg)
 			return -EFAULT;
 
 		if (IoBuffer.OutputLength > USHRT_MAX ||
-			IoBuffer.OutputLength == 0) {
+		    IoBuffer.OutputLength == 0) {
 			return -EINVAL;
 		}
 
@@ -230,7 +230,7 @@ static long bcm_char_ioctl(struct file *filp, UINT cmd, ULONG arg)
 			return -ENOMEM;
 
 		bytes = rdmalt(Adapter, (UINT)sRdmBuffer.Register,
-				(PUINT)temp_buff, Bufflen);
+			       (PUINT)temp_buff, Bufflen);
 		if (bytes > 0) {
 			Status = STATUS_SUCCESS;
 			if (copy_to_user(IoBuffer.OutputBuffer, temp_buff, bytes)) {
@@ -262,10 +262,10 @@ static long bcm_char_ioctl(struct file *filp, UINT cmd, ULONG arg)
 
 		uiTempVar = sWrmBuffer.Register & EEPROM_REJECT_MASK;
 		if (!((Adapter->pstargetparams->m_u32Customize) & VSG_MODE) &&
-			((uiTempVar == EEPROM_REJECT_REG_1) ||
-				(uiTempVar == EEPROM_REJECT_REG_2) ||
-				(uiTempVar == EEPROM_REJECT_REG_3) ||
-				(uiTempVar == EEPROM_REJECT_REG_4))) {
+		    ((uiTempVar == EEPROM_REJECT_REG_1) ||
+		     (uiTempVar == EEPROM_REJECT_REG_2) ||
+		     (uiTempVar == EEPROM_REJECT_REG_3) ||
+		     (uiTempVar == EEPROM_REJECT_REG_4))) {
 
 			pr_info("EEPROM Access Denied, not in VSG Mode\n");
 			return -EFAULT;
@@ -289,8 +289,8 @@ static long bcm_char_ioctl(struct file *filp, UINT cmd, ULONG arg)
 		PCHAR temp_buff = NULL;
 		UINT uiTempVar = 0;
 		if ((Adapter->IdleMode == TRUE) ||
-			(Adapter->bShutStatus == TRUE) ||
-			(Adapter->bPreparingForLowPowerMode == TRUE)) {
+		    (Adapter->bShutStatus == TRUE) ||
+		    (Adapter->bPreparingForLowPowerMode == TRUE)) {
 
 			pr_info("Device in Idle Mode, Blocking Rdms\n");
 			return -EACCES;
@@ -307,7 +307,7 @@ static long bcm_char_ioctl(struct file *filp, UINT cmd, ULONG arg)
 			return -EFAULT;
 
 		if (IoBuffer.OutputLength > USHRT_MAX ||
-			IoBuffer.OutputLength == 0) {
+		    IoBuffer.OutputLength == 0) {
 			return -EINVAL;
 		}
 
@@ -316,7 +316,7 @@ static long bcm_char_ioctl(struct file *filp, UINT cmd, ULONG arg)
 			return STATUS_FAILURE;
 
 		if ((((ULONG)sRdmBuffer.Register & 0x0F000000) != 0x0F000000) ||
-			((ULONG)sRdmBuffer.Register & 0x3)) {
+		    ((ULONG)sRdmBuffer.Register & 0x3)) {
 
 			pr_info("RDM Done On invalid Address : %x Access Denied\n",
 				(int)sRdmBuffer.Register);
@@ -346,8 +346,8 @@ static long bcm_char_ioctl(struct file *filp, UINT cmd, ULONG arg)
 		WRM_BUFFER  sWrmBuffer = {0};
 		UINT uiTempVar = 0;
 		if ((Adapter->IdleMode == TRUE) ||
-			(Adapter->bShutStatus == TRUE) ||
-			(Adapter->bPreparingForLowPowerMode == TRUE)) {
+		    (Adapter->bShutStatus == TRUE) ||
+		    (Adapter->bPreparingForLowPowerMode == TRUE)) {
 
 			pr_info("Device in Idle Mode, Blocking Wrms\n");
 			return -EACCES;
@@ -365,7 +365,7 @@ static long bcm_char_ioctl(struct file *filp, UINT cmd, ULONG arg)
 			return -EFAULT;
 
 		if ((((ULONG)sWrmBuffer.Register & 0x0F000000) != 0x0F000000) ||
-			((ULONG)sWrmBuffer.Register & 0x3)) {
+		    ((ULONG)sWrmBuffer.Register & 0x3)) {
 
 			pr_info("WRM Done On invalid Address : %x Access Denied\n",
 				(int)sWrmBuffer.Register);
@@ -374,14 +374,14 @@ static long bcm_char_ioctl(struct file *filp, UINT cmd, ULONG arg)
 
 		uiTempVar = sWrmBuffer.Register & EEPROM_REJECT_MASK;
 		if (!((Adapter->pstargetparams->m_u32Customize) & VSG_MODE) &&
-				((uiTempVar == EEPROM_REJECT_REG_1) ||
-				(uiTempVar == EEPROM_REJECT_REG_2) ||
-				(uiTempVar == EEPROM_REJECT_REG_3) ||
-				(uiTempVar == EEPROM_REJECT_REG_4)) &&
-				(cmd == IOCTL_BCM_REGISTER_WRITE)) {
+		    ((uiTempVar == EEPROM_REJECT_REG_1) ||
+		     (uiTempVar == EEPROM_REJECT_REG_2) ||
+		     (uiTempVar == EEPROM_REJECT_REG_3) ||
+		     (uiTempVar == EEPROM_REJECT_REG_4)) &&
+		    (cmd == IOCTL_BCM_REGISTER_WRITE)) {
 
-				pr_info("EEPROM Access Denied, not in VSG Mode\n");
-				return -EFAULT;
+			pr_info("EEPROM Access Denied, not in VSG Mode\n");
+			return -EFAULT;
 		}
 
 		Status = wrmaltWithLock(Adapter, (UINT)sWrmBuffer.Register,
@@ -403,8 +403,8 @@ static long bcm_char_ioctl(struct file *filp, UINT cmd, ULONG arg)
 
 		GPIO_INFO   gpio_info = {0};
 		if ((Adapter->IdleMode == TRUE) ||
-			(Adapter->bShutStatus == TRUE) ||
-			(Adapter->bPreparingForLowPowerMode == TRUE)) {
+		    (Adapter->bShutStatus == TRUE) ||
+		    (Adapter->bPreparingForLowPowerMode == TRUE)) {
 
 			bcm_dbg(Adapter, OTHERS, OSAL_DBG, ALL,
 				"GPIO Can't be set/clear in Low power Mode\n");
@@ -484,7 +484,7 @@ static long bcm_char_ioctl(struct file *filp, UINT cmd, ULONG arg)
 			break;
 		}
 	}
-	break;
+		break;
 
 	case BCM_LED_THREAD_STATE_CHANGE_REQ: {
 		USER_THREAD_REQ threadReq = {0};
@@ -492,8 +492,8 @@ static long bcm_char_ioctl(struct file *filp, UINT cmd, ULONG arg)
 			"User made LED thread InActive\n");
 
 		if ((Adapter->IdleMode == TRUE) ||
-			(Adapter->bShutStatus == TRUE) ||
-			(Adapter->bPreparingForLowPowerMode == TRUE)) {
+		    (Adapter->bShutStatus == TRUE) ||
+		    (Adapter->bPreparingForLowPowerMode == TRUE)) {
 
 			bcm_dbg(Adapter, OTHERS, OSAL_DBG, ALL,
 				"GPIO Can't be set/clear in Low power Mode\n");
@@ -526,7 +526,7 @@ static long bcm_char_ioctl(struct file *filp, UINT cmd, ULONG arg)
 			wake_up(&Adapter->LEDInfo.notify_led_event);
 		}
 	}
-	break;
+		break;
 
 	case IOCTL_BCM_GPIO_STATUS_REQUEST: {
 		ULONG uiBit = 0;
@@ -534,8 +534,8 @@ static long bcm_char_ioctl(struct file *filp, UINT cmd, ULONG arg)
 		GPIO_INFO   gpio_info = {0};
 
 		if ((Adapter->IdleMode == TRUE) ||
-			(Adapter->bShutStatus == TRUE) ||
-			(Adapter->bPreparingForLowPowerMode == TRUE))
+		    (Adapter->bShutStatus == TRUE) ||
+		    (Adapter->bPreparingForLowPowerMode == TRUE))
 			return -EACCES;
 
 		if (copy_from_user(&IoBuffer, argp, sizeof(IOCTL_BUFFER)))
@@ -551,7 +551,7 @@ static long bcm_char_ioctl(struct file *filp, UINT cmd, ULONG arg)
 
 		/* Set the gpio output register */
 		bytes = rdmaltWithLock(Adapter, (UINT)GPIO_PIN_STATE_REGISTER,
-					(PUINT)ucRead, sizeof(UINT));
+				       (PUINT)ucRead, sizeof(UINT));
 
 		if (bytes < 0) {
 			Status = bytes;
@@ -561,7 +561,7 @@ static long bcm_char_ioctl(struct file *filp, UINT cmd, ULONG arg)
 			Status = STATUS_SUCCESS;
 		}
 	}
-	break;
+		break;
 
 	case IOCTL_BCM_GPIO_MULTI_REQUEST: {
 		UCHAR ucResetValue[4];
@@ -571,8 +571,8 @@ static long bcm_char_ioctl(struct file *filp, UINT cmd, ULONG arg)
 		memset(pgpio_multi_info, 0, MAX_IDX * sizeof(GPIO_MULTI_INFO));
 
 		if ((Adapter->IdleMode == TRUE) ||
-			(Adapter->bShutStatus == TRUE) ||
-			(Adapter->bPreparingForLowPowerMode == TRUE))
+		    (Adapter->bShutStatus == TRUE) ||
+		    (Adapter->bPreparingForLowPowerMode == TRUE))
 			return -EINVAL;
 
 		if (copy_from_user(&IoBuffer, argp, sizeof(IOCTL_BUFFER)))
@@ -595,7 +595,7 @@ static long bcm_char_ioctl(struct file *filp, UINT cmd, ULONG arg)
 
 		/* Set the gpio output register */
 		if ((pgpio_multi_info[WIMAX_IDX].uiGPIOMask) &
-			(pgpio_multi_info[WIMAX_IDX].uiGPIOCommand)) {
+		    (pgpio_multi_info[WIMAX_IDX].uiGPIOCommand)) {
 			/* Set 1's in GPIO OUTPUT REGISTER */
 			*(UINT *)ucResetValue =  pgpio_multi_info[WIMAX_IDX].uiGPIOMask &
 				pgpio_multi_info[WIMAX_IDX].uiGPIOCommand &
@@ -612,8 +612,8 @@ static long bcm_char_ioctl(struct file *filp, UINT cmd, ULONG arg)
 
 			/* Clear to 0's in GPIO OUTPUT REGISTER */
 			*(UINT *)ucResetValue = (pgpio_multi_info[WIMAX_IDX].uiGPIOMask &
-						pgpio_multi_info[WIMAX_IDX].uiGPIOCommand &
-						(~(pgpio_multi_info[WIMAX_IDX].uiGPIOValue)));
+						 pgpio_multi_info[WIMAX_IDX].uiGPIOCommand &
+						 (~(pgpio_multi_info[WIMAX_IDX].uiGPIOValue)));
 
 			if (*(UINT *) ucResetValue)
 				Status = wrmaltWithLock(Adapter, BCM_GPIO_OUTPUT_CLR_REG, (PUINT)ucResetValue, sizeof(ULONG));
@@ -636,7 +636,7 @@ static long bcm_char_ioctl(struct file *filp, UINT cmd, ULONG arg)
 			}
 
 			pgpio_multi_info[WIMAX_IDX].uiGPIOValue = (*(UINT *)ucResetValue &
-								pgpio_multi_info[WIMAX_IDX].uiGPIOMask);
+								   pgpio_multi_info[WIMAX_IDX].uiGPIOMask);
 		}
 
 		Status = copy_to_user(IoBuffer.OutputBuffer, &gpio_multi_info, IoBuffer.OutputLength);
@@ -646,7 +646,7 @@ static long bcm_char_ioctl(struct file *filp, UINT cmd, ULONG arg)
 			return -EFAULT;
 		}
 	}
-	break;
+		break;
 
 	case IOCTL_BCM_GPIO_MODE_REQUEST: {
 		UCHAR ucResetValue[4];
@@ -654,8 +654,8 @@ static long bcm_char_ioctl(struct file *filp, UINT cmd, ULONG arg)
 		PGPIO_MULTI_MODE pgpio_multi_mode = (PGPIO_MULTI_MODE)gpio_multi_mode;
 
 		if ((Adapter->IdleMode == TRUE) ||
-			(Adapter->bShutStatus == TRUE) ||
-			(Adapter->bPreparingForLowPowerMode == TRUE))
+		    (Adapter->bShutStatus == TRUE) ||
+		    (Adapter->bPreparingForLowPowerMode == TRUE))
 			return -EINVAL;
 
 		if (copy_from_user(&IoBuffer, argp, sizeof(IOCTL_BUFFER)))
@@ -690,11 +690,11 @@ static long bcm_char_ioctl(struct file *filp, UINT cmd, ULONG arg)
 		if (pgpio_multi_mode[WIMAX_IDX].uiGPIOMask) {
 			/* write all OUT's (1's) */
 			*(UINT *) ucResetValue |= (pgpio_multi_mode[WIMAX_IDX].uiGPIOMode &
-						pgpio_multi_mode[WIMAX_IDX].uiGPIOMask);
+						   pgpio_multi_mode[WIMAX_IDX].uiGPIOMask);
 
 			/* write all IN's (0's) */
 			*(UINT *) ucResetValue &= ~((~pgpio_multi_mode[WIMAX_IDX].uiGPIOMode) &
-						pgpio_multi_mode[WIMAX_IDX].uiGPIOMask);
+						    pgpio_multi_mode[WIMAX_IDX].uiGPIOMask);
 
 			/* Currently implemented return the modes of all GPIO's
 			 * else needs to bit AND with  mask
@@ -722,7 +722,7 @@ static long bcm_char_ioctl(struct file *filp, UINT cmd, ULONG arg)
 			return -EFAULT;
 		}
 	}
-	break;
+		break;
 
 	case IOCTL_MAC_ADDR_REQ:
 	case IOCTL_LINK_REQ:
@@ -753,8 +753,8 @@ static long bcm_char_ioctl(struct file *filp, UINT cmd, ULONG arg)
 
 		down(&Adapter->LowPowerModeSync);
 		Status = wait_event_interruptible_timeout(Adapter->lowpower_mode_wait_queue,
-							!Adapter->bPreparingForLowPowerMode,
-							(1 * HZ));
+							  !Adapter->bPreparingForLowPowerMode,
+							  (1 * HZ));
 		if (Status == -ERESTARTSYS)
 			goto cntrlEnd;
 
@@ -766,7 +766,7 @@ static long bcm_char_ioctl(struct file *filp, UINT cmd, ULONG arg)
 		}
 		Status = CopyBufferToControlPacket(Adapter, (PVOID)pvBuffer);
 
-cntrlEnd:
+		cntrlEnd:
 		up(&Adapter->LowPowerModeSync);
 		kfree(pvBuffer);
 		break;
@@ -842,7 +842,7 @@ cntrlEnd:
 		}
 
 		if (!psFwInfo->pvMappedFirmwareAddress ||
-			(psFwInfo->u32FirmwareLength == 0)) {
+		    (psFwInfo->u32FirmwareLength == 0)) {
 
 			pr_info("Something else is wrong %lu\n",
 				psFwInfo->u32FirmwareLength);
@@ -916,7 +916,7 @@ cntrlEnd:
 		timeout = 5*HZ;
 		Adapter->waiting_to_fw_download_done = FALSE;
 		wait_event_timeout(Adapter->ioctl_fw_dnld_wait_queue,
-				Adapter->waiting_to_fw_download_done, timeout);
+				   Adapter->waiting_to_fw_download_done, timeout);
 		Adapter->fw_download_process_pid = INVALID_PID;
 		Adapter->fw_download_done = TRUE;
 		atomic_set(&Adapter->CurrNumFreeTxDesc, 0);
@@ -973,7 +973,7 @@ cntrlEnd:
 		Status = 0;
 		for (uiLoopIndex = 0; uiLoopIndex < NO_OF_QUEUES; uiLoopIndex++) {
 			if (get_user(Adapter->PackInfo[uiLoopIndex].uiThreshold,
-					(unsigned long __user *)arg)) {
+				     (unsigned long __user *)arg)) {
 				Status = -EFAULT;
 				break;
 			}
@@ -1002,7 +1002,7 @@ cntrlEnd:
 			/* Allow All Packets */
 			bcm_dbg(Adapter, OTHERS, OSAL_DBG, ALL,
 				"IOCTL_BCM_SWITCH_TRANSFER_MODE: ETH_PACKET_TUNNELING_MODE\n");
-				Adapter->TransferMode = ETH_PACKET_TUNNELING_MODE;
+			Adapter->TransferMode = ETH_PACKET_TUNNELING_MODE;
 		} else {
 			/* Allow IP only Packets */
 			bcm_dbg(Adapter, OTHERS, OSAL_DBG, ALL,
@@ -1092,7 +1092,7 @@ cntrlEnd:
 		get_dsx_sf_data_to_application(Adapter, ulSFId, IoBuffer.OutputBuffer);
 		Status = STATUS_SUCCESS;
 	}
-	break;
+		break;
 
 	case IOCTL_BCM_GET_HOST_MIBS: {
 		PVOID temp_buff;
@@ -1141,8 +1141,8 @@ cntrlEnd:
 		PCHAR pvBuffer = NULL;
 
 		if ((Adapter->IdleMode == TRUE) ||
-			(Adapter->bShutStatus == TRUE) ||
-			(Adapter->bPreparingForLowPowerMode == TRUE)) {
+		    (Adapter->bShutStatus == TRUE) ||
+		    (Adapter->bPreparingForLowPowerMode == TRUE)) {
 
 			pr_info("Device in Idle/Shutdown Mode, Blocking Wrms\n");
 			Status = -EACCES;
@@ -1169,7 +1169,7 @@ cntrlEnd:
 		pBulkBuffer = (PBULKWRM_BUFFER)pvBuffer;
 
 		if (((ULONG)pBulkBuffer->Register & 0x0F000000) != 0x0F000000 ||
-			((ULONG)pBulkBuffer->Register & 0x3)) {
+		    ((ULONG)pBulkBuffer->Register & 0x3)) {
 			kfree(pvBuffer);
 			pr_info("WRM Done On invalid Address : %x Access Denied\n",
 				(int)pBulkBuffer->Register);
@@ -1179,11 +1179,11 @@ cntrlEnd:
 
 		uiTempVar = pBulkBuffer->Register & EEPROM_REJECT_MASK;
 		if (!((Adapter->pstargetparams->m_u32Customize)&VSG_MODE) &&
-			((uiTempVar == EEPROM_REJECT_REG_1) ||
-				(uiTempVar == EEPROM_REJECT_REG_2) ||
-				(uiTempVar == EEPROM_REJECT_REG_3) ||
-				(uiTempVar == EEPROM_REJECT_REG_4)) &&
-			(cmd == IOCTL_BCM_REGISTER_WRITE)) {
+		    ((uiTempVar == EEPROM_REJECT_REG_1) ||
+		     (uiTempVar == EEPROM_REJECT_REG_2) ||
+		     (uiTempVar == EEPROM_REJECT_REG_3) ||
+		     (uiTempVar == EEPROM_REJECT_REG_4)) &&
+		    (cmd == IOCTL_BCM_REGISTER_WRITE)) {
 
 			kfree(pvBuffer);
 			pr_info("EEPROM Access Denied, not in VSG Mode\n");
@@ -1226,7 +1226,7 @@ cntrlEnd:
 
 			if ((uiSectorSize < MIN_SECTOR_SIZE) || (uiSectorSize > MAX_SECTOR_SIZE)) {
 				if (copy_to_user(IoBuffer.OutputBuffer, &Adapter->uiSectorSize,
-							sizeof(UINT)))
+						 sizeof(UINT)))
 					return -EFAULT;
 			} else {
 				if (IsFlash2x(Adapter)) {
@@ -1247,7 +1247,7 @@ cntrlEnd:
 			Status = STATUS_FAILURE;
 		}
 	}
-	break;
+		break;
 
 	case IOCTL_BCM_SET_DEBUG:
 #ifdef DEBUG
@@ -1300,8 +1300,8 @@ cntrlEnd:
 
 		if (IsFlash2x(Adapter)) {
 			if ((Adapter->eActiveDSD != DSD0) &&
-				(Adapter->eActiveDSD != DSD1) &&
-				(Adapter->eActiveDSD != DSD2)) {
+			    (Adapter->eActiveDSD != DSD1) &&
+			    (Adapter->eActiveDSD != DSD2)) {
 
 				pr_info("No DSD is active..hence NVM Command is blocked\n");
 				return STATUS_FAILURE;
@@ -1313,8 +1313,8 @@ cntrlEnd:
 			return -EFAULT;
 
 		if (copy_from_user(&stNVMReadWrite,
-					(IOCTL_BCM_NVM_READ == cmd) ? IoBuffer.OutputBuffer : IoBuffer.InputBuffer,
-					sizeof(NVM_READWRITE)))
+				   (IOCTL_BCM_NVM_READ == cmd) ? IoBuffer.OutputBuffer : IoBuffer.InputBuffer,
+				   sizeof(NVM_READWRITE)))
 			return -EFAULT;
 
 		/*
@@ -1323,9 +1323,9 @@ cntrlEnd:
 
 		if ((stNVMReadWrite.uiOffset + stNVMReadWrite.uiNumBytes) > Adapter->uiNVMDSDSize) {
 			/*
-			pr_info("Can't allow access beyond NVM Size: 0x%x 0x%x\n",
-				stNVMReadWrite.uiOffset,
-				stNVMReadWrite.uiNumBytes);
+			  pr_info("Can't allow access beyond NVM Size: 0x%x 0x%x\n",
+			  stNVMReadWrite.uiOffset,
+			  stNVMReadWrite.uiNumBytes);
 			*/
 			return STATUS_FAILURE;
 		}
@@ -1344,8 +1344,8 @@ cntrlEnd:
 			down(&Adapter->NVMRdmWrmLock);
 
 			if ((Adapter->IdleMode == TRUE) ||
-				(Adapter->bShutStatus == TRUE) ||
-				(Adapter->bPreparingForLowPowerMode == TRUE)) {
+			    (Adapter->bShutStatus == TRUE) ||
+			    (Adapter->bPreparingForLowPowerMode == TRUE)) {
 
 				bcm_dbg(Adapter, OTHERS, OSAL_DBG, ALL,
 					"Device is in Idle/Shutdown Mode\n");
@@ -1370,8 +1370,8 @@ cntrlEnd:
 			down(&Adapter->NVMRdmWrmLock);
 
 			if ((Adapter->IdleMode == TRUE) ||
-				(Adapter->bShutStatus == TRUE) ||
-				(Adapter->bPreparingForLowPowerMode == TRUE)) {
+			    (Adapter->bShutStatus == TRUE) ||
+			    (Adapter->bPreparingForLowPowerMode == TRUE)) {
 
 				bcm_dbg(Adapter, OTHERS, OSAL_DBG, ALL,
 					"Device is in Idle/Shutdown Mode\n");
@@ -1397,7 +1397,7 @@ cntrlEnd:
 				Status = BcmFlash2xCorruptSig(Adapter, Adapter->eActiveDSD);
 				if (Status != STATUS_SUCCESS) {
 					if (((stNVMReadWrite.uiOffset + stNVMReadWrite.uiNumBytes) != Adapter->uiNVMDSDSize) ||
-						(stNVMReadWrite.uiNumBytes < SIGNATURE_SIZE)) {
+					    (stNVMReadWrite.uiNumBytes < SIGNATURE_SIZE)) {
 
 						bcm_dbg(Adapter, OTHERS, OSAL_DBG, ALL,
 							"DSD Sig is present neither in Flash nor User provided Input..\n");
@@ -1495,8 +1495,8 @@ cntrlEnd:
 		down(&Adapter->NVMRdmWrmLock);
 
 		if ((Adapter->IdleMode == TRUE) ||
-			(Adapter->bShutStatus == TRUE) ||
-			(Adapter->bPreparingForLowPowerMode == TRUE)) {
+		    (Adapter->bShutStatus == TRUE) ||
+		    (Adapter->bPreparingForLowPowerMode == TRUE)) {
 
 			bcm_dbg(Adapter, OTHERS, OSAL_DBG, ALL,
 				"Device is in Idle/Shutdown Mode\n");
@@ -1541,7 +1541,7 @@ cntrlEnd:
 		up(&Adapter->NVMRdmWrmLock);
 		kfree(pReadBuff);
 	}
-	break;
+		break;
 
 	case IOCTL_BCM_FLASH2X_SECTION_WRITE: {
 		FLASH2X_READWRITE sFlash2xWrite = {0};
@@ -1614,8 +1614,8 @@ cntrlEnd:
 		down(&Adapter->NVMRdmWrmLock);
 
 		if ((Adapter->IdleMode == TRUE) ||
-			(Adapter->bShutStatus == TRUE) ||
-			(Adapter->bPreparingForLowPowerMode == TRUE)) {
+		    (Adapter->bShutStatus == TRUE) ||
+		    (Adapter->bPreparingForLowPowerMode == TRUE)) {
 
 			bcm_dbg(Adapter, OTHERS, OSAL_DBG, ALL,
 				"Device is in Idle/Shutdown Mode\n");
@@ -1660,7 +1660,7 @@ cntrlEnd:
 		up(&Adapter->NVMRdmWrmLock);
 		kfree(pWriteBuff);
 	}
-	break;
+		break;
 
 	case IOCTL_BCM_GET_FLASH2X_SECTION_BITMAP: {
 		PFLASH2X_BITMAP psFlash2xBitMap;
@@ -1683,8 +1683,8 @@ cntrlEnd:
 		down(&Adapter->NVMRdmWrmLock);
 
 		if ((Adapter->IdleMode == TRUE) ||
-			(Adapter->bShutStatus == TRUE) ||
-			(Adapter->bPreparingForLowPowerMode == TRUE)) {
+		    (Adapter->bShutStatus == TRUE) ||
+		    (Adapter->bPreparingForLowPowerMode == TRUE)) {
 
 			bcm_dbg(Adapter, OTHERS, OSAL_DBG, ALL,
 				"Device is in Idle/Shutdown Mode\n");
@@ -1702,7 +1702,7 @@ cntrlEnd:
 
 		kfree(psFlash2xBitMap);
 	}
-	break;
+		break;
 
 	case IOCTL_BCM_SET_ACTIVE_SECTION: {
 		FLASH2X_SECTION_VAL eFlash2xSectionVal = 0;
@@ -1729,8 +1729,8 @@ cntrlEnd:
 		down(&Adapter->NVMRdmWrmLock);
 
 		if ((Adapter->IdleMode == TRUE) ||
-			(Adapter->bShutStatus == TRUE) ||
-			(Adapter->bPreparingForLowPowerMode == TRUE)) {
+		    (Adapter->bShutStatus == TRUE) ||
+		    (Adapter->bPreparingForLowPowerMode == TRUE)) {
 
 			bcm_dbg(Adapter, OTHERS, OSAL_DBG, ALL,
 				"Device is in Idle/Shutdown Mode\n");
@@ -1745,7 +1745,7 @@ cntrlEnd:
 
 		up(&Adapter->NVMRdmWrmLock);
 	}
-	break;
+		break;
 
 	case IOCTL_BCM_IDENTIFY_ACTIVE_SECTION: {
 		/* Right Now we are taking care of only DSD */
@@ -1754,7 +1754,7 @@ cntrlEnd:
 			"IOCTL_BCM_IDENTIFY_ACTIVE_SECTION called\n");
 		Status = STATUS_SUCCESS;
 	}
-	break;
+		break;
 
 	case IOCTL_BCM_COPY_SECTION: {
 		FLASH2X_COPY_SECTION sCopySectStrut = {0};
@@ -1812,8 +1812,8 @@ cntrlEnd:
 		down(&Adapter->NVMRdmWrmLock);
 
 		if ((Adapter->IdleMode == TRUE) ||
-			(Adapter->bShutStatus == TRUE) ||
-			(Adapter->bPreparingForLowPowerMode == TRUE)) {
+		    (Adapter->bShutStatus == TRUE) ||
+		    (Adapter->bPreparingForLowPowerMode == TRUE)) {
 
 			bcm_dbg(Adapter, OTHERS, OSAL_DBG, ALL,
 				"Device is in Idle/Shutdown Mode\n");
@@ -1839,7 +1839,7 @@ cntrlEnd:
 					sCopySectStrut.DstSection, sCopySectStrut.offset, sCopySectStrut.numOfBytes);
 		up(&Adapter->NVMRdmWrmLock);
 	}
-	break;
+		break;
 
 	case IOCTL_BCM_GET_FLASH_CS_INFO: {
 		Status = STATUS_SUCCESS;
@@ -1872,7 +1872,7 @@ cntrlEnd:
 				return -EFAULT;
 		}
 	}
-	break;
+		break;
 
 	case IOCTL_BCM_SELECT_DSD: {
 		UINT SectOfset = 0;
@@ -1900,8 +1900,8 @@ cntrlEnd:
 		bcm_dbg(Adapter, OTHERS, OSAL_DBG, ALL,
 			"Read Section :%d\n", eFlash2xSectionVal);
 		if ((eFlash2xSectionVal != DSD0) &&
-			(eFlash2xSectionVal != DSD1) &&
-			(eFlash2xSectionVal != DSD2)) {
+		    (eFlash2xSectionVal != DSD1) &&
+		    (eFlash2xSectionVal != DSD2)) {
 
 			pr_info("Passed section<%x> is not DSD section\n",
 				eFlash2xSectionVal);
@@ -1919,8 +1919,8 @@ cntrlEnd:
 		Adapter->ulFlashCalStart = SectOfset;
 		Adapter->eActiveDSD = eFlash2xSectionVal;
 	}
-	Status = STATUS_SUCCESS;
-	break;
+		Status = STATUS_SUCCESS;
+		break;
 
 	case IOCTL_BCM_NVM_RAW_READ: {
 		NVM_READWRITE stNVMRead;
@@ -1965,8 +1965,8 @@ cntrlEnd:
 		down(&Adapter->NVMRdmWrmLock);
 
 		if ((Adapter->IdleMode == TRUE) ||
-			(Adapter->bShutStatus == TRUE) ||
-			(Adapter->bPreparingForLowPowerMode == TRUE)) {
+		    (Adapter->bShutStatus == TRUE) ||
+		    (Adapter->bPreparingForLowPowerMode == TRUE)) {
 
 			bcm_dbg(Adapter, OTHERS, OSAL_DBG, ALL,
 				"Device is in Idle/Shutdown Mode\n");
@@ -2040,7 +2040,7 @@ cntrlEnd:
 			RxCntrlMsgBitMask);
 		pTarang->RxCntrlMsgBitMask = RxCntrlMsgBitMask;
 	}
-	break;
+		break;
 
 	case IOCTL_BCM_GET_DEVICE_DRIVER_INFO: {
 		DEVICE_DRIVER_INFO DevInfo;
@@ -2063,7 +2063,7 @@ cntrlEnd:
 		if (copy_to_user(IoBuffer.OutputBuffer, &DevInfo, sizeof(DevInfo)))
 			return -EFAULT;
 	}
-	break;
+		break;
 
 	case IOCTL_BCM_TIME_SINCE_NET_ENTRY: {
 		ST_TIME_ELAPSED stTimeElapsedSinceNetEntry = {0};
@@ -2082,7 +2082,7 @@ cntrlEnd:
 		if (copy_to_user(IoBuffer.OutputBuffer, &stTimeElapsedSinceNetEntry, sizeof(ST_TIME_ELAPSED)))
 			return -EFAULT;
 	}
-	break;
+		break;
 
 	case IOCTL_CLOSE_NOTIFICATION:
 		bcm_dbg(Adapter, OTHERS, OSAL_DBG, ALL,
@@ -2120,8 +2120,8 @@ int register_control_device_interface(PMINI_ADAPTER Adapter)
 	}
 
 	Adapter->pstCreatedClassDevice = device_create(bcm_class, NULL,
-						MKDEV(Adapter->major, 0),
-						Adapter, DEV_NAME);
+						       MKDEV(Adapter->major, 0),
+						       Adapter, DEV_NAME);
 
 	if (IS_ERR(Adapter->pstCreatedClassDevice)) {
 		pr_err("class device create failed\n");
diff --git a/drivers/staging/bcm/Bcmnet.c b/drivers/staging/bcm/Bcmnet.c
index 6cf1b47..1b02b29 100644
--- a/drivers/staging/bcm/Bcmnet.c
+++ b/drivers/staging/bcm/Bcmnet.c
@@ -45,17 +45,17 @@ static u16 bcm_select_queue(struct net_device *dev, struct sk_buff *skb)
 }
 
 /*******************************************************************
-* Function    -	bcm_transmit()
-*
-* Description - This is the main transmit function for our virtual
-*		interface(eth0). It handles the ARP packets. It
-*		clones this packet and then Queue it to a suitable
-*		Queue. Then calls the transmit_packet().
-*
-* Parameter   -	 skb - Pointer to the socket buffer structure
-*		 dev - Pointer to the virtual net device structure
-*
-*********************************************************************/
+ * Function    -	bcm_transmit()
+ *
+ * Description - This is the main transmit function for our virtual
+ *		interface(eth0). It handles the ARP packets. It
+ *		clones this packet and then Queue it to a suitable
+ *		Queue. Then calls the transmit_packet().
+ *
+ * Parameter   -	 skb - Pointer to the socket buffer structure
+ *		 dev - Pointer to the virtual net device structure
+ *
+ *********************************************************************/
 
 static netdev_tx_t bcm_transmit(struct sk_buff *skb, struct net_device *dev)
 {
@@ -98,7 +98,7 @@ static netdev_tx_t bcm_transmit(struct sk_buff *skb, struct net_device *dev)
 	}
 	return NETDEV_TX_OK;
 
- drop:
+drop:
 	dev_kfree_skb(skb);
 	return NETDEV_TX_OK;
 }
@@ -106,8 +106,8 @@ static netdev_tx_t bcm_transmit(struct sk_buff *skb, struct net_device *dev)
 
 
 /**
-@ingroup init_functions
-Register other driver entry points with the kernel
+   @ingroup init_functions
+   Register other driver entry points with the kernel
 */
 static const struct net_device_ops bcmNetDevOps = {
 	.ndo_open		= bcm_open,
diff --git a/drivers/staging/bcm/CmHost.c b/drivers/staging/bcm/CmHost.c
index 260abff..0869549 100644
--- a/drivers/staging/bcm/CmHost.c
+++ b/drivers/staging/bcm/CmHost.c
@@ -1,8 +1,8 @@
 /************************************************************
-*			CMHOST.C
-*	This file contains the routines for handling Connection
-*	Management.
-************************************************************/
+ *			CMHOST.C
+ *	This file contains the routines for handling Connection
+ *	Management.
+ ************************************************************/
 
 //#define CONN_MSG
 
@@ -19,15 +19,15 @@ typedef enum _E_CLASSIFIER_ACTION
 static ULONG GetNextTargetBufferLocation(PMINI_ADAPTER Adapter,B_UINT16 tid);
 
 /************************************************************
-* Function	  -	SearchSfid
-*
-* Description -	This routinue would search QOS queues having
-*				specified SFID as input parameter.
-*
-* Parameters  -	Adapter: Pointer to the Adapter structure
-*			   	uiSfid : Given SFID for matching
-*
-* Returns	  - Queue index for this SFID(If matched)
+ * Function	  -	SearchSfid
+ *
+ * Description -	This routinue would search QOS queues having
+ *				specified SFID as input parameter.
+ *
+ * Parameters  -	Adapter: Pointer to the Adapter structure
+ *			   	uiSfid : Given SFID for matching
+ *
+ * Returns	  - Queue index for this SFID(If matched)
 				Else Invalid Queue Index(If Not matched)
 ************************************************************/
 INT SearchSfid(PMINI_ADAPTER Adapter,UINT uiSfid)
@@ -40,15 +40,15 @@ INT SearchSfid(PMINI_ADAPTER Adapter,UINT uiSfid)
 }
 
 /***************************************************************
-* Function	  -	SearchFreeSfid
-*
-* Description -	This routinue would search Free available SFID.
-*
-* Parameter   -	Adapter: Pointer to the Adapter structure
-*
-* Returns	  - Queue index for the free SFID
-*				Else returns Invalid Index.
-****************************************************************/
+ * Function	  -	SearchFreeSfid
+ *
+ * Description -	This routinue would search Free available SFID.
+ *
+ * Parameter   -	Adapter: Pointer to the Adapter structure
+ *
+ * Returns	  - Queue index for the free SFID
+ *				Else returns Invalid Index.
+ ****************************************************************/
 static INT SearchFreeSfid(PMINI_ADAPTER Adapter)
 {
 	UINT 	uiIndex=0;
@@ -60,12 +60,12 @@ static INT SearchFreeSfid(PMINI_ADAPTER Adapter)
 }
 
 /*
-Function:				SearchClsid
-Description:			This routinue would search Classifier  having specified ClassifierID as input parameter
-Input parameters:		PMINI_ADAPTER Adapter - Adapter 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
+  Function:				SearchClsid
+  Description:			This routinue would search Classifier  having specified ClassifierID as input parameter
+  Input parameters:		PMINI_ADAPTER Adapter - Adapter 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(PMINI_ADAPTER Adapter,ULONG ulSFID,B_UINT16  uiClassifierID)
@@ -74,20 +74,20 @@ static int SearchClsid(PMINI_ADAPTER Adapter,ULONG ulSFID,B_UINT16  uiClassifier
 	for(uiClassifierIndex=0;uiClassifierIndex<MAX_CLASSIFIERS;uiClassifierIndex++)
 	{
 		if((Adapter->astClassifierTable[uiClassifierIndex].bUsed) &&
-			(Adapter->astClassifierTable[uiClassifierIndex].uiClassifierRuleIndex == uiClassifierID)&&
-			(Adapter->astClassifierTable[uiClassifierIndex].ulSFID == ulSFID))
+		   (Adapter->astClassifierTable[uiClassifierIndex].uiClassifierRuleIndex == uiClassifierID)&&
+		   (Adapter->astClassifierTable[uiClassifierIndex].ulSFID == ulSFID))
 			return uiClassifierIndex;
 	}
 	return MAX_CLASSIFIERS+1;
 }
 
 /**
-@ingroup ctrl_pkt_functions
-This routinue would search Free available Classifier entry in classifier table.
-@return free Classifier Entry index in classifier table for specified SF
+   @ingroup ctrl_pkt_functions
+   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(PMINI_ADAPTER Adapter /**Adapter Context*/
-						)
+	)
 {
 	unsigned int uiClassifierIndex = 0;
 	for(uiClassifierIndex=0;uiClassifierIndex<MAX_CLASSIFIERS;uiClassifierIndex++)
@@ -112,14 +112,14 @@ static VOID deleteSFBySfid(PMINI_ADAPTER Adapter, UINT uiSearchRuleIndex)
 
 static inline VOID
 CopyIpAddrToClassifier(S_CLASSIFIER_RULE *pstClassifierEntry ,
-			B_UINT8 u8IpAddressLen , B_UINT8 *pu8IpAddressMaskSrc ,
-			BOOLEAN bIpVersion6 , E_IPADDR_CONTEXT eIpAddrContext)
+		       B_UINT8 u8IpAddressLen , B_UINT8 *pu8IpAddressMaskSrc ,
+		       BOOLEAN bIpVersion6 , E_IPADDR_CONTEXT eIpAddrContext)
 {
 	UINT	ucLoopIndex=0;
 	UINT    nSizeOfIPAddressInBytes = IP_LENGTH_OF_ADDRESS;
 	UCHAR   *ptrClassifierIpAddress = NULL;
 	UCHAR   *ptrClassifierIpMask = NULL;
-    PMINI_ADAPTER Adapter = GET_BCM_ADAPTER(gblpnetdev);
+	PMINI_ADAPTER Adapter = GET_BCM_ADAPTER(gblpnetdev);
 
 	if(bIpVersion6)
 	{
@@ -129,7 +129,7 @@ CopyIpAddrToClassifier(S_CLASSIFIER_RULE *pstClassifierEntry ,
 	bcm_dbg(Adapter, OTHERS, CONN_MSG, ALL,
 		"Ip Address Range Length:0x%X\n", u8IpAddressLen);
 	if((bIpVersion6?(IPV6_ADDRESS_SIZEINBYTES * MAX_IP_RANGE_LENGTH * 2):
-			(TOTAL_MASKED_ADDRESS_IN_BYTES)) >= u8IpAddressLen)
+	    (TOTAL_MASKED_ADDRESS_IN_BYTES)) >= u8IpAddressLen)
 	{
 		/*
 		//checking both the mask and address togethor in Classification.
@@ -139,7 +139,7 @@ CopyIpAddrToClassifier(S_CLASSIFIER_RULE *pstClassifierEntry ,
 		if(eIpAddrContext == eDestIpAddress)
 		{
 			pstClassifierEntry->ucIPDestinationAddressLength =
-					u8IpAddressLen/(nSizeOfIPAddressInBytes * 2);
+				u8IpAddressLen/(nSizeOfIPAddressInBytes * 2);
 			if(bIpVersion6)
 			{
 				ptrClassifierIpAddress =
@@ -158,7 +158,7 @@ CopyIpAddrToClassifier(S_CLASSIFIER_RULE *pstClassifierEntry ,
 		else if(eIpAddrContext == eSrcIpAddress)
 		{
 			pstClassifierEntry->ucIPSourceAddressLength =
-					u8IpAddressLen/(nSizeOfIPAddressInBytes * 2);
+				u8IpAddressLen/(nSizeOfIPAddressInBytes * 2);
 			if(bIpVersion6)
 			{
 				ptrClassifierIpAddress =
@@ -177,19 +177,19 @@ CopyIpAddrToClassifier(S_CLASSIFIER_RULE *pstClassifierEntry ,
 		bcm_dbg(Adapter, OTHERS, CONN_MSG, ALL, "Address Length:0x%X\n",
 			pstClassifierEntry->ucIPDestinationAddressLength);
 		while((u8IpAddressLen>= nSizeOfIPAddressInBytes) &&
-				(ucLoopIndex < MAX_IP_RANGE_LENGTH))
+		      (ucLoopIndex < MAX_IP_RANGE_LENGTH))
 		{
 			memcpy(ptrClassifierIpAddress +
-				(ucLoopIndex * nSizeOfIPAddressInBytes),
-				(pu8IpAddressMaskSrc+(ucLoopIndex*nSizeOfIPAddressInBytes*2)),
-				nSizeOfIPAddressInBytes);
+			       (ucLoopIndex * nSizeOfIPAddressInBytes),
+			       (pu8IpAddressMaskSrc+(ucLoopIndex*nSizeOfIPAddressInBytes*2)),
+			       nSizeOfIPAddressInBytes);
 			if(!bIpVersion6)
 			{
 				if(eIpAddrContext == eSrcIpAddress)
 				{
 					pstClassifierEntry->stSrcIpAddress.ulIpv4Addr[ucLoopIndex]=
 						ntohl(pstClassifierEntry->stSrcIpAddress.
-								ulIpv4Addr[ucLoopIndex]);
+						      ulIpv4Addr[ucLoopIndex]);
 					bcm_dbg(Adapter, OTHERS, CONN_MSG, ALL,
 						"Src Ip Address:0x%luX\n",
 						pstClassifierEntry->stSrcIpAddress.ulIpv4Addr[ucLoopIndex]);
@@ -197,7 +197,7 @@ CopyIpAddrToClassifier(S_CLASSIFIER_RULE *pstClassifierEntry ,
 				else if(eIpAddrContext == eDestIpAddress)
 				{
 					pstClassifierEntry->stDestIpAddress.ulIpv4Addr[ucLoopIndex]=						ntohl(pstClassifierEntry->stDestIpAddress.
-								ulIpv4Addr[ucLoopIndex]);
+																		      ulIpv4Addr[ucLoopIndex]);
 					bcm_dbg(Adapter, OTHERS, CONN_MSG, ALL,
 						"Dest Ip Address:0x%luX\n",
 						pstClassifierEntry->stDestIpAddress.ulIpv4Addr[ucLoopIndex]);
@@ -207,18 +207,18 @@ CopyIpAddrToClassifier(S_CLASSIFIER_RULE *pstClassifierEntry ,
 			if(u8IpAddressLen >= nSizeOfIPAddressInBytes)
 			{
 				memcpy(ptrClassifierIpMask +
-					(ucLoopIndex * nSizeOfIPAddressInBytes),
-					(pu8IpAddressMaskSrc+nSizeOfIPAddressInBytes +
+				       (ucLoopIndex * nSizeOfIPAddressInBytes),
+				       (pu8IpAddressMaskSrc+nSizeOfIPAddressInBytes +
 					(ucLoopIndex*nSizeOfIPAddressInBytes*2)),
-					nSizeOfIPAddressInBytes);
+				       nSizeOfIPAddressInBytes);
 				if(!bIpVersion6)
 				{
 					if(eIpAddrContext == eSrcIpAddress)
 					{
 						pstClassifierEntry->stSrcIpAddress.
-											ulIpv4Mask[ucLoopIndex]=
-								ntohl(pstClassifierEntry->stSrcIpAddress.
-											ulIpv4Mask[ucLoopIndex]);
+							ulIpv4Mask[ucLoopIndex]=
+							ntohl(pstClassifierEntry->stSrcIpAddress.
+							      ulIpv4Mask[ucLoopIndex]);
 						bcm_dbg(Adapter, OTHERS, CONN_MSG, ALL,
 							"Src Ip Mask Address:0x%luX\n",
 							pstClassifierEntry->stSrcIpAddress.ulIpv4Mask[ucLoopIndex]);
@@ -226,9 +226,9 @@ CopyIpAddrToClassifier(S_CLASSIFIER_RULE *pstClassifierEntry ,
 					else if(eIpAddrContext == eDestIpAddress)
 					{
 						pstClassifierEntry->stDestIpAddress.
-										ulIpv4Mask[ucLoopIndex] =
-									ntohl(pstClassifierEntry->stDestIpAddress.
-											ulIpv4Mask[ucLoopIndex]);
+							ulIpv4Mask[ucLoopIndex] =
+							ntohl(pstClassifierEntry->stDestIpAddress.
+							      ulIpv4Mask[ucLoopIndex]);
 						bcm_dbg(Adapter, OTHERS, CONN_MSG, ALL,
 							"Dest Ip Mask Address:0x%luX\n",
 							pstClassifierEntry->stDestIpAddress.ulIpv4Mask[ucLoopIndex]);
@@ -246,22 +246,22 @@ CopyIpAddrToClassifier(S_CLASSIFIER_RULE *pstClassifierEntry ,
 		{
 			//Restore EndianNess of Struct
 			for(ucLoopIndex =0 ; ucLoopIndex < MAX_IP_RANGE_LENGTH * 4 ;
-					ucLoopIndex++)
+			    ucLoopIndex++)
 			{
 				if(eIpAddrContext == eSrcIpAddress)
 				{
 					pstClassifierEntry->stSrcIpAddress.ulIpv6Addr[ucLoopIndex]=
-							ntohl(pstClassifierEntry->stSrcIpAddress.
-							ulIpv6Addr[ucLoopIndex]);
+						ntohl(pstClassifierEntry->stSrcIpAddress.
+						      ulIpv6Addr[ucLoopIndex]);
 					pstClassifierEntry->stSrcIpAddress.ulIpv6Mask[ucLoopIndex]= 							ntohl(pstClassifierEntry->stSrcIpAddress.
-							ulIpv6Mask[ucLoopIndex]);
+																			      ulIpv6Mask[ucLoopIndex]);
 				}
 				else if(eIpAddrContext == eDestIpAddress)
 				{
 					pstClassifierEntry->stDestIpAddress.ulIpv6Addr[ucLoopIndex]= 							ntohl(pstClassifierEntry->stDestIpAddress.
-							ulIpv6Addr[ucLoopIndex]);
+																			      ulIpv6Addr[ucLoopIndex]);
 					pstClassifierEntry->stDestIpAddress.ulIpv6Mask[ucLoopIndex]= 							ntohl(pstClassifierEntry->stDestIpAddress.
-							ulIpv6Mask[ucLoopIndex]);
+																			      ulIpv6Mask[ucLoopIndex]);
 				}
 			}
 		}
@@ -271,24 +271,24 @@ CopyIpAddrToClassifier(S_CLASSIFIER_RULE *pstClassifierEntry ,
 
 void ClearTargetDSXBuffer(PMINI_ADAPTER Adapter,B_UINT16 TID,BOOLEAN bFreeAll)
 {
-    ULONG ulIndex;
+	ULONG ulIndex;
 	for(ulIndex=0; ulIndex < Adapter->ulTotalTargetBuffersAvailable; ulIndex++)
 	{
 		if(Adapter->astTargetDsxBuffer[ulIndex].valid)
 			continue;
-        if ((bFreeAll) || (Adapter->astTargetDsxBuffer[ulIndex].tid == TID)){
+		if ((bFreeAll) || (Adapter->astTargetDsxBuffer[ulIndex].tid == TID)){
 			pr_info("ClearTargetDSXBuffer: found tid %d buffer cleared %lx\n",
 				TID, Adapter->astTargetDsxBuffer[ulIndex].ulTargetDsxBuffer);
 			Adapter->astTargetDsxBuffer[ulIndex].valid=1;
 			Adapter->astTargetDsxBuffer[ulIndex].tid=0;
 			Adapter->ulFreeTargetBufferCnt++;
-      	}
+		}
 	}
 }
 
 /**
-@ingroup ctrl_pkt_functions
-copy classifier rule into the specified SF index
+   @ingroup ctrl_pkt_functions
+   copy classifier rule into the specified SF index
 */
 static inline VOID CopyClassifierRuleToSF(PMINI_ADAPTER Adapter,stConvergenceSLTypes  *psfCSType,UINT uiSearchRuleIndex,UINT nClassifierIndex)
 {
@@ -300,7 +300,7 @@ static inline VOID CopyClassifierRuleToSF(PMINI_ADAPTER Adapter,stConvergenceSLT
 
 
 	if(Adapter->PackInfo[uiSearchRuleIndex].usVCID_Value == 0 ||
-		nClassifierIndex > (MAX_CLASSIFIERS-1))
+	   nClassifierIndex > (MAX_CLASSIFIERS-1))
 		return;
 
 
@@ -316,7 +316,7 @@ static inline VOID CopyClassifierRuleToSF(PMINI_ADAPTER Adapter,stConvergenceSLT
 	{
 		//Store if Ipv6
 		pstClassifierEntry->bIpv6Protocol =
-		(Adapter->PackInfo[uiSearchRuleIndex].ucIpVersion == IPV6)?TRUE:FALSE;
+			(Adapter->PackInfo[uiSearchRuleIndex].ucIpVersion == IPV6)?TRUE:FALSE;
 
 		//Destinaiton Port
 		pstClassifierEntry->ucDestPortRangeLength=psfCSType->cCPacketClassificationRule.u8ProtocolDestPortRangeLength/4;
@@ -347,20 +347,20 @@ static inline VOID CopyClassifierRuleToSF(PMINI_ADAPTER Adapter,stConvergenceSLT
 			"Source Port Range Length:0x%X\n",
 			psfCSType->cCPacketClassificationRule.u8ProtocolSourcePortRangeLength);
 		if(MAX_PORT_RANGE >=
-		psfCSType->cCPacketClassificationRule.u8ProtocolSourcePortRangeLength)
+		   psfCSType->cCPacketClassificationRule.u8ProtocolSourcePortRangeLength)
 		{
 			pstClassifierEntry->ucSrcPortRangeLength =
 				psfCSType->cCPacketClassificationRule.
-						u8ProtocolSourcePortRangeLength/4;
+				u8ProtocolSourcePortRangeLength/4;
 			for(ucLoopIndex = 0; ucLoopIndex <
-				(pstClassifierEntry->ucSrcPortRangeLength); ucLoopIndex++)
+				    (pstClassifierEntry->ucSrcPortRangeLength); ucLoopIndex++)
 			{
 				pstClassifierEntry->usSrcPortRangeLo[ucLoopIndex] =
-						*((PUSHORT)(psfCSType->cCPacketClassificationRule.
-							u8ProtocolSourcePortRange+ucLoopIndex));
+					*((PUSHORT)(psfCSType->cCPacketClassificationRule.
+						    u8ProtocolSourcePortRange+ucLoopIndex));
 				pstClassifierEntry->usSrcPortRangeHi[ucLoopIndex] =
-						*((PUSHORT)(psfCSType->cCPacketClassificationRule.
-							u8ProtocolSourcePortRange+2+ucLoopIndex));
+					*((PUSHORT)(psfCSType->cCPacketClassificationRule.
+						    u8ProtocolSourcePortRange+2+ucLoopIndex));
 				pstClassifierEntry->usSrcPortRangeLo[ucLoopIndex] =
 					ntohs(pstClassifierEntry->usSrcPortRangeLo[ucLoopIndex]);
 				bcm_dbg(Adapter, OTHERS, CONN_MSG, ALL,
@@ -374,20 +374,20 @@ static inline VOID CopyClassifierRuleToSF(PMINI_ADAPTER Adapter,stConvergenceSLT
 			"Ip Destination Parameters :\n");
 
 		CopyIpAddrToClassifier(pstClassifierEntry,
-		   psfCSType->cCPacketClassificationRule.u8IPDestinationAddressLength,
-		   psfCSType->cCPacketClassificationRule.u8IPDestinationAddress,
-		   (Adapter->PackInfo[uiSearchRuleIndex].ucIpVersion == IPV6)?
-			TRUE:FALSE, eDestIpAddress);
+				       psfCSType->cCPacketClassificationRule.u8IPDestinationAddressLength,
+				       psfCSType->cCPacketClassificationRule.u8IPDestinationAddress,
+				       (Adapter->PackInfo[uiSearchRuleIndex].ucIpVersion == IPV6)?
+				       TRUE:FALSE, eDestIpAddress);
 
 		//Source Ip Address and Mask
 		bcm_dbg(Adapter, OTHERS, CONN_MSG, ALL,
 			"Ip Source Parameters :\n");
 
 		CopyIpAddrToClassifier(pstClassifierEntry,
-	   	psfCSType->cCPacketClassificationRule.u8IPMaskedSourceAddressLength,
-		psfCSType->cCPacketClassificationRule.u8IPMaskedSourceAddress,
-		(Adapter->PackInfo[uiSearchRuleIndex].ucIpVersion == IPV6)?TRUE:FALSE,
-		eSrcIpAddress);
+				       psfCSType->cCPacketClassificationRule.u8IPMaskedSourceAddressLength,
+				       psfCSType->cCPacketClassificationRule.u8IPMaskedSourceAddress,
+				       (Adapter->PackInfo[uiSearchRuleIndex].ucIpVersion == IPV6)?TRUE:FALSE,
+				       eSrcIpAddress);
 
 		//TOS
 		bcm_dbg(Adapter, OTHERS, CONN_MSG, ALL, "TOS Length:0x%X\n",
@@ -424,7 +424,7 @@ static inline VOID CopyClassifierRuleToSF(PMINI_ADAPTER Adapter,stConvergenceSLT
 		pstClassifierEntry->ucDirection =
 			Adapter->PackInfo[uiSearchRuleIndex].ucDirection;
 		pstClassifierEntry->uiClassifierRuleIndex = ntohs(psfCSType->
-				cCPacketClassificationRule.u16PacketClassificationRuleIndex);
+								  cCPacketClassificationRule.u16PacketClassificationRuleIndex);
 		pstClassifierEntry->usVCID_Value =
 			Adapter->PackInfo[uiSearchRuleIndex].usVCID_Value;
 		pstClassifierEntry->ulSFID =
@@ -459,7 +459,7 @@ static inline VOID CopyClassifierRuleToSF(PMINI_ADAPTER Adapter,stConvergenceSLT
 
 
 /**
-@ingroup ctrl_pkt_functions
+   @ingroup ctrl_pkt_functions
 */
 static inline VOID DeleteClassifierRuleFromSF(PMINI_ADAPTER Adapter,UINT uiSearchRuleIndex,UINT nClassifierIndex)
 {
@@ -489,14 +489,14 @@ static inline VOID DeleteClassifierRuleFromSF(PMINI_ADAPTER Adapter,UINT uiSearc
 
 		//Delete the PHS Rule for this classifier
 		PhsDeleteClassifierRule(
-				&Adapter->stBCMPhsContext,
-				usVCID,
-				u16PacketClassificationRuleIndex);
+			&Adapter->stBCMPhsContext,
+			usVCID,
+			u16PacketClassificationRuleIndex);
 	}
 }
 
 /**
-@ingroup ctrl_pkt_functions
+   @ingroup ctrl_pkt_functions
 */
 VOID DeleteAllClassifiersForSF(PMINI_ADAPTER Adapter,UINT uiSearchRuleIndex)
 {
@@ -527,23 +527,23 @@ VOID DeleteAllClassifiersForSF(PMINI_ADAPTER Adapter,UINT uiSearchRuleIndex)
 
 	//Delete All Phs Rules Associated with this SF
 	PhsDeleteSFRules(
-			&Adapter->stBCMPhsContext,
-			ulVCID);
+		&Adapter->stBCMPhsContext,
+		ulVCID);
 
 }
 
 
 /**
-This routinue  copies the Connection Management
-related data into the Adapter structure.
-@ingroup ctrl_pkt_functions
+   This routinue  copies the Connection Management
+   related data into the Adapter structure.
+   @ingroup ctrl_pkt_functions
 */
 
 static VOID CopyToAdapter( register PMINI_ADAPTER Adapter,		/**<Pointer to the Adapter structure*/
-					register pstServiceFlowParamSI psfLocalSet,	/**<Pointer to the ServiceFlowParamSI structure*/
-					register UINT uiSearchRuleIndex,			/**<Index of Queue, to which this data belongs*/
-					register UCHAR ucDsxType,
-					stLocalSFAddIndicationAlt *pstAddIndication)
+			   register pstServiceFlowParamSI psfLocalSet,	/**<Pointer to the ServiceFlowParamSI structure*/
+			   register UINT uiSearchRuleIndex,			/**<Index of Queue, to which this data belongs*/
+			   register UCHAR ucDsxType,
+			   stLocalSFAddIndicationAlt *pstAddIndication)
 {
 	//UCHAR   ucProtocolLength=0;
 	ULONG	ulSFID;
@@ -578,47 +578,47 @@ static VOID CopyToAdapter( register PMINI_ADAPTER Adapter,		/**<Pointer to the A
 		psfLocalSet->u8CSSpecification);
 	switch(psfLocalSet->u8CSSpecification)
 	{
-		case eCSPacketIPV4:
-		{
-			Adapter->PackInfo[uiSearchRuleIndex].bIPCSSupport = IPV4_CS;
-			break;
-		}
-		case eCSPacketIPV6:
-		{
-			Adapter->PackInfo[uiSearchRuleIndex].bIPCSSupport = IPV6_CS;
-			break;
-		}
+	case eCSPacketIPV4:
+	{
+		Adapter->PackInfo[uiSearchRuleIndex].bIPCSSupport = IPV4_CS;
+		break;
+	}
+	case eCSPacketIPV6:
+	{
+		Adapter->PackInfo[uiSearchRuleIndex].bIPCSSupport = IPV6_CS;
+		break;
+	}
 
-		case eCS802_3PacketEthernet:
-		case eCS802_1QPacketVLAN:
-		{
-			Adapter->PackInfo[uiSearchRuleIndex].bEthCSSupport = ETH_CS_802_3;
-			break;
-		}
+	case eCS802_3PacketEthernet:
+	case eCS802_1QPacketVLAN:
+	{
+		Adapter->PackInfo[uiSearchRuleIndex].bEthCSSupport = ETH_CS_802_3;
+		break;
+	}
 
-		case eCSPacketIPV4Over802_1QVLAN:
-		case eCSPacketIPV4Over802_3Ethernet:
-		{
-			Adapter->PackInfo[uiSearchRuleIndex].bIPCSSupport = IPV4_CS;
-			Adapter->PackInfo[uiSearchRuleIndex].bEthCSSupport = ETH_CS_802_3;
-			break;
-		}
+	case eCSPacketIPV4Over802_1QVLAN:
+	case eCSPacketIPV4Over802_3Ethernet:
+	{
+		Adapter->PackInfo[uiSearchRuleIndex].bIPCSSupport = IPV4_CS;
+		Adapter->PackInfo[uiSearchRuleIndex].bEthCSSupport = ETH_CS_802_3;
+		break;
+	}
 
-		case eCSPacketIPV6Over802_1QVLAN:
-		case eCSPacketIPV6Over802_3Ethernet:
-		{
-			Adapter->PackInfo[uiSearchRuleIndex].bIPCSSupport = IPV6_CS;
-			Adapter->PackInfo[uiSearchRuleIndex].bEthCSSupport = ETH_CS_802_3;
-			break;
-		}
+	case eCSPacketIPV6Over802_1QVLAN:
+	case eCSPacketIPV6Over802_3Ethernet:
+	{
+		Adapter->PackInfo[uiSearchRuleIndex].bIPCSSupport = IPV6_CS;
+		Adapter->PackInfo[uiSearchRuleIndex].bEthCSSupport = ETH_CS_802_3;
+		break;
+	}
 
-		default:
-		{
-			bcm_dbg(Adapter, OTHERS, CONN_MSG, ALL,
-				"Error in value of CS Classification.. setting default to IP CS\n");
-			Adapter->PackInfo[uiSearchRuleIndex].bIPCSSupport = IPV4_CS;
-			break;
-		}
+	default:
+	{
+		bcm_dbg(Adapter, OTHERS, CONN_MSG, ALL,
+			"Error in value of CS Classification.. setting default to IP CS\n");
+		Adapter->PackInfo[uiSearchRuleIndex].bIPCSSupport = IPV4_CS;
+		break;
+	}
 	}
 
 	bcm_dbg(Adapter, OTHERS, CONN_MSG, ALL,
@@ -643,17 +643,17 @@ static VOID CopyToAdapter( register PMINI_ADAPTER Adapter,		/**<Pointer to the A
 		Adapter->PackInfo[uiSearchRuleIndex].bEthCSSupport = 0;
 
 	if(psfLocalSet->u8ServiceClassNameLength > 0 &&
-			psfLocalSet->u8ServiceClassNameLength < 32)
+	   psfLocalSet->u8ServiceClassNameLength < 32)
 	{
 		memcpy(Adapter->PackInfo[uiSearchRuleIndex].ucServiceClassName,
-			psfLocalSet->u8ServiceClassName,
-			psfLocalSet->u8ServiceClassNameLength);
+		       psfLocalSet->u8ServiceClassName,
+		       psfLocalSet->u8ServiceClassNameLength);
 	}
 	Adapter->PackInfo[uiSearchRuleIndex].u8QueueType =
-			psfLocalSet->u8ServiceFlowSchedulingType;
+		psfLocalSet->u8ServiceFlowSchedulingType;
 
 	if(Adapter->PackInfo[uiSearchRuleIndex].u8QueueType==BE &&
-			Adapter->PackInfo[uiSearchRuleIndex].ucDirection)
+	   Adapter->PackInfo[uiSearchRuleIndex].ucDirection)
 	{
 		Adapter->usBestEffortQueueIndex=uiSearchRuleIndex;
 	}
@@ -749,8 +749,8 @@ static VOID CopyToAdapter( register PMINI_ADAPTER Adapter,		/**<Pointer to the A
 
 		case eReplaceClassifier:
 		{
-				//Get the Classifier Index From Classifier table for this SF and replace existing  Classifier
-				//with the new classifier Contained in this message
+			//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,u16PacketClassificationRuleIndex);
 			if(nClassifierIndex > MAX_CLASSIFIERS)
 			{
@@ -766,8 +766,8 @@ static VOID CopyToAdapter( register PMINI_ADAPTER Adapter,		/**<Pointer to the A
 
 		case eDeleteClassifier:
 		{
-				//Get the Classifier Index From Classifier table for this SF and replace existing  Classifier
-				//with the new classifier Contained in this message
+			//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,u16PacketClassificationRuleIndex);
 			if(nClassifierIndex > MAX_CLASSIFIERS)
 			{
@@ -854,8 +854,8 @@ static VOID CopyToAdapter( register PMINI_ADAPTER Adapter,		/**<Pointer to the A
 					for(uiClassifierIndex=0;uiClassifierIndex<MAX_CLASSIFIERS;uiClassifierIndex++)
 					{
 						if((Adapter->astClassifierTable[uiClassifierIndex].bUsed) &&
-							(Adapter->astClassifierTable[uiClassifierIndex].ulSFID == Adapter->PackInfo[uiSearchRuleIndex].ulSFID) &&
-							(Adapter->astClassifierTable[uiClassifierIndex].u8AssociatedPHSI == psfCSType->cPhsRule.u8PHSI))
+						   (Adapter->astClassifierTable[uiClassifierIndex].ulSFID == Adapter->PackInfo[uiSearchRuleIndex].ulSFID) &&
+						   (Adapter->astClassifierTable[uiClassifierIndex].u8AssociatedPHSI == psfCSType->cPhsRule.u8PHSI))
 						{
 							bcm_dbg(Adapter, OTHERS, CONN_MSG, ALL,
 								"Adding  PHS Rule For  Classifier : 0x%x cPhsRule.u8PHSI : 0x%x\n",
@@ -901,33 +901,33 @@ static VOID CopyToAdapter( register PMINI_ADAPTER Adapter,		/**<Pointer to the A
 				{
 					//Error PHS Rule specified in signaling could not be applied to any classifier
 
-						//Copy the PHS Rule
-						sPhsRule.u8PHSI =  psfCSType->cPhsRule.u8PHSI;
-						sPhsRule.u8PHSFLength =  psfCSType->cPhsRule.u8PHSFLength;
-						sPhsRule.u8PHSMLength = psfCSType->cPhsRule.u8PHSMLength;
-						sPhsRule.u8PHSS = psfCSType->cPhsRule.u8PHSS;
-						sPhsRule.u8PHSV = psfCSType->cPhsRule.u8PHSV;
-						memcpy(sPhsRule.u8PHSF,psfCSType->cPhsRule.u8PHSF,MAX_PHS_LENGTHS);
-						memcpy(sPhsRule.u8PHSM,psfCSType->cPhsRule.u8PHSM,MAX_PHS_LENGTHS);
-						sPhsRule.u8RefCnt = 0;
-						sPhsRule.bUnclassifiedPHSRule = TRUE;
-						sPhsRule.PHSModifiedBytes = 0;
-						sPhsRule.PHSModifiedNumPackets = 0;
-						sPhsRule.PHSErrorNumPackets = 0;
-						//Store The PHS Rule for this classifier
-
-						/*
-							Passing the argument u8PHSI instead of clsid. Because for DL with no classifier rule,
-							clsid will be zero hence we can't have multiple PHS rules for the same SF.
-							To support multiple PHS rule, passing u8PHSI.
-						*/
-
-						PhsUpdateClassifierRule(
-							&Adapter->stBCMPhsContext,
-							uVCID,
-							sPhsRule.u8PHSI,
-							&sPhsRule,
-							sPhsRule.u8PHSI);
+					//Copy the PHS Rule
+					sPhsRule.u8PHSI =  psfCSType->cPhsRule.u8PHSI;
+					sPhsRule.u8PHSFLength =  psfCSType->cPhsRule.u8PHSFLength;
+					sPhsRule.u8PHSMLength = psfCSType->cPhsRule.u8PHSMLength;
+					sPhsRule.u8PHSS = psfCSType->cPhsRule.u8PHSS;
+					sPhsRule.u8PHSV = psfCSType->cPhsRule.u8PHSV;
+					memcpy(sPhsRule.u8PHSF,psfCSType->cPhsRule.u8PHSF,MAX_PHS_LENGTHS);
+					memcpy(sPhsRule.u8PHSM,psfCSType->cPhsRule.u8PHSM,MAX_PHS_LENGTHS);
+					sPhsRule.u8RefCnt = 0;
+					sPhsRule.bUnclassifiedPHSRule = TRUE;
+					sPhsRule.PHSModifiedBytes = 0;
+					sPhsRule.PHSModifiedNumPackets = 0;
+					sPhsRule.PHSErrorNumPackets = 0;
+					//Store The PHS Rule for this classifier
+
+					/*
+					  Passing the argument u8PHSI instead of clsid. Because for DL with no classifier rule,
+					  clsid will be zero hence we can't have multiple PHS rules for the same SF.
+					  To support multiple PHS rule, passing u8PHSI.
+					*/
+
+					PhsUpdateClassifierRule(
+						&Adapter->stBCMPhsContext,
+						uVCID,
+						sPhsRule.u8PHSI,
+						&sPhsRule,
+						sPhsRule.u8PHSI);
 
 				}
 
@@ -945,7 +945,7 @@ static VOID CopyToAdapter( register PMINI_ADAPTER Adapter,		/**<Pointer to the A
 
 	}
 	else if (ntohl(psfLocalSet->u32MaxSustainedTrafficRate) >
-			WIMAX_MAX_ALLOWED_RATE)
+		 WIMAX_MAX_ALLOWED_RATE)
 	{
 		//Too large Allowed Rate specified. Limiting to Wi Max  Allowed rate
 		Adapter->PackInfo[uiSearchRuleIndex].uiMaxAllowedRate =
@@ -964,35 +964,35 @@ static VOID CopyToAdapter( register PMINI_ADAPTER Adapter,		/**<Pointer to the A
 
 
 	if(( Adapter->PackInfo[uiSearchRuleIndex].u8QueueType == ERTPS ||
-			Adapter->PackInfo[uiSearchRuleIndex].u8QueueType == UGS ) )
-			UGIValue = ntohs(psfLocalSet->u16UnsolicitedGrantInterval);
+	     Adapter->PackInfo[uiSearchRuleIndex].u8QueueType == UGS ) )
+		UGIValue = ntohs(psfLocalSet->u16UnsolicitedGrantInterval);
 
 	if(UGIValue == 0)
 		UGIValue = DEFAULT_UG_INTERVAL;
 
 	/*
-	For UGI based connections...
-	DEFAULT_UGI_FACTOR*UGIInterval worth of data is the max token count at host...
-	The extra amount of token is to ensure that a large amount of jitter won't have loss in throughput...
-	In case of non-UGI based connection, 200 frames worth of data is the max token count at host...
+	  For UGI based connections...
+	  DEFAULT_UGI_FACTOR*UGIInterval worth of data is the max token count at host...
+	  The extra amount of token is to ensure that a large amount of jitter won't have loss in throughput...
+	  In case of non-UGI based connection, 200 frames worth of data is the max token count at host...
 	*/
 
 	Adapter->PackInfo[uiSearchRuleIndex].uiMaxBucketSize =
-        (DEFAULT_UGI_FACTOR*Adapter->PackInfo[uiSearchRuleIndex].uiMaxAllowedRate*UGIValue)/1000;
+		(DEFAULT_UGI_FACTOR*Adapter->PackInfo[uiSearchRuleIndex].uiMaxAllowedRate*UGIValue)/1000;
 
 	if(Adapter->PackInfo[uiSearchRuleIndex].uiMaxBucketSize < WIMAX_MAX_MTU*8)
 	{
 		UINT UGIFactor = 0;
 		/* Special Handling to ensure the biggest size of packet can go out from host to FW as follows:
-		1. Any packet from Host to FW can go out in different packet size.
-		2. So in case the Bucket count is smaller than MTU, the packets of size (Size > TokenCount), will get dropped.
-		3. We can allow packets of MaxSize from Host->FW that can go out from FW in multiple SDUs by fragmentation at Wimax Layer
+		   1. Any packet from Host to FW can go out in different packet size.
+		   2. So in case the Bucket count is smaller than MTU, the packets of size (Size > TokenCount), will get dropped.
+		   3. We can allow packets of MaxSize from Host->FW that can go out from FW in multiple SDUs by fragmentation at Wimax Layer
 		*/
 		UGIFactor = (Adapter->PackInfo[uiSearchRuleIndex].uiMaxLatency/UGIValue + 1);
 
 		if(UGIFactor > DEFAULT_UGI_FACTOR)
-    		Adapter->PackInfo[uiSearchRuleIndex].uiMaxBucketSize =
-    		(UGIFactor*Adapter->PackInfo[uiSearchRuleIndex].uiMaxAllowedRate*UGIValue)/1000;
+			Adapter->PackInfo[uiSearchRuleIndex].uiMaxBucketSize =
+				(UGIFactor*Adapter->PackInfo[uiSearchRuleIndex].uiMaxAllowedRate*UGIValue)/1000;
 
 		if(Adapter->PackInfo[uiSearchRuleIndex].uiMaxBucketSize > WIMAX_MAX_MTU*8)
 			Adapter->PackInfo[uiSearchRuleIndex].uiMaxBucketSize = WIMAX_MAX_MTU*8;
@@ -1012,8 +1012,8 @@ static VOID CopyToAdapter( register PMINI_ADAPTER Adapter,		/**<Pointer to the A
 
 	//store header suppression enabled flag per SF
 	Adapter->PackInfo[uiSearchRuleIndex].bHeaderSuppressionEnabled =
-			!(psfLocalSet->u8RequesttransmissionPolicy &
-				MASK_DISABLE_HEADER_SUPPRESSION);
+		!(psfLocalSet->u8RequesttransmissionPolicy &
+		  MASK_DISABLE_HEADER_SUPPRESSION);
 
 	kfree(Adapter->PackInfo[uiSearchRuleIndex].pstSFIndication);
 	Adapter->PackInfo[uiSearchRuleIndex].pstSFIndication = pstAddIndication;
@@ -1022,7 +1022,7 @@ static VOID CopyToAdapter( register PMINI_ADAPTER Adapter,		/**<Pointer to the A
 	SortPackInfo(Adapter);
 
 	/* Re Sort the Classifier Rules table and re - arrange
-		according to Classifier Rule Priority */
+	   according to Classifier Rule Priority */
 	SortClassifiers(Adapter);
 
 	DumpPhsRules(&Adapter->stBCMPhsContext);
@@ -1032,23 +1032,23 @@ static VOID CopyToAdapter( register PMINI_ADAPTER Adapter,		/**<Pointer to the A
 
 
 /***********************************************************************
-* Function	  -	DumpCmControlPacket
-*
-* Description -	This routinue Dumps the Contents of the AddIndication
-*				Structure in the Connection Management Control Packet
-*
-* Parameter   -	pvBuffer: Pointer to the buffer containing the
-*				AddIndication data.
-*
-* Returns	  - None
-*************************************************************************/
+ * Function	  -	DumpCmControlPacket
+ *
+ * Description -	This routinue Dumps the Contents of the AddIndication
+ *				Structure in the Connection Management Control Packet
+ *
+ * Parameter   -	pvBuffer: Pointer to the buffer containing the
+ *				AddIndication data.
+ *
+ * Returns	  - None
+ *************************************************************************/
 static VOID DumpCmControlPacket(PVOID pvBuffer)
 {
 	UINT 					uiLoopIndex;
 	UINT                    nIndex;
 	stLocalSFAddIndicationAlt  *pstAddIndication;
 	UINT                    nCurClassifierCnt;
-    PMINI_ADAPTER Adapter = GET_BCM_ADAPTER(gblpnetdev);
+	PMINI_ADAPTER Adapter = GET_BCM_ADAPTER(gblpnetdev);
 
 	pstAddIndication = (stLocalSFAddIndicationAlt *)pvBuffer;
 	bcm_dbg(Adapter, OTHERS, DUMP_CONTROL, ALL, "======>\n");
@@ -1895,7 +1895,7 @@ static inline ULONG RestoreSFParam(PMINI_ADAPTER Adapter, ULONG ulAddrSFParamSet
 
 static ULONG StoreSFParam(PMINI_ADAPTER Adapter,PUCHAR pucSrcBuffer,ULONG  ulAddrSFParamSet)
 {
-    UINT	nBytesToWrite = sizeof(stServiceFlowParamSI);
+	UINT	nBytesToWrite = sizeof(stServiceFlowParamSI);
 	int ret = 0;
 
 	if(ulAddrSFParamSet == 0 || NULL == pucSrcBuffer)
@@ -1923,9 +1923,9 @@ ULONG StoreCmControlResponseMessage(PMINI_ADAPTER Adapter,PVOID pvBuffer,UINT *p
 	pstAddIndicationAlt = (stLocalSFAddIndicationAlt *)(pvBuffer);
 
 	/*
-	*	In case of DSD Req By MS, we should immediately delete this SF so that
-	*	we can stop the further classifying the pkt for this SF.
-	*/
+	 *	In case of DSD Req By MS, we should immediately delete this SF so that
+	 *	we can stop the further classifying the pkt for this SF.
+	 */
 	if(pstAddIndicationAlt->u8Type == DSD_REQ)
 	{
 		pstDeletionRequest = (stLocalSFDeleteRequest *)pvBuffer;
@@ -1956,12 +1956,12 @@ ULONG StoreCmControlResponseMessage(PMINI_ADAPTER Adapter,PVOID pvBuffer,UINT *p
 
 	/* AUTHORIZED SET */
 	pstAddIndication->psfAuthorizedSet = (stServiceFlowParamSI *)
-			GetNextTargetBufferLocation(Adapter, pstAddIndicationAlt->u16TID);
+		GetNextTargetBufferLocation(Adapter, pstAddIndicationAlt->u16TID);
 	if(!pstAddIndication->psfAuthorizedSet)
 		return 0;
 
 	if(StoreSFParam(Adapter,(PUCHAR)&pstAddIndicationAlt->sfAuthorizedSet,
-				(ULONG)pstAddIndication->psfAuthorizedSet)!= 1)
+			(ULONG)pstAddIndication->psfAuthorizedSet)!= 1)
 		return 0;
 
 	/* this can't possibly be right */
@@ -2031,8 +2031,8 @@ static inline stLocalSFAddIndicationAlt
 
 	bcm_dbg(Adapter, OTHERS, CONN_MSG, ALL, "=====>\n");
 	if ((pstAddIndication->u8Type == DSD_REQ) ||
-		(pstAddIndication->u8Type == DSD_RSP) ||
-		(pstAddIndication->u8Type == DSD_ACK))
+	    (pstAddIndication->u8Type == DSD_RSP) ||
+	    (pstAddIndication->u8Type == DSD_ACK))
 	{
 		return (stLocalSFAddIndicationAlt *)pvBuffer;
 	}
@@ -2153,7 +2153,7 @@ ULONG SetUpTargetDsxBuffers(PMINI_ADAPTER Adapter)
 		DSX_MESSAGE_EXCHANGE_BUFFER);
 
  	Status = rdmalt(Adapter, DSX_MESSAGE_EXCHANGE_BUFFER,
-					(PUINT)&ulTargetDsxBuffersBase, sizeof(UINT));
+			(PUINT)&ulTargetDsxBuffersBase, sizeof(UINT));
 	if(Status < 0)
 	{
 		bcm_dbg(Adapter, OTHERS, CONN_MSG, ALL, "RDM failed!!\n");
@@ -2198,19 +2198,19 @@ static ULONG GetNextTargetBufferLocation(PMINI_ADAPTER Adapter,B_UINT16 tid)
 	ULONG  ulTargetDsxBufferIndexToUse,ulMaxTry;
 
 	if((Adapter->ulTotalTargetBuffersAvailable == 0)||
-			(Adapter->ulFreeTargetBufferCnt == 0))
+	   (Adapter->ulFreeTargetBufferCnt == 0))
 	{
-        ClearTargetDSXBuffer(Adapter,tid,FALSE);
+		ClearTargetDSXBuffer(Adapter,tid,FALSE);
 		return 0;
 	}
 
-    ulTargetDsxBufferIndexToUse = Adapter->ulCurrentTargetBuffer;
-    ulMaxTry = Adapter->ulTotalTargetBuffersAvailable;
+	ulTargetDsxBufferIndexToUse = Adapter->ulCurrentTargetBuffer;
+	ulMaxTry = Adapter->ulTotalTargetBuffersAvailable;
 	while((ulMaxTry)&&(Adapter->astTargetDsxBuffer[ulTargetDsxBufferIndexToUse].valid != 1))
 	{
-		 ulTargetDsxBufferIndexToUse = (ulTargetDsxBufferIndexToUse+1)%
-					Adapter->ulTotalTargetBuffersAvailable;
-		 ulMaxTry--;
+		ulTargetDsxBufferIndexToUse = (ulTargetDsxBufferIndexToUse+1)%
+			Adapter->ulTotalTargetBuffersAvailable;
+		ulMaxTry--;
 	}
 
 	if(ulMaxTry==0)
@@ -2257,14 +2257,14 @@ INT FreeAdapterDsxBuffer(PMINI_ADAPTER Adapter)
 
 }
 /**
-@ingroup ctrl_pkt_functions
-This routinue would process the Control responses
-for the Connection Management.
-@return	  - Queue index for the free SFID else returns Invalid Index.
+   @ingroup ctrl_pkt_functions
+   This routinue would process the Control responses
+   for the Connection Management.
+   @return	  - Queue index for the free SFID else returns Invalid Index.
 */
 BOOLEAN CmControlResponseMessage(PMINI_ADAPTER Adapter,  /**<Pointer to the Adapter structure*/
-											PVOID pvBuffer /**Starting Address of the Buffer, that contains the AddIndication Data*/
-											)
+				 PVOID pvBuffer /**Starting Address of the Buffer, that contains the AddIndication Data*/
+	)
 {
 	stServiceFlowParamSI			*psfLocalSet=NULL;
 	stLocalSFAddIndicationAlt 	 	*pstAddIndication = NULL;
@@ -2275,7 +2275,7 @@ BOOLEAN CmControlResponseMessage(PMINI_ADAPTER Adapter,  /**<Pointer to the Adap
 	//read out the rest of the service flow param structure
 	*/
 	if((pstAddIndication = RestoreCmControlResponseMessage(Adapter,pvBuffer))
-			== NULL)
+	   == NULL)
 	{
 		ClearTargetDSXBuffer(Adapter,((stLocalSFAddIndication *)pvBuffer)->u16TID, FALSE);
 		pr_info("Error in restoring Service Flow param structure from DSx message\n");
@@ -2293,287 +2293,287 @@ BOOLEAN CmControlResponseMessage(PMINI_ADAPTER Adapter,  /**<Pointer to the Adap
 	pr_info("### TID RECEIVED %d\n", pstAddIndication->u16TID);
 	switch(pstAddIndication->u8Type)
 	{
-		case DSA_REQ:
-		{
-			pLeader->PLength = sizeof(stLocalSFAddIndicationAlt);
-			bcm_dbg(Adapter, OTHERS, CONN_MSG, ALL,
-				"Sending DSA Response....\n");
-			bcm_dbg(Adapter, OTHERS, CONN_MSG, ALL,
-				"SENDING DSA RESPONSE TO MAC %d\n",
-				pLeader->PLength);
-			*((stLocalSFAddIndicationAlt*)&(Adapter->caDsxReqResp[LEADER_SIZE]))
-						= *pstAddIndication;
-			((stLocalSFAddIndicationAlt*)&(Adapter->caDsxReqResp[LEADER_SIZE]))->u8Type = DSA_RSP;
-
-			bcm_dbg(Adapter, OTHERS, CONN_MSG, ALL, "VCID = %x\n",
-				ntohs(pstAddIndication->u16VCID));
-			CopyBufferToControlPacket(Adapter,(PVOID)Adapter->caDsxReqResp);
-			kfree(pstAddIndication);
-		}
-		break;
-		case DSA_RSP:
-		{
-			pLeader->PLength = sizeof(stLocalSFAddIndicationAlt);
-			bcm_dbg(Adapter, OTHERS, CONN_MSG, ALL,
-				"SENDING DSA ACK TO MAC %d\n",
-				pLeader->PLength);
-			*((stLocalSFAddIndicationAlt*)&(Adapter->caDsxReqResp[LEADER_SIZE]))
-						= *pstAddIndication;
-			((stLocalSFAddIndicationAlt*)&(Adapter->caDsxReqResp[LEADER_SIZE]))->u8Type = DSA_ACK;
-
-		}//no break here..we should go down.
-		case DSA_ACK:
-		{
-			UINT uiSearchRuleIndex=0;
+	case DSA_REQ:
+	{
+		pLeader->PLength = sizeof(stLocalSFAddIndicationAlt);
+		bcm_dbg(Adapter, OTHERS, CONN_MSG, ALL,
+			"Sending DSA Response....\n");
+		bcm_dbg(Adapter, OTHERS, CONN_MSG, ALL,
+			"SENDING DSA RESPONSE TO MAC %d\n",
+			pLeader->PLength);
+		*((stLocalSFAddIndicationAlt*)&(Adapter->caDsxReqResp[LEADER_SIZE]))
+			= *pstAddIndication;
+		((stLocalSFAddIndicationAlt*)&(Adapter->caDsxReqResp[LEADER_SIZE]))->u8Type = DSA_RSP;
+
+		bcm_dbg(Adapter, OTHERS, CONN_MSG, ALL, "VCID = %x\n",
+			ntohs(pstAddIndication->u16VCID));
+		CopyBufferToControlPacket(Adapter,(PVOID)Adapter->caDsxReqResp);
+		kfree(pstAddIndication);
+	}
+	break;
+	case DSA_RSP:
+	{
+		pLeader->PLength = sizeof(stLocalSFAddIndicationAlt);
+		bcm_dbg(Adapter, OTHERS, CONN_MSG, ALL,
+			"SENDING DSA ACK TO MAC %d\n",
+			pLeader->PLength);
+		*((stLocalSFAddIndicationAlt*)&(Adapter->caDsxReqResp[LEADER_SIZE]))
+			= *pstAddIndication;
+		((stLocalSFAddIndicationAlt*)&(Adapter->caDsxReqResp[LEADER_SIZE]))->u8Type = DSA_ACK;
+
+	}//no break here..we should go down.
+	case DSA_ACK:
+	{
+		UINT uiSearchRuleIndex=0;
 
-			bcm_dbg(Adapter, OTHERS, CONN_MSG, ALL, "VCID:0x%X\n",
-				ntohs(pstAddIndication->u16VCID));
-			uiSearchRuleIndex = SearchFreeSfid(Adapter);
-			bcm_dbg(Adapter, OTHERS, CONN_MSG, ALL,
-				"uiSearchRuleIndex:0x%X\n",
-				uiSearchRuleIndex);
+		bcm_dbg(Adapter, OTHERS, CONN_MSG, ALL, "VCID:0x%X\n",
+			ntohs(pstAddIndication->u16VCID));
+		uiSearchRuleIndex = SearchFreeSfid(Adapter);
+		bcm_dbg(Adapter, OTHERS, CONN_MSG, ALL,
+			"uiSearchRuleIndex:0x%X\n",
+			uiSearchRuleIndex);
+		bcm_dbg(Adapter, OTHERS, CONN_MSG, ALL,
+			"Direction:0x%X\n",
+			pstAddIndication->u8Direction);
+		if((uiSearchRuleIndex< NO_OF_QUEUES) )
+		{
+			Adapter->PackInfo[uiSearchRuleIndex].ucDirection =
+				pstAddIndication->u8Direction;
 			bcm_dbg(Adapter, OTHERS, CONN_MSG, ALL,
-				"Direction:0x%X\n",
-				pstAddIndication->u8Direction);
-			if((uiSearchRuleIndex< NO_OF_QUEUES) )
+				"bValid:0x%X\n",
+				pstAddIndication->sfActiveSet.bValid);
+			if(pstAddIndication->sfActiveSet.bValid==TRUE)
 			{
-				Adapter->PackInfo[uiSearchRuleIndex].ucDirection =
-					pstAddIndication->u8Direction;
-				bcm_dbg(Adapter, OTHERS, CONN_MSG, ALL,
-					"bValid:0x%X\n",
-					pstAddIndication->sfActiveSet.bValid);
-				if(pstAddIndication->sfActiveSet.bValid==TRUE)
-				{
-					Adapter->PackInfo[uiSearchRuleIndex].bActiveSet=TRUE;
-				}
-				if(pstAddIndication->sfAuthorizedSet.bValid==TRUE)
-				{
-					Adapter->PackInfo[uiSearchRuleIndex].bAuthorizedSet=TRUE;
-				}
-				if(pstAddIndication->sfAdmittedSet.bValid==TRUE)
-				{
-					Adapter->PackInfo[uiSearchRuleIndex].bAdmittedSet=TRUE;
-				}
-				if(FALSE == pstAddIndication->sfActiveSet.bValid)
-				{
-					Adapter->PackInfo[uiSearchRuleIndex].bActive = FALSE;
-					Adapter->PackInfo[uiSearchRuleIndex].bActivateRequestSent = FALSE;
-					if(pstAddIndication->sfAdmittedSet.bValid)
-					{
-						psfLocalSet = &pstAddIndication->sfAdmittedSet;
-					}
-					else if(pstAddIndication->sfAuthorizedSet.bValid)
-					{
-						psfLocalSet = &pstAddIndication->sfAuthorizedSet;
-					}
-				}
-				else
+				Adapter->PackInfo[uiSearchRuleIndex].bActiveSet=TRUE;
+			}
+			if(pstAddIndication->sfAuthorizedSet.bValid==TRUE)
+			{
+				Adapter->PackInfo[uiSearchRuleIndex].bAuthorizedSet=TRUE;
+			}
+			if(pstAddIndication->sfAdmittedSet.bValid==TRUE)
+			{
+				Adapter->PackInfo[uiSearchRuleIndex].bAdmittedSet=TRUE;
+			}
+			if(FALSE == pstAddIndication->sfActiveSet.bValid)
+			{
+				Adapter->PackInfo[uiSearchRuleIndex].bActive = FALSE;
+				Adapter->PackInfo[uiSearchRuleIndex].bActivateRequestSent = FALSE;
+				if(pstAddIndication->sfAdmittedSet.bValid)
 				{
-					psfLocalSet = &pstAddIndication->sfActiveSet;
-					Adapter->PackInfo[uiSearchRuleIndex].bActive=TRUE;
+					psfLocalSet = &pstAddIndication->sfAdmittedSet;
 				}
-
-				if(!psfLocalSet)
+				else if(pstAddIndication->sfAuthorizedSet.bValid)
 				{
-					pr_info("No set is valid\n");
-					Adapter->PackInfo[uiSearchRuleIndex].bActive=FALSE;
-                    Adapter->PackInfo[uiSearchRuleIndex].bValid=FALSE;
-					Adapter->PackInfo[uiSearchRuleIndex].usVCID_Value=0;
-					kfree(pstAddIndication);
+					psfLocalSet = &pstAddIndication->sfAuthorizedSet;
 				}
+			}
+			else
+			{
+				psfLocalSet = &pstAddIndication->sfActiveSet;
+				Adapter->PackInfo[uiSearchRuleIndex].bActive=TRUE;
+			}
 
-				else if(psfLocalSet->bValid && (pstAddIndication->u8CC == 0))
-				{
-					bcm_dbg(Adapter, OTHERS, CONN_MSG, ALL,
-						"DSA ACK\n");
-					Adapter->PackInfo[uiSearchRuleIndex].usVCID_Value =
-						ntohs(pstAddIndication->u16VCID);
-					Adapter->PackInfo[uiSearchRuleIndex].usCID =
-						ntohs(pstAddIndication->u16CID);
+			if(!psfLocalSet)
+			{
+				pr_info("No set is valid\n");
+				Adapter->PackInfo[uiSearchRuleIndex].bActive=FALSE;
+				Adapter->PackInfo[uiSearchRuleIndex].bValid=FALSE;
+				Adapter->PackInfo[uiSearchRuleIndex].usVCID_Value=0;
+				kfree(pstAddIndication);
+			}
 
-					if(UPLINK_DIR == pstAddIndication->u8Direction)
-						atomic_set(&Adapter->PackInfo[uiSearchRuleIndex].uiPerSFTxResourceCount, DEFAULT_PERSFCOUNT);
-					CopyToAdapter(Adapter,psfLocalSet,uiSearchRuleIndex,
-								DSA_ACK, pstAddIndication);
-					// don't free pstAddIndication
-
-					/* Inside CopyToAdapter, Sorting of all the SFs take place.
-					    Hence any access to the newly added SF through uiSearchRuleIndex is invalid.
-					    SHOULD BE STRICTLY AVOIDED.
-					*/
+			else if(psfLocalSet->bValid && (pstAddIndication->u8CC == 0))
+			{
+				bcm_dbg(Adapter, OTHERS, CONN_MSG, ALL,
+					"DSA ACK\n");
+				Adapter->PackInfo[uiSearchRuleIndex].usVCID_Value =
+					ntohs(pstAddIndication->u16VCID);
+				Adapter->PackInfo[uiSearchRuleIndex].usCID =
+					ntohs(pstAddIndication->u16CID);
+
+				if(UPLINK_DIR == pstAddIndication->u8Direction)
+					atomic_set(&Adapter->PackInfo[uiSearchRuleIndex].uiPerSFTxResourceCount, DEFAULT_PERSFCOUNT);
+				CopyToAdapter(Adapter,psfLocalSet,uiSearchRuleIndex,
+					      DSA_ACK, pstAddIndication);
+				// don't free pstAddIndication
+
+				/* Inside CopyToAdapter, Sorting of all the SFs take place.
+				   Hence any access to the newly added SF through uiSearchRuleIndex is invalid.
+				   SHOULD BE STRICTLY AVOIDED.
+				*/
 //					*(PULONG)(((PUCHAR)pvBuffer)+1)=psfLocalSet->u32SFID;
-					memcpy((((PUCHAR)pvBuffer)+1), &psfLocalSet->u32SFID, 4);
+				memcpy((((PUCHAR)pvBuffer)+1), &psfLocalSet->u32SFID, 4);
 
-					if(pstAddIndication->sfActiveSet.bValid == TRUE)
+				if(pstAddIndication->sfActiveSet.bValid == TRUE)
+				{
+					if(UPLINK_DIR == pstAddIndication->u8Direction)
 					{
-						if(UPLINK_DIR == pstAddIndication->u8Direction)
+						if(!Adapter->LinkUpStatus)
 						{
-							if(!Adapter->LinkUpStatus)
-							{
-								netif_carrier_on(Adapter->dev);
-								netif_start_queue(Adapter->dev);
-								Adapter->LinkUpStatus = 1;
-								if (netif_msg_link(Adapter))
-									pr_info("%s: link up\n", Adapter->dev->name);
-								atomic_set(&Adapter->TxPktAvail, 1);
-								wake_up(&Adapter->tx_packet_wait_queue);
-								Adapter->liTimeSinceLastNetEntry = get_seconds();
-							}
+							netif_carrier_on(Adapter->dev);
+							netif_start_queue(Adapter->dev);
+							Adapter->LinkUpStatus = 1;
+							if (netif_msg_link(Adapter))
+								pr_info("%s: link up\n", Adapter->dev->name);
+							atomic_set(&Adapter->TxPktAvail, 1);
+							wake_up(&Adapter->tx_packet_wait_queue);
+							Adapter->liTimeSinceLastNetEntry = get_seconds();
 						}
 					}
 				}
-
-				else
-				{
-					Adapter->PackInfo[uiSearchRuleIndex].bActive=FALSE;
-                    Adapter->PackInfo[uiSearchRuleIndex].bValid=FALSE;
-					Adapter->PackInfo[uiSearchRuleIndex].usVCID_Value=0;
-					kfree(pstAddIndication);
-				}
 			}
+
 			else
 			{
-				pr_info("DSA ACK did not get valid SFID\n");
+				Adapter->PackInfo[uiSearchRuleIndex].bActive=FALSE;
+				Adapter->PackInfo[uiSearchRuleIndex].bValid=FALSE;
+				Adapter->PackInfo[uiSearchRuleIndex].usVCID_Value=0;
 				kfree(pstAddIndication);
-				return FALSE;
 			}
 		}
-		break;
-		case DSC_REQ:
+		else
 		{
-			pLeader->PLength = sizeof(stLocalSFChangeIndicationAlt);
-			pstChangeIndication	= (stLocalSFChangeIndicationAlt*)pstAddIndication;
-			bcm_dbg(Adapter, OTHERS, CONN_MSG, ALL,
-				"SENDING DSC RESPONSE TO MAC %d\n",
-				pLeader->PLength);
-
-			*((stLocalSFChangeIndicationAlt*)&(Adapter->caDsxReqResp[LEADER_SIZE])) = *pstChangeIndication;
-			((stLocalSFChangeIndicationAlt*)&(Adapter->caDsxReqResp[LEADER_SIZE]))->u8Type = DSC_RSP;
-
-			CopyBufferToControlPacket(Adapter,(PVOID)Adapter->caDsxReqResp);
+			pr_info("DSA ACK did not get valid SFID\n");
 			kfree(pstAddIndication);
+			return FALSE;
 		}
-		break;
-		case DSC_RSP:
+	}
+	break;
+	case DSC_REQ:
+	{
+		pLeader->PLength = sizeof(stLocalSFChangeIndicationAlt);
+		pstChangeIndication	= (stLocalSFChangeIndicationAlt*)pstAddIndication;
+		bcm_dbg(Adapter, OTHERS, CONN_MSG, ALL,
+			"SENDING DSC RESPONSE TO MAC %d\n",
+			pLeader->PLength);
+
+		*((stLocalSFChangeIndicationAlt*)&(Adapter->caDsxReqResp[LEADER_SIZE])) = *pstChangeIndication;
+		((stLocalSFChangeIndicationAlt*)&(Adapter->caDsxReqResp[LEADER_SIZE]))->u8Type = DSC_RSP;
+
+		CopyBufferToControlPacket(Adapter,(PVOID)Adapter->caDsxReqResp);
+		kfree(pstAddIndication);
+	}
+	break;
+	case DSC_RSP:
+	{
+		pLeader->PLength = sizeof(stLocalSFChangeIndicationAlt);
+		pstChangeIndication	= (stLocalSFChangeIndicationAlt*)pstAddIndication;
+		bcm_dbg(Adapter, OTHERS, CONN_MSG, ALL,
+			"SENDING DSC ACK TO MAC %d\n",
+			pLeader->PLength);
+		*((stLocalSFChangeIndicationAlt*)&(Adapter->caDsxReqResp[LEADER_SIZE])) = *pstChangeIndication;
+		((stLocalSFChangeIndicationAlt*)&(Adapter->caDsxReqResp[LEADER_SIZE]))->u8Type = DSC_ACK;
+	}
+	case DSC_ACK:
+	{
+		UINT uiSearchRuleIndex=0;
+
+		pstChangeIndication = (stLocalSFChangeIndicationAlt *)pstAddIndication;
+		uiSearchRuleIndex=SearchSfid(Adapter,ntohl(pstChangeIndication->sfActiveSet.u32SFID));
+		if(uiSearchRuleIndex > NO_OF_QUEUES-1)
 		{
-			pLeader->PLength = sizeof(stLocalSFChangeIndicationAlt);
-			pstChangeIndication	= (stLocalSFChangeIndicationAlt*)pstAddIndication;
-			bcm_dbg(Adapter, OTHERS, CONN_MSG, ALL,
-				"SENDING DSC ACK TO MAC %d\n",
-				pLeader->PLength);
-			*((stLocalSFChangeIndicationAlt*)&(Adapter->caDsxReqResp[LEADER_SIZE])) = *pstChangeIndication;
-			((stLocalSFChangeIndicationAlt*)&(Adapter->caDsxReqResp[LEADER_SIZE]))->u8Type = DSC_ACK;
+			pr_info("SF doesn't exist for which DSC_ACK is received\n");
 		}
-		case DSC_ACK:
+		if((uiSearchRuleIndex < NO_OF_QUEUES))
 		{
-			UINT uiSearchRuleIndex=0;
-
-			pstChangeIndication = (stLocalSFChangeIndicationAlt *)pstAddIndication;
-			uiSearchRuleIndex=SearchSfid(Adapter,ntohl(pstChangeIndication->sfActiveSet.u32SFID));
-			if(uiSearchRuleIndex > NO_OF_QUEUES-1)
+			Adapter->PackInfo[uiSearchRuleIndex].ucDirection = pstChangeIndication->u8Direction;
+			if(pstChangeIndication->sfActiveSet.bValid==TRUE)
 			{
-				pr_info("SF doesn't exist for which DSC_ACK is received\n");
+				Adapter->PackInfo[uiSearchRuleIndex].bActiveSet=TRUE;
 			}
-			if((uiSearchRuleIndex < NO_OF_QUEUES))
+			if(pstChangeIndication->sfAuthorizedSet.bValid==TRUE)
 			{
-				Adapter->PackInfo[uiSearchRuleIndex].ucDirection = pstChangeIndication->u8Direction;
-				if(pstChangeIndication->sfActiveSet.bValid==TRUE)
-				{
-					Adapter->PackInfo[uiSearchRuleIndex].bActiveSet=TRUE;
-				}
-				if(pstChangeIndication->sfAuthorizedSet.bValid==TRUE)
-				{
-					Adapter->PackInfo[uiSearchRuleIndex].bAuthorizedSet=TRUE;
-				}
-				if(pstChangeIndication->sfAdmittedSet.bValid==TRUE)
-				{
-					Adapter->PackInfo[uiSearchRuleIndex].bAdmittedSet=TRUE;
-				}
-
-				if(FALSE==pstChangeIndication->sfActiveSet.bValid)
-				{
-					Adapter->PackInfo[uiSearchRuleIndex].bActive = FALSE;
-					Adapter->PackInfo[uiSearchRuleIndex].bActivateRequestSent = FALSE;
-					if(pstChangeIndication->sfAdmittedSet.bValid)
-					{
-						psfLocalSet = &pstChangeIndication->sfAdmittedSet;
-					}
-					else if(pstChangeIndication->sfAuthorizedSet.bValid)
-					{
-						psfLocalSet = &pstChangeIndication->sfAuthorizedSet;
-					}
-				}
+				Adapter->PackInfo[uiSearchRuleIndex].bAuthorizedSet=TRUE;
+			}
+			if(pstChangeIndication->sfAdmittedSet.bValid==TRUE)
+			{
+				Adapter->PackInfo[uiSearchRuleIndex].bAdmittedSet=TRUE;
+			}
 
-				else
-				{
-					psfLocalSet = &pstChangeIndication->sfActiveSet;
-					Adapter->PackInfo[uiSearchRuleIndex].bActive=TRUE;
-				}
-				if(psfLocalSet->bValid && (pstChangeIndication->u8CC == 0))
+			if(FALSE==pstChangeIndication->sfActiveSet.bValid)
+			{
+				Adapter->PackInfo[uiSearchRuleIndex].bActive = FALSE;
+				Adapter->PackInfo[uiSearchRuleIndex].bActivateRequestSent = FALSE;
+				if(pstChangeIndication->sfAdmittedSet.bValid)
 				{
-					Adapter->PackInfo[uiSearchRuleIndex].usVCID_Value =
-						ntohs(pstChangeIndication->u16VCID);
-					pr_info("CC field is %d bvalid = %d\n",
-						pstChangeIndication->u8CC,
-						psfLocalSet->bValid);
-					pr_info("VCID= %d\n",
-						ntohs(pstChangeIndication->u16VCID));
-					Adapter->PackInfo[uiSearchRuleIndex].usCID =
-						ntohs(pstChangeIndication->u16CID);
-					CopyToAdapter(Adapter,psfLocalSet,uiSearchRuleIndex,
-								DSC_ACK, pstAddIndication);
-
-					*(PULONG)(((PUCHAR)pvBuffer)+1)=psfLocalSet->u32SFID;
+					psfLocalSet = &pstChangeIndication->sfAdmittedSet;
 				}
-				else if(pstChangeIndication->u8CC == 6)
+				else if(pstChangeIndication->sfAuthorizedSet.bValid)
 				{
-					deleteSFBySfid(Adapter,uiSearchRuleIndex);
-					kfree(pstAddIndication);
+					psfLocalSet = &pstChangeIndication->sfAuthorizedSet;
 				}
 			}
+
 			else
 			{
-				pr_info("DSC ACK did not get valid SFID\n");
+				psfLocalSet = &pstChangeIndication->sfActiveSet;
+				Adapter->PackInfo[uiSearchRuleIndex].bActive=TRUE;
+			}
+			if(psfLocalSet->bValid && (pstChangeIndication->u8CC == 0))
+			{
+				Adapter->PackInfo[uiSearchRuleIndex].usVCID_Value =
+					ntohs(pstChangeIndication->u16VCID);
+				pr_info("CC field is %d bvalid = %d\n",
+					pstChangeIndication->u8CC,
+					psfLocalSet->bValid);
+				pr_info("VCID= %d\n",
+					ntohs(pstChangeIndication->u16VCID));
+				Adapter->PackInfo[uiSearchRuleIndex].usCID =
+					ntohs(pstChangeIndication->u16CID);
+				CopyToAdapter(Adapter,psfLocalSet,uiSearchRuleIndex,
+					      DSC_ACK, pstAddIndication);
+
+				*(PULONG)(((PUCHAR)pvBuffer)+1)=psfLocalSet->u32SFID;
+			}
+			else if(pstChangeIndication->u8CC == 6)
+			{
+				deleteSFBySfid(Adapter,uiSearchRuleIndex);
 				kfree(pstAddIndication);
-				return FALSE;
 			}
 		}
-		break;
-		case DSD_REQ:
+		else
 		{
-			UINT uiSearchRuleIndex;
-			ULONG ulSFID;
-
-			pLeader->PLength = sizeof(stLocalSFDeleteIndication);
-			*((stLocalSFDeleteIndication*)&(Adapter->caDsxReqResp[LEADER_SIZE])) = *((stLocalSFDeleteIndication*)pstAddIndication);
+			pr_info("DSC ACK did not get valid SFID\n");
+			kfree(pstAddIndication);
+			return FALSE;
+		}
+	}
+	break;
+	case DSD_REQ:
+	{
+		UINT uiSearchRuleIndex;
+		ULONG ulSFID;
 
-			ulSFID = ntohl(((stLocalSFDeleteIndication*)pstAddIndication)->u32SFID);
-			uiSearchRuleIndex=SearchSfid(Adapter,ulSFID);
-			bcm_dbg(Adapter, OTHERS, CONN_MSG, ALL,
-				"DSD - Removing connection %x\n",
-				uiSearchRuleIndex);
+		pLeader->PLength = sizeof(stLocalSFDeleteIndication);
+		*((stLocalSFDeleteIndication*)&(Adapter->caDsxReqResp[LEADER_SIZE])) = *((stLocalSFDeleteIndication*)pstAddIndication);
 
-			if(uiSearchRuleIndex < NO_OF_QUEUES)
-			{
-				//Delete All Classifiers Associated with this SFID
-				deleteSFBySfid(Adapter,uiSearchRuleIndex);
-				Adapter->u32TotalDSD++;
-			}
+		ulSFID = ntohl(((stLocalSFDeleteIndication*)pstAddIndication)->u32SFID);
+		uiSearchRuleIndex=SearchSfid(Adapter,ulSFID);
+		bcm_dbg(Adapter, OTHERS, CONN_MSG, ALL,
+			"DSD - Removing connection %x\n",
+			uiSearchRuleIndex);
 
-			bcm_dbg(Adapter, OTHERS, CONN_MSG, ALL,
-				"SENDING DSD RESPONSE TO MAC\n");
-			((stLocalSFDeleteIndication*)&(Adapter->caDsxReqResp[LEADER_SIZE]))->u8Type = DSD_RSP;
-			CopyBufferToControlPacket(Adapter,(PVOID)Adapter->caDsxReqResp);
-		}
-		case DSD_RSP:
+		if(uiSearchRuleIndex < NO_OF_QUEUES)
 		{
-			//Do nothing as SF has already got Deleted
+			//Delete All Classifiers Associated with this SFID
+			deleteSFBySfid(Adapter,uiSearchRuleIndex);
+			Adapter->u32TotalDSD++;
 		}
-		break;
+
+		bcm_dbg(Adapter, OTHERS, CONN_MSG, ALL,
+			"SENDING DSD RESPONSE TO MAC\n");
+		((stLocalSFDeleteIndication*)&(Adapter->caDsxReqResp[LEADER_SIZE]))->u8Type = DSD_RSP;
+		CopyBufferToControlPacket(Adapter,(PVOID)Adapter->caDsxReqResp);
+	}
+	case DSD_RSP:
+	{
+		//Do nothing as SF has already got Deleted
+	}
+	break;
 	case DSD_ACK:
 		bcm_dbg(Adapter, OTHERS, CONN_MSG, ALL,
 			"DSD ACK Rcd, let App handle it\n");
-			break;
+		break;
 	default:
 		kfree(pstAddIndication);
 		return FALSE ;
@@ -2595,7 +2595,7 @@ int get_dsx_sf_data_to_application(PMINI_ADAPTER Adapter, UINT uiSFId, void __us
 	bcm_dbg(Adapter, OTHERS, CONN_MSG, ALL, "status =%d\n", status);
 	psSfInfo=&Adapter->PackInfo[status];
 	if(psSfInfo->pstSFIndication && copy_to_user(user_buffer,
-		psSfInfo->pstSFIndication, sizeof(stLocalSFAddIndicationAlt)))
+						     psSfInfo->pstSFIndication, sizeof(stLocalSFAddIndicationAlt)))
 	{
 		pr_info("copy to user failed SFID %d, present in queue !!!\n",
 			uiSFId);
diff --git a/drivers/staging/bcm/CmHost.h b/drivers/staging/bcm/CmHost.h
index 8f68976..8ce0838 100644
--- a/drivers/staging/bcm/CmHost.h
+++ b/drivers/staging/bcm/CmHost.h
@@ -29,33 +29,33 @@ typedef struct stLocalSFAddRequestAlt{
 	B_UINT8      u8Direction;
 
 	B_UINT16                        u16TID;
-   /// \brief 16bitCID
-    B_UINT16                        u16CID;
-    /// \brief 16bitVCID
-    B_UINT16                        u16VCID;
+	/// \brief 16bitCID
+	B_UINT16                        u16CID;
+	/// \brief 16bitVCID
+	B_UINT16                        u16VCID;
 
 
 	/// \brief structure ParameterSet
-    stServiceFlowParamSI              sfParameterSet;
+	stServiceFlowParamSI              sfParameterSet;
 
-    //USE_MEMORY_MANAGER();
+	//USE_MEMORY_MANAGER();
 }stLocalSFAddRequestAlt;
 
 /// \brief structure stLocalSFAddIndication
 typedef struct stLocalSFAddIndicationAlt{
-    B_UINT8                         u8Type;
+	B_UINT8                         u8Type;
 	B_UINT8      u8Direction;
 	B_UINT16                         u16TID;
-    /// \brief 16bitCID
-    B_UINT16                        u16CID;
-    /// \brief 16bitVCID
-    B_UINT16                        u16VCID;
+	/// \brief 16bitCID
+	B_UINT16                        u16CID;
+	/// \brief 16bitVCID
+	B_UINT16                        u16VCID;
 	/// \brief structure AuthorizedSet
-    stServiceFlowParamSI              sfAuthorizedSet;
-    /// \brief structure AdmittedSet
-    stServiceFlowParamSI              sfAdmittedSet;
+	stServiceFlowParamSI              sfAuthorizedSet;
+	/// \brief structure AdmittedSet
+	stServiceFlowParamSI              sfAdmittedSet;
 	/// \brief structure ActiveSet
-    stServiceFlowParamSI              sfActiveSet;
+	stServiceFlowParamSI              sfActiveSet;
 
 	B_UINT8 						u8CC;	/**<  Confirmation Code*/
 	B_UINT8 						u8Padd; 	/**<  8-bit Padding */
@@ -68,39 +68,39 @@ typedef struct stLocalSFAddConfirmationAlt{
 	B_UINT8                     u8Type;
 	B_UINT8      				u8Direction;
 	B_UINT16					u16TID;
-    /// \brief 16bitCID
-    B_UINT16                        u16CID;
-    /// \brief 16bitVCID
-    B_UINT16                        u16VCID;
-    /// \brief structure AuthorizedSet
-    stServiceFlowParamSI              sfAuthorizedSet;
-    /// \brief structure AdmittedSet
-    stServiceFlowParamSI              sfAdmittedSet;
-    /// \brief structure ActiveSet
-    stServiceFlowParamSI              sfActiveSet;
+	/// \brief 16bitCID
+	B_UINT16                        u16CID;
+	/// \brief 16bitVCID
+	B_UINT16                        u16VCID;
+	/// \brief structure AuthorizedSet
+	stServiceFlowParamSI              sfAuthorizedSet;
+	/// \brief structure AdmittedSet
+	stServiceFlowParamSI              sfAdmittedSet;
+	/// \brief structure ActiveSet
+	stServiceFlowParamSI              sfActiveSet;
 }stLocalSFAddConfirmationAlt;
 
 
 /// \brief structure stLocalSFChangeRequest
 typedef struct stLocalSFChangeRequestAlt{
-    B_UINT8                         u8Type;
+	B_UINT8                         u8Type;
 	B_UINT8      u8Direction;
 	B_UINT16					u16TID;
-    /// \brief 16bitCID
-    B_UINT16                        u16CID;
-    /// \brief 16bitVCID
-    B_UINT16                        u16VCID;
+	/// \brief 16bitCID
+	B_UINT16                        u16CID;
+	/// \brief 16bitVCID
+	B_UINT16                        u16VCID;
 	/*
 	//Pointer location at which following Service Flow param Structure can be read
 	//from the target. We get only the address location and we need to read out the
 	//entire SF param structure at the given location on target
 	*/
-    /// \brief structure AuthorizedSet
-    stServiceFlowParamSI              sfAuthorizedSet;
-    /// \brief structure AdmittedSet
-    stServiceFlowParamSI              sfAdmittedSet;
-    /// \brief structure ParameterSet
-    stServiceFlowParamSI              sfActiveSet;
+	/// \brief structure AuthorizedSet
+	stServiceFlowParamSI              sfAuthorizedSet;
+	/// \brief structure AdmittedSet
+	stServiceFlowParamSI              sfAdmittedSet;
+	/// \brief structure ParameterSet
+	stServiceFlowParamSI              sfActiveSet;
 
 	B_UINT8 						u8CC;	/**<  Confirmation Code*/
 	B_UINT8 						u8Padd; 	/**<  8-bit Padding */
@@ -113,34 +113,34 @@ typedef struct stLocalSFChangeConfirmationAlt{
 	B_UINT8                         u8Type;
 	B_UINT8      					u8Direction;
 	B_UINT16						u16TID;
-    /// \brief 16bitCID
-    B_UINT16                        u16CID;
-    /// \brief 16bitVCID
-    B_UINT16                        u16VCID;
-    /// \brief structure AuthorizedSet
-    stServiceFlowParamSI              sfAuthorizedSet;
-    /// \brief structure AdmittedSet
-    stServiceFlowParamSI              sfAdmittedSet;
-    /// \brief structure ActiveSet
-    stServiceFlowParamSI              sfActiveSet;
+	/// \brief 16bitCID
+	B_UINT16                        u16CID;
+	/// \brief 16bitVCID
+	B_UINT16                        u16VCID;
+	/// \brief structure AuthorizedSet
+	stServiceFlowParamSI              sfAuthorizedSet;
+	/// \brief structure AdmittedSet
+	stServiceFlowParamSI              sfAdmittedSet;
+	/// \brief structure ActiveSet
+	stServiceFlowParamSI              sfActiveSet;
 
 }stLocalSFChangeConfirmationAlt;
 
 /// \brief structure stLocalSFChangeIndication
 typedef struct stLocalSFChangeIndicationAlt{
 	B_UINT8                         u8Type;
-		B_UINT8      u8Direction;
+	B_UINT8      u8Direction;
 	B_UINT16						u16TID;
-    /// \brief 16bitCID
-    B_UINT16                        u16CID;
-    /// \brief 16bitVCID
-    B_UINT16                        u16VCID;
-    /// \brief structure AuthorizedSet
-    stServiceFlowParamSI              sfAuthorizedSet;
-    /// \brief structure AdmittedSet
-    stServiceFlowParamSI              sfAdmittedSet;
-    /// \brief structure ActiveSet
-    stServiceFlowParamSI              sfActiveSet;
+	/// \brief 16bitCID
+	B_UINT16                        u16CID;
+	/// \brief 16bitVCID
+	B_UINT16                        u16VCID;
+	/// \brief structure AuthorizedSet
+	stServiceFlowParamSI              sfAuthorizedSet;
+	/// \brief structure AdmittedSet
+	stServiceFlowParamSI              sfAdmittedSet;
+	/// \brief structure ActiveSet
+	stServiceFlowParamSI              sfActiveSet;
 
 	B_UINT8 						u8CC;	/**<  Confirmation Code*/
 	B_UINT8 						u8Padd; 	/**<  8-bit Padding */
diff --git a/drivers/staging/bcm/DDRInit.c b/drivers/staging/bcm/DDRInit.c
index 26ec2b1..0d04643 100644
--- a/drivers/staging/bcm/DDRInit.c
+++ b/drivers/staging/bcm/DDRInit.c
@@ -5,529 +5,529 @@
 #define DDR_DUMP_INTERNAL_DEVICE_MEMORY 0xBFC02B00
 #define MIPS_CLOCK_REG 	0x0f000820
 
-    //DDR INIT-133Mhz
+//DDR INIT-133Mhz
 #define T3_SKIP_CLOCK_PROGRAM_DUMP_133MHZ 12  //index for 0x0F007000
 static DDR_SET_NODE asT3_DDRSetting133MHz[]= {//      # DPLL Clock Setting
-                                        {0x0F000800,0x00007212},
-                                        {0x0f000820,0x07F13FFF},
-                                        {0x0f000810,0x00000F95},
-                                        {0x0f000860,0x00000000},
-                                        {0x0f000880,0x000003DD},
-                                        // Changed source for X-bar and MIPS clock to APLL
-                                        {0x0f000840,0x0FFF1B00},
-                                        {0x0f000870,0x00000002},
-                                        {0x0F00a044,0x1fffffff},
-                                        {0x0F00a040,0x1f000000},
-                                        {0x0F00a084,0x1Cffffff},
-                                        {0x0F00a080,0x1C000000},
-                                        {0x0F00a04C,0x0000000C},
-                                        //Memcontroller Default values
-                                        {0x0F007000,0x00010001},
-                                        {0x0F007004,0x01010100},
-                                        {0x0F007008,0x01000001},
-                                        {0x0F00700c,0x00000000},
-                                        {0x0F007010,0x01000000},
-                                        {0x0F007014,0x01000100},
-                                        {0x0F007018,0x01000000},
-                                        {0x0F00701c,0x01020001},// POP - 0x00020001 Normal 0x01020001
-                                        {0x0F007020,0x04030107}, //Normal - 0x04030107 POP - 0x05030107
-                                        {0x0F007024,0x02000007},
-                                        {0x0F007028,0x02020202},
-                                        {0x0F00702c,0x0206060a},//ROB- 0x0205050a,//0x0206060a
-                                        {0x0F007030,0x05000000},
-                                        {0x0F007034,0x00000003},
-                                        {0x0F007038,0x110a0200},//ROB - 0x110a0200,//0x180a0200,// 0x1f0a0200
-                                        {0x0F00703C,0x02101010},//ROB - 0x02101010,//0x02101018},
-                                        {0x0F007040,0x45751200},//ROB - 0x45751200,//0x450f1200},
-                                        {0x0F007044,0x110a0d00},//ROB - 0x110a0d00//0x111f0d00
-                                        {0x0F007048,0x081b0306},
-                                        {0x0F00704c,0x00000000},
-                                        {0x0F007050,0x0000001c},
-                                        {0x0F007054,0x00000000},
-                                        {0x0F007058,0x00000000},
-                                        {0x0F00705c,0x00000000},
-                                        {0x0F007060,0x0010246c},
-                                        {0x0F007064,0x00000010},
-                                        {0x0F007068,0x00000000},
-                                        {0x0F00706c,0x00000001},
-                                        {0x0F007070,0x00007000},
-                                        {0x0F007074,0x00000000},
-                                        {0x0F007078,0x00000000},
-                                        {0x0F00707C,0x00000000},
-                                        {0x0F007080,0x00000000},
-                                        {0x0F007084,0x00000000},
-                                        //# Enable BW improvement within memory controller
-                                        {0x0F007094,0x00000104},
-                                        //# Enable 2 ports within X-bar
-                                        {0x0F00A000,0x00000016},
-                                        //# Enable start bit within memory controller
-                                        {0x0F007018,0x01010000}
-                                        };
+	{0x0F000800,0x00007212},
+	{0x0f000820,0x07F13FFF},
+	{0x0f000810,0x00000F95},
+	{0x0f000860,0x00000000},
+	{0x0f000880,0x000003DD},
+	// Changed source for X-bar and MIPS clock to APLL
+	{0x0f000840,0x0FFF1B00},
+	{0x0f000870,0x00000002},
+	{0x0F00a044,0x1fffffff},
+	{0x0F00a040,0x1f000000},
+	{0x0F00a084,0x1Cffffff},
+	{0x0F00a080,0x1C000000},
+	{0x0F00a04C,0x0000000C},
+	//Memcontroller Default values
+	{0x0F007000,0x00010001},
+	{0x0F007004,0x01010100},
+	{0x0F007008,0x01000001},
+	{0x0F00700c,0x00000000},
+	{0x0F007010,0x01000000},
+	{0x0F007014,0x01000100},
+	{0x0F007018,0x01000000},
+	{0x0F00701c,0x01020001},// POP - 0x00020001 Normal 0x01020001
+	{0x0F007020,0x04030107}, //Normal - 0x04030107 POP - 0x05030107
+	{0x0F007024,0x02000007},
+	{0x0F007028,0x02020202},
+	{0x0F00702c,0x0206060a},//ROB- 0x0205050a,//0x0206060a
+	{0x0F007030,0x05000000},
+	{0x0F007034,0x00000003},
+	{0x0F007038,0x110a0200},//ROB - 0x110a0200,//0x180a0200,// 0x1f0a0200
+	{0x0F00703C,0x02101010},//ROB - 0x02101010,//0x02101018},
+	{0x0F007040,0x45751200},//ROB - 0x45751200,//0x450f1200},
+	{0x0F007044,0x110a0d00},//ROB - 0x110a0d00//0x111f0d00
+	{0x0F007048,0x081b0306},
+	{0x0F00704c,0x00000000},
+	{0x0F007050,0x0000001c},
+	{0x0F007054,0x00000000},
+	{0x0F007058,0x00000000},
+	{0x0F00705c,0x00000000},
+	{0x0F007060,0x0010246c},
+	{0x0F007064,0x00000010},
+	{0x0F007068,0x00000000},
+	{0x0F00706c,0x00000001},
+	{0x0F007070,0x00007000},
+	{0x0F007074,0x00000000},
+	{0x0F007078,0x00000000},
+	{0x0F00707C,0x00000000},
+	{0x0F007080,0x00000000},
+	{0x0F007084,0x00000000},
+	//# Enable BW improvement within memory controller
+	{0x0F007094,0x00000104},
+	//# Enable 2 ports within X-bar
+	{0x0F00A000,0x00000016},
+	//# Enable start bit within memory controller
+	{0x0F007018,0x01010000}
+};
 //80Mhz
 #define T3_SKIP_CLOCK_PROGRAM_DUMP_80MHZ 10  //index for 0x0F007000
 static DDR_SET_NODE asT3_DDRSetting80MHz[]= {//   # DPLL Clock Setting
-                                        {0x0f000810,0x00000F95},
-                                        {0x0f000820,0x07f1ffff},
-                                        {0x0f000860,0x00000000},
-                                        {0x0f000880,0x000003DD},
-                                        {0x0F00a044,0x1fffffff},
-                                        {0x0F00a040,0x1f000000},
-                                        {0x0F00a084,0x1Cffffff},
-                                        {0x0F00a080,0x1C000000},
-                                        {0x0F00a000,0x00000016},
-                                        {0x0F00a04C,0x0000000C},
-                                //Memcontroller Default values
-                                        {0x0F007000,0x00010001},
-                                        {0x0F007004,0x01000000},
-                                        {0x0F007008,0x01000001},
-                                        {0x0F00700c,0x00000000},
-                                        {0x0F007010,0x01000000},
-                                        {0x0F007014,0x01000100},
-                                        {0x0F007018,0x01000000},
-                                        {0x0F00701c,0x01020000},
-                                        {0x0F007020,0x04020107},
-                                        {0x0F007024,0x00000007},
-                                        {0x0F007028,0x02020201},
-                                        {0x0F00702c,0x0204040a},
-                                        {0x0F007030,0x04000000},
-                                        {0x0F007034,0x00000002},
-                                        {0x0F007038,0x1F060200},
-                                        {0x0F00703C,0x1C22221F},
-                                        {0x0F007040,0x8A006600},
-                                        {0x0F007044,0x221a0800},
-                                        {0x0F007048,0x02690204},
-                                        {0x0F00704c,0x00000000},
-                                        {0x0F007050,0x0000001c},
-                                        {0x0F007054,0x00000000},
-                                        {0x0F007058,0x00000000},
-                                        {0x0F00705c,0x00000000},
-                                        {0x0F007060,0x000A15D6},
-                                        {0x0F007064,0x0000000A},
-                                        {0x0F007068,0x00000000},
-                                        {0x0F00706c,0x00000001},
-                                        {0x0F007070,0x00004000},
-                                        {0x0F007074,0x00000000},
-                                        {0x0F007078,0x00000000},
-                                        {0x0F00707C,0x00000000},
-                                        {0x0F007080,0x00000000},
-                                        {0x0F007084,0x00000000},
-                                        {0x0F007094,0x00000104},
-                                        //# Enable start bit within memory controller
-										{0x0F007018,0x01010000}
-                                };
+	{0x0f000810,0x00000F95},
+	{0x0f000820,0x07f1ffff},
+	{0x0f000860,0x00000000},
+	{0x0f000880,0x000003DD},
+	{0x0F00a044,0x1fffffff},
+	{0x0F00a040,0x1f000000},
+	{0x0F00a084,0x1Cffffff},
+	{0x0F00a080,0x1C000000},
+	{0x0F00a000,0x00000016},
+	{0x0F00a04C,0x0000000C},
+	//Memcontroller Default values
+	{0x0F007000,0x00010001},
+	{0x0F007004,0x01000000},
+	{0x0F007008,0x01000001},
+	{0x0F00700c,0x00000000},
+	{0x0F007010,0x01000000},
+	{0x0F007014,0x01000100},
+	{0x0F007018,0x01000000},
+	{0x0F00701c,0x01020000},
+	{0x0F007020,0x04020107},
+	{0x0F007024,0x00000007},
+	{0x0F007028,0x02020201},
+	{0x0F00702c,0x0204040a},
+	{0x0F007030,0x04000000},
+	{0x0F007034,0x00000002},
+	{0x0F007038,0x1F060200},
+	{0x0F00703C,0x1C22221F},
+	{0x0F007040,0x8A006600},
+	{0x0F007044,0x221a0800},
+	{0x0F007048,0x02690204},
+	{0x0F00704c,0x00000000},
+	{0x0F007050,0x0000001c},
+	{0x0F007054,0x00000000},
+	{0x0F007058,0x00000000},
+	{0x0F00705c,0x00000000},
+	{0x0F007060,0x000A15D6},
+	{0x0F007064,0x0000000A},
+	{0x0F007068,0x00000000},
+	{0x0F00706c,0x00000001},
+	{0x0F007070,0x00004000},
+	{0x0F007074,0x00000000},
+	{0x0F007078,0x00000000},
+	{0x0F00707C,0x00000000},
+	{0x0F007080,0x00000000},
+	{0x0F007084,0x00000000},
+	{0x0F007094,0x00000104},
+	//# Enable start bit within memory controller
+	{0x0F007018,0x01010000}
+};
 //100Mhz
 #define T3_SKIP_CLOCK_PROGRAM_DUMP_100MHZ 13  //index for 0x0F007000
 static DDR_SET_NODE asT3_DDRSetting100MHz[]= {//  # DPLL Clock Setting
-                                        {0x0F000800,0x00007008},
-                                        {0x0f000810,0x00000F95},
-                                        {0x0f000820,0x07F13E3F},
-                                        {0x0f000860,0x00000000},
-                                        {0x0f000880,0x000003DD},
-                                // Changed source for X-bar and MIPS clock to APLL
-                                //0x0f000840,0x0FFF1800,
-                                        {0x0f000840,0x0FFF1B00},
-                                        {0x0f000870,0x00000002},
-                                        {0x0F00a044,0x1fffffff},
-                                        {0x0F00a040,0x1f000000},
-                                        {0x0F00a084,0x1Cffffff},
-                                        {0x0F00a080,0x1C000000},
-                                        {0x0F00a04C,0x0000000C},
-                                //# Enable 2 ports within X-bar
-                                        {0x0F00A000,0x00000016},
-                                //Memcontroller Default values
-                                        {0x0F007000,0x00010001},
-                                        {0x0F007004,0x01010100},
-                                        {0x0F007008,0x01000001},
-                                        {0x0F00700c,0x00000000},
-                                        {0x0F007010,0x01000000},
-                                        {0x0F007014,0x01000100},
-                                        {0x0F007018,0x01000000},
-                                        {0x0F00701c,0x01020001}, // POP - 0x00020000 Normal 0x01020000
-                                        {0x0F007020,0x04020107},//Normal - 0x04030107 POP - 0x05030107
-                                        {0x0F007024,0x00000007},
-                                        {0x0F007028,0x01020201},
-                                        {0x0F00702c,0x0204040A},
-                                        {0x0F007030,0x06000000},
-                                        {0x0F007034,0x00000004},
-                                        {0x0F007038,0x20080200},
-                                        {0x0F00703C,0x02030320},
-                                        {0x0F007040,0x6E7F1200},
-                                        {0x0F007044,0x01190A00},
-                                        {0x0F007048,0x06120305},//0x02690204 // 0x06120305
-                                        {0x0F00704c,0x00000000},
-                                        {0x0F007050,0x0000001C},
-                                        {0x0F007054,0x00000000},
-                                        {0x0F007058,0x00000000},
-                                        {0x0F00705c,0x00000000},
-                                        {0x0F007060,0x00082ED6},
-                                        {0x0F007064,0x0000000A},
-                                        {0x0F007068,0x00000000},
-                                        {0x0F00706c,0x00000001},
-                                        {0x0F007070,0x00005000},
-                                        {0x0F007074,0x00000000},
-                                        {0x0F007078,0x00000000},
-                                        {0x0F00707C,0x00000000},
-                                        {0x0F007080,0x00000000},
-                                        {0x0F007084,0x00000000},
-                                //# Enable BW improvement within memory controller
-                                        {0x0F007094,0x00000104},
-                                //# Enable start bit within memory controller
-                                        {0x0F007018,0x01010000}
-                                };
+	{0x0F000800,0x00007008},
+	{0x0f000810,0x00000F95},
+	{0x0f000820,0x07F13E3F},
+	{0x0f000860,0x00000000},
+	{0x0f000880,0x000003DD},
+	// Changed source for X-bar and MIPS clock to APLL
+	//0x0f000840,0x0FFF1800,
+	{0x0f000840,0x0FFF1B00},
+	{0x0f000870,0x00000002},
+	{0x0F00a044,0x1fffffff},
+	{0x0F00a040,0x1f000000},
+	{0x0F00a084,0x1Cffffff},
+	{0x0F00a080,0x1C000000},
+	{0x0F00a04C,0x0000000C},
+	//# Enable 2 ports within X-bar
+	{0x0F00A000,0x00000016},
+	//Memcontroller Default values
+	{0x0F007000,0x00010001},
+	{0x0F007004,0x01010100},
+	{0x0F007008,0x01000001},
+	{0x0F00700c,0x00000000},
+	{0x0F007010,0x01000000},
+	{0x0F007014,0x01000100},
+	{0x0F007018,0x01000000},
+	{0x0F00701c,0x01020001}, // POP - 0x00020000 Normal 0x01020000
+	{0x0F007020,0x04020107},//Normal - 0x04030107 POP - 0x05030107
+	{0x0F007024,0x00000007},
+	{0x0F007028,0x01020201},
+	{0x0F00702c,0x0204040A},
+	{0x0F007030,0x06000000},
+	{0x0F007034,0x00000004},
+	{0x0F007038,0x20080200},
+	{0x0F00703C,0x02030320},
+	{0x0F007040,0x6E7F1200},
+	{0x0F007044,0x01190A00},
+	{0x0F007048,0x06120305},//0x02690204 // 0x06120305
+	{0x0F00704c,0x00000000},
+	{0x0F007050,0x0000001C},
+	{0x0F007054,0x00000000},
+	{0x0F007058,0x00000000},
+	{0x0F00705c,0x00000000},
+	{0x0F007060,0x00082ED6},
+	{0x0F007064,0x0000000A},
+	{0x0F007068,0x00000000},
+	{0x0F00706c,0x00000001},
+	{0x0F007070,0x00005000},
+	{0x0F007074,0x00000000},
+	{0x0F007078,0x00000000},
+	{0x0F00707C,0x00000000},
+	{0x0F007080,0x00000000},
+	{0x0F007084,0x00000000},
+	//# Enable BW improvement within memory controller
+	{0x0F007094,0x00000104},
+	//# Enable start bit within memory controller
+	{0x0F007018,0x01010000}
+};
 
 //Net T3B DDR Settings
 //DDR INIT-133Mhz
 static DDR_SET_NODE asDPLL_266MHZ[] = {
-                                        {0x0F000800,0x00007212},
-                                        {0x0f000820,0x07F13FFF},
-                                        {0x0f000810,0x00000F95},
-                                        {0x0f000860,0x00000000},
-                                        {0x0f000880,0x000003DD},
-                                        // Changed source for X-bar and MIPS clock to APLL
-                                        {0x0f000840,0x0FFF1B00},
-                                        {0x0f000870,0x00000002}
-									  };
+	{0x0F000800,0x00007212},
+	{0x0f000820,0x07F13FFF},
+	{0x0f000810,0x00000F95},
+	{0x0f000860,0x00000000},
+	{0x0f000880,0x000003DD},
+	// Changed source for X-bar and MIPS clock to APLL
+	{0x0f000840,0x0FFF1B00},
+	{0x0f000870,0x00000002}
+};
 
 #define T3B_SKIP_CLOCK_PROGRAM_DUMP_133MHZ 11  //index for 0x0F007000
 static DDR_SET_NODE asT3B_DDRSetting133MHz[] = {//      # DPLL Clock Setting
-                                        {0x0f000810,0x00000F95},
-                                        {0x0f000810,0x00000F95},
-                                        {0x0f000810,0x00000F95},
-                                        {0x0f000820,0x07F13652},
-                                        {0x0f000840,0x0FFF0800},
-                                        // Changed source for X-bar and MIPS clock to APLL
-                                        {0x0f000880,0x000003DD},
-                                        {0x0f000860,0x00000000},
-                                        // Changed source for X-bar and MIPS clock to APLL
-                                        {0x0F00a044,0x1fffffff},
-                                        {0x0F00a040,0x1f000000},
-                                        {0x0F00a084,0x1Cffffff},
-                                        {0x0F00a080,0x1C000000},
-                                        //# Enable 2 ports within X-bar
-                                        {0x0F00A000,0x00000016},
-                                        //Memcontroller Default values
-                                        {0x0F007000,0x00010001},
-                                        {0x0F007004,0x01010100},
-                                        {0x0F007008,0x01000001},
-                                        {0x0F00700c,0x00000000},
-                                        {0x0F007010,0x01000000},
-                                        {0x0F007014,0x01000100},
-                                        {0x0F007018,0x01000000},
-                                        {0x0F00701c,0x01020001},// POP - 0x00020001 Normal 0x01020001
-                                        {0x0F007020,0x04030107}, //Normal - 0x04030107 POP - 0x05030107
-                                        {0x0F007024,0x02000007},
-                                        {0x0F007028,0x02020202},
-                                        {0x0F00702c,0x0206060a},//ROB- 0x0205050a,//0x0206060a
-                                        {0x0F007030,0x05000000},
-                                        {0x0F007034,0x00000003},
-                                        {0x0F007038,0x130a0200},//ROB - 0x110a0200,//0x180a0200,// 0x1f0a0200
-                                        {0x0F00703C,0x02101012},//ROB - 0x02101010,//0x02101018},
-                                        {0x0F007040,0x457D1200},//ROB - 0x45751200,//0x450f1200},
-                                        {0x0F007044,0x11130d00},//ROB - 0x110a0d00//0x111f0d00
-                                        {0x0F007048,0x040D0306},
-                                        {0x0F00704c,0x00000000},
-                                        {0x0F007050,0x0000001c},
-                                        {0x0F007054,0x00000000},
-                                        {0x0F007058,0x00000000},
-                                        {0x0F00705c,0x00000000},
-                                        {0x0F007060,0x0010246c},
-                                        {0x0F007064,0x00000012},
-                                        {0x0F007068,0x00000000},
-                                        {0x0F00706c,0x00000001},
-                                        {0x0F007070,0x00007000},
-                                        {0x0F007074,0x00000000},
-                                        {0x0F007078,0x00000000},
-                                        {0x0F00707C,0x00000000},
-                                        {0x0F007080,0x00000000},
-                                        {0x0F007084,0x00000000},
-                                        //# Enable BW improvement within memory controller
-                                        {0x0F007094,0x00000104},
-                                        //# Enable start bit within memory controller
-                                        {0x0F007018,0x01010000},
-                                        };
+	{0x0f000810,0x00000F95},
+	{0x0f000810,0x00000F95},
+	{0x0f000810,0x00000F95},
+	{0x0f000820,0x07F13652},
+	{0x0f000840,0x0FFF0800},
+	// Changed source for X-bar and MIPS clock to APLL
+	{0x0f000880,0x000003DD},
+	{0x0f000860,0x00000000},
+	// Changed source for X-bar and MIPS clock to APLL
+	{0x0F00a044,0x1fffffff},
+	{0x0F00a040,0x1f000000},
+	{0x0F00a084,0x1Cffffff},
+	{0x0F00a080,0x1C000000},
+	//# Enable 2 ports within X-bar
+	{0x0F00A000,0x00000016},
+	//Memcontroller Default values
+	{0x0F007000,0x00010001},
+	{0x0F007004,0x01010100},
+	{0x0F007008,0x01000001},
+	{0x0F00700c,0x00000000},
+	{0x0F007010,0x01000000},
+	{0x0F007014,0x01000100},
+	{0x0F007018,0x01000000},
+	{0x0F00701c,0x01020001},// POP - 0x00020001 Normal 0x01020001
+	{0x0F007020,0x04030107}, //Normal - 0x04030107 POP - 0x05030107
+	{0x0F007024,0x02000007},
+	{0x0F007028,0x02020202},
+	{0x0F00702c,0x0206060a},//ROB- 0x0205050a,//0x0206060a
+	{0x0F007030,0x05000000},
+	{0x0F007034,0x00000003},
+	{0x0F007038,0x130a0200},//ROB - 0x110a0200,//0x180a0200,// 0x1f0a0200
+	{0x0F00703C,0x02101012},//ROB - 0x02101010,//0x02101018},
+	{0x0F007040,0x457D1200},//ROB - 0x45751200,//0x450f1200},
+	{0x0F007044,0x11130d00},//ROB - 0x110a0d00//0x111f0d00
+	{0x0F007048,0x040D0306},
+	{0x0F00704c,0x00000000},
+	{0x0F007050,0x0000001c},
+	{0x0F007054,0x00000000},
+	{0x0F007058,0x00000000},
+	{0x0F00705c,0x00000000},
+	{0x0F007060,0x0010246c},
+	{0x0F007064,0x00000012},
+	{0x0F007068,0x00000000},
+	{0x0F00706c,0x00000001},
+	{0x0F007070,0x00007000},
+	{0x0F007074,0x00000000},
+	{0x0F007078,0x00000000},
+	{0x0F00707C,0x00000000},
+	{0x0F007080,0x00000000},
+	{0x0F007084,0x00000000},
+	//# Enable BW improvement within memory controller
+	{0x0F007094,0x00000104},
+	//# Enable start bit within memory controller
+	{0x0F007018,0x01010000},
+};
 
 #define T3B_SKIP_CLOCK_PROGRAM_DUMP_80MHZ 9  //index for 0x0F007000
 static DDR_SET_NODE asT3B_DDRSetting80MHz[] = {//       # DPLL Clock Setting
-										{0x0f000810,0x00000F95},
-										{0x0f000820,0x07F13FFF},
-										{0x0f000840,0x0FFF1F00},
-										{0x0f000880,0x000003DD},
-										{0x0f000860,0x00000000},
+	{0x0f000810,0x00000F95},
+	{0x0f000820,0x07F13FFF},
+	{0x0f000840,0x0FFF1F00},
+	{0x0f000880,0x000003DD},
+	{0x0f000860,0x00000000},
 
-										{0x0F00a044,0x1fffffff},
-										{0x0F00a040,0x1f000000},
-										{0x0F00a084,0x1Cffffff},
-										{0x0F00a080,0x1C000000},
-										{0x0F00a000,0x00000016},
-										//Memcontroller Default values
-										{0x0F007000,0x00010001},
-										{0x0F007004,0x01000000},
-										{0x0F007008,0x01000001},
-										{0x0F00700c,0x00000000},
-										{0x0F007010,0x01000000},
-										{0x0F007014,0x01000100},
-										{0x0F007018,0x01000000},
-										{0x0F00701c,0x01020000},
-										{0x0F007020,0x04020107},
-										{0x0F007024,0x00000007},
-										{0x0F007028,0x02020201},
-										{0x0F00702c,0x0204040a},
-										{0x0F007030,0x04000000},
-										{0x0F007034,0x02000002},
-										{0x0F007038,0x1F060202},
-										{0x0F00703C,0x1C22221F},
-										{0x0F007040,0x8A006600},
-										{0x0F007044,0x221a0800},
-										{0x0F007048,0x02690204},
-										{0x0F00704c,0x00000000},
-										{0x0F007050,0x0100001c},
-										{0x0F007054,0x00000000},
-										{0x0F007058,0x00000000},
-										{0x0F00705c,0x00000000},
-										{0x0F007060,0x000A15D6},
-										{0x0F007064,0x0000000A},
-										{0x0F007068,0x00000000},
-										{0x0F00706c,0x00000001},
-										{0x0F007070,0x00004000},
-										{0x0F007074,0x00000000},
-										{0x0F007078,0x00000000},
-										{0x0F00707C,0x00000000},
-										{0x0F007080,0x00000000},
-										{0x0F007084,0x00000000},
-										{0x0F007094,0x00000104},
-										//# Enable start bit within memory controller
-										{0x0F007018,0x01010000}
-								};
+	{0x0F00a044,0x1fffffff},
+	{0x0F00a040,0x1f000000},
+	{0x0F00a084,0x1Cffffff},
+	{0x0F00a080,0x1C000000},
+	{0x0F00a000,0x00000016},
+	//Memcontroller Default values
+	{0x0F007000,0x00010001},
+	{0x0F007004,0x01000000},
+	{0x0F007008,0x01000001},
+	{0x0F00700c,0x00000000},
+	{0x0F007010,0x01000000},
+	{0x0F007014,0x01000100},
+	{0x0F007018,0x01000000},
+	{0x0F00701c,0x01020000},
+	{0x0F007020,0x04020107},
+	{0x0F007024,0x00000007},
+	{0x0F007028,0x02020201},
+	{0x0F00702c,0x0204040a},
+	{0x0F007030,0x04000000},
+	{0x0F007034,0x02000002},
+	{0x0F007038,0x1F060202},
+	{0x0F00703C,0x1C22221F},
+	{0x0F007040,0x8A006600},
+	{0x0F007044,0x221a0800},
+	{0x0F007048,0x02690204},
+	{0x0F00704c,0x00000000},
+	{0x0F007050,0x0100001c},
+	{0x0F007054,0x00000000},
+	{0x0F007058,0x00000000},
+	{0x0F00705c,0x00000000},
+	{0x0F007060,0x000A15D6},
+	{0x0F007064,0x0000000A},
+	{0x0F007068,0x00000000},
+	{0x0F00706c,0x00000001},
+	{0x0F007070,0x00004000},
+	{0x0F007074,0x00000000},
+	{0x0F007078,0x00000000},
+	{0x0F00707C,0x00000000},
+	{0x0F007080,0x00000000},
+	{0x0F007084,0x00000000},
+	{0x0F007094,0x00000104},
+	//# Enable start bit within memory controller
+	{0x0F007018,0x01010000}
+};
 
 //100Mhz
 #define T3B_SKIP_CLOCK_PROGRAM_DUMP_100MHZ 9  //index for 0x0F007000
 static DDR_SET_NODE asT3B_DDRSetting100MHz[] = {//      # DPLL Clock Setting
-										{0x0f000810,0x00000F95},
-										{0x0f000820,0x07F1369B},
-										{0x0f000840,0x0FFF0800},
-										{0x0f000880,0x000003DD},
-										{0x0f000860,0x00000000},
-										{0x0F00a044,0x1fffffff},
-										{0x0F00a040,0x1f000000},
-										{0x0F00a084,0x1Cffffff},
-										{0x0F00a080,0x1C000000},
-										//# Enable 2 ports within X-bar
-										{0x0F00A000,0x00000016},
-								//Memcontroller Default values
-										{0x0F007000,0x00010001},
-										{0x0F007004,0x01010100},
-										{0x0F007008,0x01000001},
-										{0x0F00700c,0x00000000},
-										{0x0F007010,0x01000000},
-										{0x0F007014,0x01000100},
-										{0x0F007018,0x01000000},
-										{0x0F00701c,0x01020000}, // POP - 0x00020000 Normal 0x01020000
-										{0x0F007020,0x04020107},//Normal - 0x04030107 POP - 0x05030107
-										{0x0F007024,0x00000007},
-										{0x0F007028,0x01020201},
-										{0x0F00702c,0x0204040A},
-										{0x0F007030,0x06000000},
-										{0x0F007034,0x02000004},
-										{0x0F007038,0x20080200},
-										{0x0F00703C,0x02030320},
-										{0x0F007040,0x6E7F1200},
-										{0x0F007044,0x01190A00},
-										{0x0F007048,0x06120305},//0x02690204 // 0x06120305
-										{0x0F00704c,0x00000000},
-										{0x0F007050,0x0100001C},
-										{0x0F007054,0x00000000},
-										{0x0F007058,0x00000000},
-										{0x0F00705c,0x00000000},
-										{0x0F007060,0x00082ED6},
-										{0x0F007064,0x0000000A},
-										{0x0F007068,0x00000000},
-										{0x0F00706c,0x00000001},
-										{0x0F007070,0x00005000},
-										{0x0F007074,0x00000000},
-										{0x0F007078,0x00000000},
-										{0x0F00707C,0x00000000},
-										{0x0F007080,0x00000000},
-										{0x0F007084,0x00000000},
-								//# Enable BW improvement within memory controller
-										{0x0F007094,0x00000104},
-								//# Enable start bit within memory controller
-										{0x0F007018,0x01010000}
-							};
+	{0x0f000810,0x00000F95},
+	{0x0f000820,0x07F1369B},
+	{0x0f000840,0x0FFF0800},
+	{0x0f000880,0x000003DD},
+	{0x0f000860,0x00000000},
+	{0x0F00a044,0x1fffffff},
+	{0x0F00a040,0x1f000000},
+	{0x0F00a084,0x1Cffffff},
+	{0x0F00a080,0x1C000000},
+	//# Enable 2 ports within X-bar
+	{0x0F00A000,0x00000016},
+	//Memcontroller Default values
+	{0x0F007000,0x00010001},
+	{0x0F007004,0x01010100},
+	{0x0F007008,0x01000001},
+	{0x0F00700c,0x00000000},
+	{0x0F007010,0x01000000},
+	{0x0F007014,0x01000100},
+	{0x0F007018,0x01000000},
+	{0x0F00701c,0x01020000}, // POP - 0x00020000 Normal 0x01020000
+	{0x0F007020,0x04020107},//Normal - 0x04030107 POP - 0x05030107
+	{0x0F007024,0x00000007},
+	{0x0F007028,0x01020201},
+	{0x0F00702c,0x0204040A},
+	{0x0F007030,0x06000000},
+	{0x0F007034,0x02000004},
+	{0x0F007038,0x20080200},
+	{0x0F00703C,0x02030320},
+	{0x0F007040,0x6E7F1200},
+	{0x0F007044,0x01190A00},
+	{0x0F007048,0x06120305},//0x02690204 // 0x06120305
+	{0x0F00704c,0x00000000},
+	{0x0F007050,0x0100001C},
+	{0x0F007054,0x00000000},
+	{0x0F007058,0x00000000},
+	{0x0F00705c,0x00000000},
+	{0x0F007060,0x00082ED6},
+	{0x0F007064,0x0000000A},
+	{0x0F007068,0x00000000},
+	{0x0F00706c,0x00000001},
+	{0x0F007070,0x00005000},
+	{0x0F007074,0x00000000},
+	{0x0F007078,0x00000000},
+	{0x0F00707C,0x00000000},
+	{0x0F007080,0x00000000},
+	{0x0F007084,0x00000000},
+	//# Enable BW improvement within memory controller
+	{0x0F007094,0x00000104},
+	//# Enable start bit within memory controller
+	{0x0F007018,0x01010000}
+};
 
 
 #define T3LP_SKIP_CLOCK_PROGRAM_DUMP_133MHZ 9  //index for 0x0F007000
 static DDR_SET_NODE asT3LP_DDRSetting133MHz[]= {//	# DPLL Clock Setting
-								{0x0f000820,0x03F1365B},
-								{0x0f000810,0x00002F95},
-								{0x0f000880,0x000003DD},
-								// Changed source for X-bar and MIPS clock to APLL
-								{0x0f000840,0x0FFF0000},
-								{0x0f000860,0x00000000},
-								{0x0F00a044,0x1fffffff},
-								{0x0F00a040,0x1f000000},
-								{0x0F00a084,0x1Cffffff},
-								{0x0F00a080,0x1C000000},
-								{0x0F00A000,0x00000016},
-								//Memcontroller Default values
-								{0x0F007000,0x00010001},
-								{0x0F007004,0x01010100},
-								{0x0F007008,0x01000001},
-								{0x0F00700c,0x00000000},
-								{0x0F007010,0x01000000},
-								{0x0F007014,0x01000100},
-								{0x0F007018,0x01000000},
-								{0x0F00701c,0x01020001},// POP - 0x00020001 Normal 0x01020001
-								{0x0F007020,0x04030107}, //Normal - 0x04030107 POP - 0x05030107
-								{0x0F007024,0x02000007},
-								{0x0F007028,0x02020200},
-								{0x0F00702c,0x0206060a},//ROB- 0x0205050a,//0x0206060a
-								{0x0F007030,0x05000000},
-								{0x0F007034,0x00000003},
-								{0x0F007038,0x200a0200},//ROB - 0x110a0200,//0x180a0200,// 0x1f0a0200
-								{0x0F00703C,0x02101020},//ROB - 0x02101010,//0x02101018,
-								{0x0F007040,0x45711200},//ROB - 0x45751200,//0x450f1200,
-								{0x0F007044,0x110D0D00},//ROB - 0x110a0d00//0x111f0d00
-								{0x0F007048,0x04080306},
-								{0x0F00704c,0x00000000},
-								{0x0F007050,0x0100001c},
-								{0x0F007054,0x00000000},
-								{0x0F007058,0x00000000},
-								{0x0F00705c,0x00000000},
-								{0x0F007060,0x0010245F},
-								{0x0F007064,0x00000010},
-								{0x0F007068,0x00000000},
-								{0x0F00706c,0x00000001},
-								{0x0F007070,0x00007000},
-								{0x0F007074,0x00000000},
-								{0x0F007078,0x00000000},
-								{0x0F00707C,0x00000000},
-								{0x0F007080,0x00000000},
-								{0x0F007084,0x00000000},
-								{0x0F007088,0x01000001},
-								{0x0F00708c,0x00000101},
-								{0x0F007090,0x00000000},
-								//# Enable BW improvement within memory controller
-								{0x0F007094,0x00040000},
-								{0x0F007098,0x00000000},
-								{0x0F0070c8,0x00000104},
-								//# Enable 2 ports within X-bar
-								//# Enable start bit within memory controller
-								{0x0F007018,0x01010000}
+	{0x0f000820,0x03F1365B},
+	{0x0f000810,0x00002F95},
+	{0x0f000880,0x000003DD},
+	// Changed source for X-bar and MIPS clock to APLL
+	{0x0f000840,0x0FFF0000},
+	{0x0f000860,0x00000000},
+	{0x0F00a044,0x1fffffff},
+	{0x0F00a040,0x1f000000},
+	{0x0F00a084,0x1Cffffff},
+	{0x0F00a080,0x1C000000},
+	{0x0F00A000,0x00000016},
+	//Memcontroller Default values
+	{0x0F007000,0x00010001},
+	{0x0F007004,0x01010100},
+	{0x0F007008,0x01000001},
+	{0x0F00700c,0x00000000},
+	{0x0F007010,0x01000000},
+	{0x0F007014,0x01000100},
+	{0x0F007018,0x01000000},
+	{0x0F00701c,0x01020001},// POP - 0x00020001 Normal 0x01020001
+	{0x0F007020,0x04030107}, //Normal - 0x04030107 POP - 0x05030107
+	{0x0F007024,0x02000007},
+	{0x0F007028,0x02020200},
+	{0x0F00702c,0x0206060a},//ROB- 0x0205050a,//0x0206060a
+	{0x0F007030,0x05000000},
+	{0x0F007034,0x00000003},
+	{0x0F007038,0x200a0200},//ROB - 0x110a0200,//0x180a0200,// 0x1f0a0200
+	{0x0F00703C,0x02101020},//ROB - 0x02101010,//0x02101018,
+	{0x0F007040,0x45711200},//ROB - 0x45751200,//0x450f1200,
+	{0x0F007044,0x110D0D00},//ROB - 0x110a0d00//0x111f0d00
+	{0x0F007048,0x04080306},
+	{0x0F00704c,0x00000000},
+	{0x0F007050,0x0100001c},
+	{0x0F007054,0x00000000},
+	{0x0F007058,0x00000000},
+	{0x0F00705c,0x00000000},
+	{0x0F007060,0x0010245F},
+	{0x0F007064,0x00000010},
+	{0x0F007068,0x00000000},
+	{0x0F00706c,0x00000001},
+	{0x0F007070,0x00007000},
+	{0x0F007074,0x00000000},
+	{0x0F007078,0x00000000},
+	{0x0F00707C,0x00000000},
+	{0x0F007080,0x00000000},
+	{0x0F007084,0x00000000},
+	{0x0F007088,0x01000001},
+	{0x0F00708c,0x00000101},
+	{0x0F007090,0x00000000},
+	//# Enable BW improvement within memory controller
+	{0x0F007094,0x00040000},
+	{0x0F007098,0x00000000},
+	{0x0F0070c8,0x00000104},
+	//# Enable 2 ports within X-bar
+	//# Enable start bit within memory controller
+	{0x0F007018,0x01010000}
 };
 
 #define T3LP_SKIP_CLOCK_PROGRAM_DUMP_100MHZ 11  //index for 0x0F007000
 static DDR_SET_NODE asT3LP_DDRSetting100MHz[]= {//	# DPLL Clock Setting
-								{0x0f000810,0x00002F95},
-								{0x0f000820,0x03F1369B},
-								{0x0f000840,0x0fff0000},
-								{0x0f000860,0x00000000},
-								{0x0f000880,0x000003DD},
-								// Changed source for X-bar and MIPS clock to APLL
-								{0x0f000840,0x0FFF0000},
-								{0x0F00a044,0x1fffffff},
-								{0x0F00a040,0x1f000000},
-								{0x0F00a084,0x1Cffffff},
-								{0x0F00a080,0x1C000000},
-								//Memcontroller Default values
-								{0x0F007000,0x00010001},
-								{0x0F007004,0x01010100},
-								{0x0F007008,0x01000001},
-								{0x0F00700c,0x00000000},
-								{0x0F007010,0x01000000},
-								{0x0F007014,0x01000100},
-								{0x0F007018,0x01000000},
-								{0x0F00701c,0x01020000},// POP - 0x00020001 Normal 0x01020001
-								{0x0F007020,0x04020107}, //Normal - 0x04030107 POP - 0x05030107
-								{0x0F007024,0x00000007},
-								{0x0F007028,0x01020200},
-								{0x0F00702c,0x0204040a},//ROB- 0x0205050a,//0x0206060a
-								{0x0F007030,0x06000000},
-								{0x0F007034,0x00000004},
-								{0x0F007038,0x1F080200},//ROB - 0x110a0200,//0x180a0200,// 0x1f0a0200
-								{0x0F00703C,0x0203031F},//ROB - 0x02101010,//0x02101018,
-								{0x0F007040,0x6e001200},//ROB - 0x45751200,//0x450f1200,
-								{0x0F007044,0x011a0a00},//ROB - 0x110a0d00//0x111f0d00
-								{0x0F007048,0x03000305},
-								{0x0F00704c,0x00000000},
-								{0x0F007050,0x0100001c},
-								{0x0F007054,0x00000000},
-								{0x0F007058,0x00000000},
-								{0x0F00705c,0x00000000},
-								{0x0F007060,0x00082ED6},
-								{0x0F007064,0x0000000A},
-								{0x0F007068,0x00000000},
-								{0x0F00706c,0x00000001},
-								{0x0F007070,0x00005000},
-								{0x0F007074,0x00000000},
-								{0x0F007078,0x00000000},
-								{0x0F00707C,0x00000000},
-								{0x0F007080,0x00000000},
-								{0x0F007084,0x00000000},
-								{0x0F007088,0x01000001},
-								{0x0F00708c,0x00000101},
-								{0x0F007090,0x00000000},
-								{0x0F007094,0x00010000},
-								{0x0F007098,0x00000000},
-								{0x0F0070C8,0x00000104},
-								//# Enable 2 ports within X-bar
-								{0x0F00A000,0x00000016},
-								//# Enable start bit within memory controller
-								{0x0F007018,0x01010000}
+	{0x0f000810,0x00002F95},
+	{0x0f000820,0x03F1369B},
+	{0x0f000840,0x0fff0000},
+	{0x0f000860,0x00000000},
+	{0x0f000880,0x000003DD},
+	// Changed source for X-bar and MIPS clock to APLL
+	{0x0f000840,0x0FFF0000},
+	{0x0F00a044,0x1fffffff},
+	{0x0F00a040,0x1f000000},
+	{0x0F00a084,0x1Cffffff},
+	{0x0F00a080,0x1C000000},
+	//Memcontroller Default values
+	{0x0F007000,0x00010001},
+	{0x0F007004,0x01010100},
+	{0x0F007008,0x01000001},
+	{0x0F00700c,0x00000000},
+	{0x0F007010,0x01000000},
+	{0x0F007014,0x01000100},
+	{0x0F007018,0x01000000},
+	{0x0F00701c,0x01020000},// POP - 0x00020001 Normal 0x01020001
+	{0x0F007020,0x04020107}, //Normal - 0x04030107 POP - 0x05030107
+	{0x0F007024,0x00000007},
+	{0x0F007028,0x01020200},
+	{0x0F00702c,0x0204040a},//ROB- 0x0205050a,//0x0206060a
+	{0x0F007030,0x06000000},
+	{0x0F007034,0x00000004},
+	{0x0F007038,0x1F080200},//ROB - 0x110a0200,//0x180a0200,// 0x1f0a0200
+	{0x0F00703C,0x0203031F},//ROB - 0x02101010,//0x02101018,
+	{0x0F007040,0x6e001200},//ROB - 0x45751200,//0x450f1200,
+	{0x0F007044,0x011a0a00},//ROB - 0x110a0d00//0x111f0d00
+	{0x0F007048,0x03000305},
+	{0x0F00704c,0x00000000},
+	{0x0F007050,0x0100001c},
+	{0x0F007054,0x00000000},
+	{0x0F007058,0x00000000},
+	{0x0F00705c,0x00000000},
+	{0x0F007060,0x00082ED6},
+	{0x0F007064,0x0000000A},
+	{0x0F007068,0x00000000},
+	{0x0F00706c,0x00000001},
+	{0x0F007070,0x00005000},
+	{0x0F007074,0x00000000},
+	{0x0F007078,0x00000000},
+	{0x0F00707C,0x00000000},
+	{0x0F007080,0x00000000},
+	{0x0F007084,0x00000000},
+	{0x0F007088,0x01000001},
+	{0x0F00708c,0x00000101},
+	{0x0F007090,0x00000000},
+	{0x0F007094,0x00010000},
+	{0x0F007098,0x00000000},
+	{0x0F0070C8,0x00000104},
+	//# Enable 2 ports within X-bar
+	{0x0F00A000,0x00000016},
+	//# Enable start bit within memory controller
+	{0x0F007018,0x01010000}
 };
 
 #define T3LP_SKIP_CLOCK_PROGRAM_DUMP_80MHZ 9  //index for 0x0F007000
 static DDR_SET_NODE asT3LP_DDRSetting80MHz[]= {//	# DPLL Clock Setting
-								{0x0f000820,0x07F13FFF},
-								{0x0f000810,0x00002F95},
-								{0x0f000860,0x00000000},
-								{0x0f000880,0x000003DD},
-								{0x0f000840,0x0FFF1F00},
-								{0x0F00a044,0x1fffffff},
-								{0x0F00a040,0x1f000000},
-								{0x0F00a084,0x1Cffffff},
-								{0x0F00a080,0x1C000000},
-								{0x0F00A000,0x00000016},
-								{0x0f007000,0x00010001},
-								{0x0f007004,0x01000000},
-								{0x0f007008,0x01000001},
-								{0x0f00700c,0x00000000},
-								{0x0f007010,0x01000000},
-								{0x0f007014,0x01000100},
-								{0x0f007018,0x01000000},
-								{0x0f00701c,0x01020000},
-								{0x0f007020,0x04020107},
-								{0x0f007024,0x00000007},
-								{0x0f007028,0x02020200},
-								{0x0f00702c,0x0204040a},
-								{0x0f007030,0x04000000},
-								{0x0f007034,0x00000002},
-								{0x0f007038,0x1d060200},
-								{0x0f00703c,0x1c22221d},
-								{0x0f007040,0x8A116600},
-								{0x0f007044,0x222d0800},
-								{0x0f007048,0x02690204},
-								{0x0f00704c,0x00000000},
-								{0x0f007050,0x0100001c},
-								{0x0f007054,0x00000000},
-								{0x0f007058,0x00000000},
-								{0x0f00705c,0x00000000},
-								{0x0f007060,0x000A15D6},
-								{0x0f007064,0x0000000A},
-								{0x0f007068,0x00000000},
-								{0x0f00706c,0x00000001},
-								{0x0f007070,0x00004000},
-								{0x0f007074,0x00000000},
-								{0x0f007078,0x00000000},
-								{0x0f00707c,0x00000000},
-								{0x0f007080,0x00000000},
-								{0x0f007084,0x00000000},
-								{0x0f007088,0x01000001},
-								{0x0f00708c,0x00000101},
-								{0x0f007090,0x00000000},
-								{0x0f007094,0x00010000},
-								{0x0f007098,0x00000000},
-								{0x0F0070C8,0x00000104},
-								{0x0F007018,0x01010000}
+	{0x0f000820,0x07F13FFF},
+	{0x0f000810,0x00002F95},
+	{0x0f000860,0x00000000},
+	{0x0f000880,0x000003DD},
+	{0x0f000840,0x0FFF1F00},
+	{0x0F00a044,0x1fffffff},
+	{0x0F00a040,0x1f000000},
+	{0x0F00a084,0x1Cffffff},
+	{0x0F00a080,0x1C000000},
+	{0x0F00A000,0x00000016},
+	{0x0f007000,0x00010001},
+	{0x0f007004,0x01000000},
+	{0x0f007008,0x01000001},
+	{0x0f00700c,0x00000000},
+	{0x0f007010,0x01000000},
+	{0x0f007014,0x01000100},
+	{0x0f007018,0x01000000},
+	{0x0f00701c,0x01020000},
+	{0x0f007020,0x04020107},
+	{0x0f007024,0x00000007},
+	{0x0f007028,0x02020200},
+	{0x0f00702c,0x0204040a},
+	{0x0f007030,0x04000000},
+	{0x0f007034,0x00000002},
+	{0x0f007038,0x1d060200},
+	{0x0f00703c,0x1c22221d},
+	{0x0f007040,0x8A116600},
+	{0x0f007044,0x222d0800},
+	{0x0f007048,0x02690204},
+	{0x0f00704c,0x00000000},
+	{0x0f007050,0x0100001c},
+	{0x0f007054,0x00000000},
+	{0x0f007058,0x00000000},
+	{0x0f00705c,0x00000000},
+	{0x0f007060,0x000A15D6},
+	{0x0f007064,0x0000000A},
+	{0x0f007068,0x00000000},
+	{0x0f00706c,0x00000001},
+	{0x0f007070,0x00004000},
+	{0x0f007074,0x00000000},
+	{0x0f007078,0x00000000},
+	{0x0f00707c,0x00000000},
+	{0x0f007080,0x00000000},
+	{0x0f007084,0x00000000},
+	{0x0f007088,0x01000001},
+	{0x0f00708c,0x00000101},
+	{0x0f007090,0x00000000},
+	{0x0f007094,0x00010000},
+	{0x0f007098,0x00000000},
+	{0x0F0070C8,0x00000104},
+	{0x0F007018,0x01010000}
 };
 
 
@@ -538,237 +538,237 @@ static DDR_SET_NODE asT3LP_DDRSetting80MHz[]= {//	# DPLL Clock Setting
 #define T3LPB_SKIP_CLOCK_PROGRAM_DUMP_160MHZ 7  //index for 0x0F007000
 static DDR_SET_NODE asT3LPB_DDRSetting160MHz[]= {//	# DPLL Clock Setting
 
-								{0x0f000820,0x03F137DB},
-								{0x0f000810,0x01842795},
-								{0x0f000860,0x00000000},
-								{0x0f000880,0x000003DD},
-								{0x0f000840,0x0FFF0400},
-								{0x0F00a044,0x1fffffff},
-								{0x0F00a040,0x1f000000},
-								{0x0f003050,0x00000021},//this is flash/eeprom clock divisor which set the flash clock to 20 MHz
-								{0x0F00a084,0x1Cffffff},//Now dump from her in internal memory
-								{0x0F00a080,0x1C000000},
-								{0x0F00A000,0x00000016},
-								{0x0f007000,0x00010001},
-								{0x0f007004,0x01000001},
-								{0x0f007008,0x01000101},
-								{0x0f00700c,0x00000000},
-								{0x0f007010,0x01000100},
-								{0x0f007014,0x01000100},
-								{0x0f007018,0x01000000},
-								{0x0f00701c,0x01020000},
-								{0x0f007020,0x04030107},
-								{0x0f007024,0x02000007},
-								{0x0f007028,0x02020200},
-								{0x0f00702c,0x0206060a},
-								{0x0f007030,0x050d0d00},
-								{0x0f007034,0x00000003},
-								{0x0f007038,0x170a0200},
-								{0x0f00703c,0x02101012},
-								{0x0f007040,0x45161200},
-								{0x0f007044,0x11250c00},
-								{0x0f007048,0x04da0307},
-								{0x0f00704c,0x00000000},
-								{0x0f007050,0x0000001c},
-								{0x0f007054,0x00000000},
-								{0x0f007058,0x00000000},
-								{0x0f00705c,0x00000000},
-								{0x0f007060,0x00142bb6},
-								{0x0f007064,0x20430014},
-								{0x0f007068,0x00000000},
-								{0x0f00706c,0x00000001},
-								{0x0f007070,0x00009000},
-								{0x0f007074,0x00000000},
-								{0x0f007078,0x00000000},
-								{0x0f00707c,0x00000000},
-								{0x0f007080,0x00000000},
-								{0x0f007084,0x00000000},
-								{0x0f007088,0x01000001},
-								{0x0f00708c,0x00000101},
-								{0x0f007090,0x00000000},
-								{0x0f007094,0x00040000},
-								{0x0f007098,0x00000000},
-								{0x0F0070C8,0x00000104},
-								{0x0F007018,0x01010000}
+	{0x0f000820,0x03F137DB},
+	{0x0f000810,0x01842795},
+	{0x0f000860,0x00000000},
+	{0x0f000880,0x000003DD},
+	{0x0f000840,0x0FFF0400},
+	{0x0F00a044,0x1fffffff},
+	{0x0F00a040,0x1f000000},
+	{0x0f003050,0x00000021},//this is flash/eeprom clock divisor which set the flash clock to 20 MHz
+	{0x0F00a084,0x1Cffffff},//Now dump from her in internal memory
+	{0x0F00a080,0x1C000000},
+	{0x0F00A000,0x00000016},
+	{0x0f007000,0x00010001},
+	{0x0f007004,0x01000001},
+	{0x0f007008,0x01000101},
+	{0x0f00700c,0x00000000},
+	{0x0f007010,0x01000100},
+	{0x0f007014,0x01000100},
+	{0x0f007018,0x01000000},
+	{0x0f00701c,0x01020000},
+	{0x0f007020,0x04030107},
+	{0x0f007024,0x02000007},
+	{0x0f007028,0x02020200},
+	{0x0f00702c,0x0206060a},
+	{0x0f007030,0x050d0d00},
+	{0x0f007034,0x00000003},
+	{0x0f007038,0x170a0200},
+	{0x0f00703c,0x02101012},
+	{0x0f007040,0x45161200},
+	{0x0f007044,0x11250c00},
+	{0x0f007048,0x04da0307},
+	{0x0f00704c,0x00000000},
+	{0x0f007050,0x0000001c},
+	{0x0f007054,0x00000000},
+	{0x0f007058,0x00000000},
+	{0x0f00705c,0x00000000},
+	{0x0f007060,0x00142bb6},
+	{0x0f007064,0x20430014},
+	{0x0f007068,0x00000000},
+	{0x0f00706c,0x00000001},
+	{0x0f007070,0x00009000},
+	{0x0f007074,0x00000000},
+	{0x0f007078,0x00000000},
+	{0x0f00707c,0x00000000},
+	{0x0f007080,0x00000000},
+	{0x0f007084,0x00000000},
+	{0x0f007088,0x01000001},
+	{0x0f00708c,0x00000101},
+	{0x0f007090,0x00000000},
+	{0x0f007094,0x00040000},
+	{0x0f007098,0x00000000},
+	{0x0F0070C8,0x00000104},
+	{0x0F007018,0x01010000}
 };
 
 
 #define T3LPB_SKIP_CLOCK_PROGRAM_DUMP_133MHZ 7  //index for 0x0F007000
 static DDR_SET_NODE asT3LPB_DDRSetting133MHz[]= {//	# DPLL Clock Setting
-								{0x0f000820,0x03F1365B},
-								{0x0f000810,0x00002F95},
-								{0x0f000880,0x000003DD},
-								// Changed source for X-bar and MIPS clock to APLL
-								{0x0f000840,0x0FFF0000},
-								{0x0f000860,0x00000000},
-								{0x0F00a044,0x1fffffff},
-								{0x0F00a040,0x1f000000},
-								{0x0f003050,0x00000021},//flash/eeprom clock divisor which set the flash clock to 20 MHz
-								{0x0F00a084,0x1Cffffff},//dump from here in internal memory
-								{0x0F00a080,0x1C000000},
-								{0x0F00A000,0x00000016},
-								//Memcontroller Default values
-								{0x0F007000,0x00010001},
-								{0x0F007004,0x01010100},
-								{0x0F007008,0x01000001},
-								{0x0F00700c,0x00000000},
-								{0x0F007010,0x01000000},
-								{0x0F007014,0x01000100},
-								{0x0F007018,0x01000000},
-								{0x0F00701c,0x01020001},// POP - 0x00020001 Normal 0x01020001
-								{0x0F007020,0x04030107}, //Normal - 0x04030107 POP - 0x05030107
-								{0x0F007024,0x02000007},
-								{0x0F007028,0x02020200},
-								{0x0F00702c,0x0206060a},//ROB- 0x0205050a,//0x0206060a
-								{0x0F007030,0x05000000},
-								{0x0F007034,0x00000003},
-								{0x0F007038,0x190a0200},//ROB - 0x110a0200,//0x180a0200,// 0x1f0a0200
-								{0x0F00703C,0x02101017},//ROB - 0x02101010,//0x02101018,
-								{0x0F007040,0x45171200},//ROB - 0x45751200,//0x450f1200,
-								{0x0F007044,0x11290D00},//ROB - 0x110a0d00//0x111f0d00
-								{0x0F007048,0x04080306},
-								{0x0F00704c,0x00000000},
-								{0x0F007050,0x0100001c},
-								{0x0F007054,0x00000000},
-								{0x0F007058,0x00000000},
-								{0x0F00705c,0x00000000},
-								{0x0F007060,0x0010245F},
-								{0x0F007064,0x00000010},
-								{0x0F007068,0x00000000},
-								{0x0F00706c,0x00000001},
-								{0x0F007070,0x00007000},
-								{0x0F007074,0x00000000},
-								{0x0F007078,0x00000000},
-								{0x0F00707C,0x00000000},
-								{0x0F007080,0x00000000},
-								{0x0F007084,0x00000000},
-								{0x0F007088,0x01000001},
-								{0x0F00708c,0x00000101},
-								{0x0F007090,0x00000000},
-								//# Enable BW improvement within memory controller
-								{0x0F007094,0x00040000},
-								{0x0F007098,0x00000000},
-								{0x0F0070c8,0x00000104},
-								//# Enable 2 ports within X-bar
-								//# Enable start bit within memory controller
-								{0x0F007018,0x01010000}
+	{0x0f000820,0x03F1365B},
+	{0x0f000810,0x00002F95},
+	{0x0f000880,0x000003DD},
+	// Changed source for X-bar and MIPS clock to APLL
+	{0x0f000840,0x0FFF0000},
+	{0x0f000860,0x00000000},
+	{0x0F00a044,0x1fffffff},
+	{0x0F00a040,0x1f000000},
+	{0x0f003050,0x00000021},//flash/eeprom clock divisor which set the flash clock to 20 MHz
+	{0x0F00a084,0x1Cffffff},//dump from here in internal memory
+	{0x0F00a080,0x1C000000},
+	{0x0F00A000,0x00000016},
+	//Memcontroller Default values
+	{0x0F007000,0x00010001},
+	{0x0F007004,0x01010100},
+	{0x0F007008,0x01000001},
+	{0x0F00700c,0x00000000},
+	{0x0F007010,0x01000000},
+	{0x0F007014,0x01000100},
+	{0x0F007018,0x01000000},
+	{0x0F00701c,0x01020001},// POP - 0x00020001 Normal 0x01020001
+	{0x0F007020,0x04030107}, //Normal - 0x04030107 POP - 0x05030107
+	{0x0F007024,0x02000007},
+	{0x0F007028,0x02020200},
+	{0x0F00702c,0x0206060a},//ROB- 0x0205050a,//0x0206060a
+	{0x0F007030,0x05000000},
+	{0x0F007034,0x00000003},
+	{0x0F007038,0x190a0200},//ROB - 0x110a0200,//0x180a0200,// 0x1f0a0200
+	{0x0F00703C,0x02101017},//ROB - 0x02101010,//0x02101018,
+	{0x0F007040,0x45171200},//ROB - 0x45751200,//0x450f1200,
+	{0x0F007044,0x11290D00},//ROB - 0x110a0d00//0x111f0d00
+	{0x0F007048,0x04080306},
+	{0x0F00704c,0x00000000},
+	{0x0F007050,0x0100001c},
+	{0x0F007054,0x00000000},
+	{0x0F007058,0x00000000},
+	{0x0F00705c,0x00000000},
+	{0x0F007060,0x0010245F},
+	{0x0F007064,0x00000010},
+	{0x0F007068,0x00000000},
+	{0x0F00706c,0x00000001},
+	{0x0F007070,0x00007000},
+	{0x0F007074,0x00000000},
+	{0x0F007078,0x00000000},
+	{0x0F00707C,0x00000000},
+	{0x0F007080,0x00000000},
+	{0x0F007084,0x00000000},
+	{0x0F007088,0x01000001},
+	{0x0F00708c,0x00000101},
+	{0x0F007090,0x00000000},
+	//# Enable BW improvement within memory controller
+	{0x0F007094,0x00040000},
+	{0x0F007098,0x00000000},
+	{0x0F0070c8,0x00000104},
+	//# Enable 2 ports within X-bar
+	//# Enable start bit within memory controller
+	{0x0F007018,0x01010000}
 };
 
 #define T3LPB_SKIP_CLOCK_PROGRAM_DUMP_100MHZ 8  //index for 0x0F007000
 static DDR_SET_NODE asT3LPB_DDRSetting100MHz[]= {//	# DPLL Clock Setting
-								{0x0f000810,0x00002F95},
-								{0x0f000820,0x03F1369B},
-								{0x0f000840,0x0fff0000},
-								{0x0f000860,0x00000000},
-								{0x0f000880,0x000003DD},
-								// Changed source for X-bar and MIPS clock to APLL
-								{0x0f000840,0x0FFF0000},
-								{0x0F00a044,0x1fffffff},
-								{0x0F00a040,0x1f000000},
-								{0x0f003050,0x00000021},//flash/eeprom clock divisor which set the flash clock to 20 MHz
-								{0x0F00a084,0x1Cffffff}, //dump from here in internal memory
-								{0x0F00a080,0x1C000000},
-								//Memcontroller Default values
-								{0x0F007000,0x00010001},
-								{0x0F007004,0x01010100},
-								{0x0F007008,0x01000001},
-								{0x0F00700c,0x00000000},
-								{0x0F007010,0x01000000},
-								{0x0F007014,0x01000100},
-								{0x0F007018,0x01000000},
-								{0x0F00701c,0x01020000},// POP - 0x00020001 Normal 0x01020001
-								{0x0F007020,0x04020107}, //Normal - 0x04030107 POP - 0x05030107
-								{0x0F007024,0x00000007},
-								{0x0F007028,0x01020200},
-								{0x0F00702c,0x0204040a},//ROB- 0x0205050a,//0x0206060a
-								{0x0F007030,0x06000000},
-								{0x0F007034,0x00000004},
-								{0x0F007038,0x1F080200},//ROB - 0x110a0200,//0x180a0200,// 0x1f0a0200
-								{0x0F00703C,0x0203031F},//ROB - 0x02101010,//0x02101018,
-								{0x0F007040,0x6e001200},//ROB - 0x45751200,//0x450f1200,
-								{0x0F007044,0x011a0a00},//ROB - 0x110a0d00//0x111f0d00
-								{0x0F007048,0x03000305},
-								{0x0F00704c,0x00000000},
-								{0x0F007050,0x0100001c},
-								{0x0F007054,0x00000000},
-								{0x0F007058,0x00000000},
-								{0x0F00705c,0x00000000},
-								{0x0F007060,0x00082ED6},
-								{0x0F007064,0x0000000A},
-								{0x0F007068,0x00000000},
-								{0x0F00706c,0x00000001},
-								{0x0F007070,0x00005000},
-								{0x0F007074,0x00000000},
-								{0x0F007078,0x00000000},
-								{0x0F00707C,0x00000000},
-								{0x0F007080,0x00000000},
-								{0x0F007084,0x00000000},
-								{0x0F007088,0x01000001},
-								{0x0F00708c,0x00000101},
-								{0x0F007090,0x00000000},
-								{0x0F007094,0x00010000},
-								{0x0F007098,0x00000000},
-								{0x0F0070C8,0x00000104},
-								//# Enable 2 ports within X-bar
-								{0x0F00A000,0x00000016},
-								//# Enable start bit within memory controller
-								{0x0F007018,0x01010000}
+	{0x0f000810,0x00002F95},
+	{0x0f000820,0x03F1369B},
+	{0x0f000840,0x0fff0000},
+	{0x0f000860,0x00000000},
+	{0x0f000880,0x000003DD},
+	// Changed source for X-bar and MIPS clock to APLL
+	{0x0f000840,0x0FFF0000},
+	{0x0F00a044,0x1fffffff},
+	{0x0F00a040,0x1f000000},
+	{0x0f003050,0x00000021},//flash/eeprom clock divisor which set the flash clock to 20 MHz
+	{0x0F00a084,0x1Cffffff}, //dump from here in internal memory
+	{0x0F00a080,0x1C000000},
+	//Memcontroller Default values
+	{0x0F007000,0x00010001},
+	{0x0F007004,0x01010100},
+	{0x0F007008,0x01000001},
+	{0x0F00700c,0x00000000},
+	{0x0F007010,0x01000000},
+	{0x0F007014,0x01000100},
+	{0x0F007018,0x01000000},
+	{0x0F00701c,0x01020000},// POP - 0x00020001 Normal 0x01020001
+	{0x0F007020,0x04020107}, //Normal - 0x04030107 POP - 0x05030107
+	{0x0F007024,0x00000007},
+	{0x0F007028,0x01020200},
+	{0x0F00702c,0x0204040a},//ROB- 0x0205050a,//0x0206060a
+	{0x0F007030,0x06000000},
+	{0x0F007034,0x00000004},
+	{0x0F007038,0x1F080200},//ROB - 0x110a0200,//0x180a0200,// 0x1f0a0200
+	{0x0F00703C,0x0203031F},//ROB - 0x02101010,//0x02101018,
+	{0x0F007040,0x6e001200},//ROB - 0x45751200,//0x450f1200,
+	{0x0F007044,0x011a0a00},//ROB - 0x110a0d00//0x111f0d00
+	{0x0F007048,0x03000305},
+	{0x0F00704c,0x00000000},
+	{0x0F007050,0x0100001c},
+	{0x0F007054,0x00000000},
+	{0x0F007058,0x00000000},
+	{0x0F00705c,0x00000000},
+	{0x0F007060,0x00082ED6},
+	{0x0F007064,0x0000000A},
+	{0x0F007068,0x00000000},
+	{0x0F00706c,0x00000001},
+	{0x0F007070,0x00005000},
+	{0x0F007074,0x00000000},
+	{0x0F007078,0x00000000},
+	{0x0F00707C,0x00000000},
+	{0x0F007080,0x00000000},
+	{0x0F007084,0x00000000},
+	{0x0F007088,0x01000001},
+	{0x0F00708c,0x00000101},
+	{0x0F007090,0x00000000},
+	{0x0F007094,0x00010000},
+	{0x0F007098,0x00000000},
+	{0x0F0070C8,0x00000104},
+	//# Enable 2 ports within X-bar
+	{0x0F00A000,0x00000016},
+	//# Enable start bit within memory controller
+	{0x0F007018,0x01010000}
 };
 
 #define T3LPB_SKIP_CLOCK_PROGRAM_DUMP_80MHZ 7  //index for 0x0F007000
 static DDR_SET_NODE asT3LPB_DDRSetting80MHz[]= {//	# DPLL Clock Setting
-								{0x0f000820,0x07F13FFF},
-								{0x0f000810,0x00002F95},
-								{0x0f000860,0x00000000},
-								{0x0f000880,0x000003DD},
-								{0x0f000840,0x0FFF1F00},
-								{0x0F00a044,0x1fffffff},
-								{0x0F00a040,0x1f000000},
-								{0x0f003050,0x00000021},//flash/eeprom clock divisor which set the flash clock to 20 MHz
-								{0x0F00a084,0x1Cffffff},// dump from here in internal memory
-								{0x0F00a080,0x1C000000},
-								{0x0F00A000,0x00000016},
-								{0x0f007000,0x00010001},
-								{0x0f007004,0x01000000},
-								{0x0f007008,0x01000001},
-								{0x0f00700c,0x00000000},
-								{0x0f007010,0x01000000},
-								{0x0f007014,0x01000100},
-								{0x0f007018,0x01000000},
-								{0x0f00701c,0x01020000},
-								{0x0f007020,0x04020107},
-								{0x0f007024,0x00000007},
-								{0x0f007028,0x02020200},
-								{0x0f00702c,0x0204040a},
-								{0x0f007030,0x04000000},
-								{0x0f007034,0x00000002},
-								{0x0f007038,0x1d060200},
-								{0x0f00703c,0x1c22221d},
-								{0x0f007040,0x8A116600},
-								{0x0f007044,0x222d0800},
-								{0x0f007048,0x02690204},
-								{0x0f00704c,0x00000000},
-								{0x0f007050,0x0100001c},
-								{0x0f007054,0x00000000},
-								{0x0f007058,0x00000000},
-								{0x0f00705c,0x00000000},
-								{0x0f007060,0x000A15D6},
-								{0x0f007064,0x0000000A},
-								{0x0f007068,0x00000000},
-								{0x0f00706c,0x00000001},
-								{0x0f007070,0x00004000},
-								{0x0f007074,0x00000000},
-								{0x0f007078,0x00000000},
-								{0x0f00707c,0x00000000},
-								{0x0f007080,0x00000000},
-								{0x0f007084,0x00000000},
-								{0x0f007088,0x01000001},
-								{0x0f00708c,0x00000101},
-								{0x0f007090,0x00000000},
-								{0x0f007094,0x00010000},
-								{0x0f007098,0x00000000},
-								{0x0F0070C8,0x00000104},
-								{0x0F007018,0x01010000}
+	{0x0f000820,0x07F13FFF},
+	{0x0f000810,0x00002F95},
+	{0x0f000860,0x00000000},
+	{0x0f000880,0x000003DD},
+	{0x0f000840,0x0FFF1F00},
+	{0x0F00a044,0x1fffffff},
+	{0x0F00a040,0x1f000000},
+	{0x0f003050,0x00000021},//flash/eeprom clock divisor which set the flash clock to 20 MHz
+	{0x0F00a084,0x1Cffffff},// dump from here in internal memory
+	{0x0F00a080,0x1C000000},
+	{0x0F00A000,0x00000016},
+	{0x0f007000,0x00010001},
+	{0x0f007004,0x01000000},
+	{0x0f007008,0x01000001},
+	{0x0f00700c,0x00000000},
+	{0x0f007010,0x01000000},
+	{0x0f007014,0x01000100},
+	{0x0f007018,0x01000000},
+	{0x0f00701c,0x01020000},
+	{0x0f007020,0x04020107},
+	{0x0f007024,0x00000007},
+	{0x0f007028,0x02020200},
+	{0x0f00702c,0x0204040a},
+	{0x0f007030,0x04000000},
+	{0x0f007034,0x00000002},
+	{0x0f007038,0x1d060200},
+	{0x0f00703c,0x1c22221d},
+	{0x0f007040,0x8A116600},
+	{0x0f007044,0x222d0800},
+	{0x0f007048,0x02690204},
+	{0x0f00704c,0x00000000},
+	{0x0f007050,0x0100001c},
+	{0x0f007054,0x00000000},
+	{0x0f007058,0x00000000},
+	{0x0f00705c,0x00000000},
+	{0x0f007060,0x000A15D6},
+	{0x0f007064,0x0000000A},
+	{0x0f007068,0x00000000},
+	{0x0f00706c,0x00000001},
+	{0x0f007070,0x00004000},
+	{0x0f007074,0x00000000},
+	{0x0f007078,0x00000000},
+	{0x0f00707c,0x00000000},
+	{0x0f007080,0x00000000},
+	{0x0f007084,0x00000000},
+	{0x0f007088,0x01000001},
+	{0x0f00708c,0x00000101},
+	{0x0f007090,0x00000000},
+	{0x0f007094,0x00010000},
+	{0x0f007098,0x00000000},
+	{0x0F0070C8,0x00000104},
+	{0x0F007018,0x01010000}
 };
 
 
@@ -781,37 +781,37 @@ int ddr_init(MINI_ADAPTER *Adapter)
 	UINT uiClockSetting = 0;
 	int retval = STATUS_SUCCESS;
 
-    switch (Adapter->chip_id)
+	switch (Adapter->chip_id)
 	{
 	case 0xbece3200:
-	    switch (Adapter->DDRSetting)
-	    {
-	        case DDR_80_MHZ:
-				psDDRSetting=asT3LP_DDRSetting80MHz;
-			    RegCount=(sizeof(asT3LP_DDRSetting80MHz)/
-			  	sizeof(DDR_SETTING));
-			    break;
-		    case DDR_100_MHZ:
-				psDDRSetting=asT3LP_DDRSetting100MHz;
-			    RegCount=(sizeof(asT3LP_DDRSetting100MHz)/
-			  	sizeof(DDR_SETTING));
-			    break;
-		    case DDR_133_MHZ:
-				psDDRSetting=asT3LP_DDRSetting133MHz;
-			    RegCount=(sizeof(asT3LP_DDRSetting133MHz)/
-		 	  		sizeof(DDR_SETTING));
-				if(Adapter->bMipsConfig == MIPS_200_MHZ)
-				{
-					uiClockSetting = 0x03F13652;
-				}
-				else
-				{
-					uiClockSetting = 0x03F1365B;
-				}
-				break;
-		    default:
-			    return -EINVAL;
-        }
+		switch (Adapter->DDRSetting)
+		{
+		case DDR_80_MHZ:
+			psDDRSetting=asT3LP_DDRSetting80MHz;
+			RegCount=(sizeof(asT3LP_DDRSetting80MHz)/
+				  sizeof(DDR_SETTING));
+			break;
+		case DDR_100_MHZ:
+			psDDRSetting=asT3LP_DDRSetting100MHz;
+			RegCount=(sizeof(asT3LP_DDRSetting100MHz)/
+				  sizeof(DDR_SETTING));
+			break;
+		case DDR_133_MHZ:
+			psDDRSetting=asT3LP_DDRSetting133MHz;
+			RegCount=(sizeof(asT3LP_DDRSetting133MHz)/
+				  sizeof(DDR_SETTING));
+			if(Adapter->bMipsConfig == MIPS_200_MHZ)
+			{
+				uiClockSetting = 0x03F13652;
+			}
+			else
+			{
+				uiClockSetting = 0x03F1365B;
+			}
+			break;
+		default:
+			return -EINVAL;
+		}
 
 		break;
 	case T3LPB:
@@ -823,69 +823,69 @@ int ddr_init(MINI_ADAPTER *Adapter)
 		 * (please check current value and additionally set these bits)
 		 */
 		if( (Adapter->chip_id !=  BCS220_2) &&
-			(Adapter->chip_id !=  BCS220_2BC) &&
-			(Adapter->chip_id != BCS220_3) )
+		    (Adapter->chip_id !=  BCS220_2BC) &&
+		    (Adapter->chip_id != BCS220_3) )
 		{
-				retval= rdmalt(Adapter,(UINT)0x0f000830, &uiResetValue, sizeof(uiResetValue));
-				if(retval < 0) {
-					bcm_dbg(Adapter, CMHOST, RDM, ALL,
-						"%s:%d RDM failed\n",
-						__func__, __LINE__);
-					return retval;
-				}
-				uiResetValue |= 0x44;
-				retval = wrmalt(Adapter,(UINT)0x0f000830, &uiResetValue, sizeof(uiResetValue));
-				if(retval < 0) {
-					bcm_dbg(Adapter, CMHOST, WRM, ALL,
-						"%s:%d WRM failed\n",
-						__func__, __LINE__);
-					return retval;
-				}
+			retval= rdmalt(Adapter,(UINT)0x0f000830, &uiResetValue, sizeof(uiResetValue));
+			if(retval < 0) {
+				bcm_dbg(Adapter, CMHOST, RDM, ALL,
+					"%s:%d RDM failed\n",
+					__func__, __LINE__);
+				return retval;
+			}
+			uiResetValue |= 0x44;
+			retval = wrmalt(Adapter,(UINT)0x0f000830, &uiResetValue, sizeof(uiResetValue));
+			if(retval < 0) {
+				bcm_dbg(Adapter, CMHOST, WRM, ALL,
+					"%s:%d WRM failed\n",
+					__func__, __LINE__);
+				return retval;
+			}
 		}
 		switch(Adapter->DDRSetting)
 		{
 
 
 
-			case DDR_80_MHZ:
-				psDDRSetting = asT3LPB_DDRSetting80MHz;
-		        RegCount=(sizeof(asT3B_DDRSetting80MHz)/
-		                  sizeof(DDR_SETTING));
+		case DDR_80_MHZ:
+			psDDRSetting = asT3LPB_DDRSetting80MHz;
+			RegCount=(sizeof(asT3B_DDRSetting80MHz)/
+				  sizeof(DDR_SETTING));
 			break;
-            case DDR_100_MHZ:
-				psDDRSetting=asT3LPB_DDRSetting100MHz;
-		        RegCount=(sizeof(asT3B_DDRSetting100MHz)/
-		                 sizeof(DDR_SETTING));
+		case DDR_100_MHZ:
+			psDDRSetting=asT3LPB_DDRSetting100MHz;
+			RegCount=(sizeof(asT3B_DDRSetting100MHz)/
+				  sizeof(DDR_SETTING));
 			break;
-            case DDR_133_MHZ:
-				psDDRSetting = asT3LPB_DDRSetting133MHz;
-				RegCount=(sizeof(asT3B_DDRSetting133MHz)/
-						 sizeof(DDR_SETTING));
+		case DDR_133_MHZ:
+			psDDRSetting = asT3LPB_DDRSetting133MHz;
+			RegCount=(sizeof(asT3B_DDRSetting133MHz)/
+				  sizeof(DDR_SETTING));
 
-				if(Adapter->bMipsConfig == MIPS_200_MHZ)
-				{
-					uiClockSetting = 0x03F13652;
-				}
-				else
-				{
-					uiClockSetting = 0x03F1365B;
-				}
+			if(Adapter->bMipsConfig == MIPS_200_MHZ)
+			{
+				uiClockSetting = 0x03F13652;
+			}
+			else
+			{
+				uiClockSetting = 0x03F1365B;
+			}
 			break;
 
-			case DDR_160_MHZ:
-				psDDRSetting = asT3LPB_DDRSetting160MHz;
-				RegCount = sizeof(asT3LPB_DDRSetting160MHz)/sizeof(DDR_SETTING);
+		case DDR_160_MHZ:
+			psDDRSetting = asT3LPB_DDRSetting160MHz;
+			RegCount = sizeof(asT3LPB_DDRSetting160MHz)/sizeof(DDR_SETTING);
 
-				if(Adapter->bMipsConfig == MIPS_200_MHZ)
-				{
-					uiClockSetting = 0x03F137D2;
-				}
-				else
-				{
-					uiClockSetting = 0x03F137DB;
-				}
+			if(Adapter->bMipsConfig == MIPS_200_MHZ)
+			{
+				uiClockSetting = 0x03F137D2;
 			}
-			break;
+			else
+			{
+				uiClockSetting = 0x03F137DB;
+			}
+		}
+		break;
 
 	case 0xbece0110:
 	case 0xbece0120:
@@ -894,67 +894,67 @@ int ddr_init(MINI_ADAPTER *Adapter)
 	case 0xbece0300:
 		bcm_dbg(Adapter, INITEXIT, DRV_ENTRY, ALL,
 			"DDR Setting: %x\n", Adapter->DDRSetting);
-	    switch (Adapter->DDRSetting)
-	    {
-	        case DDR_80_MHZ:
-				psDDRSetting = asT3_DDRSetting80MHz;
-			    RegCount = (sizeof(asT3_DDRSetting80MHz)/
-			  	sizeof(DDR_SETTING));
-			    break;
-		    case DDR_100_MHZ:
-				psDDRSetting = asT3_DDRSetting100MHz;
-			    RegCount = (sizeof(asT3_DDRSetting100MHz)/
-			  	sizeof(DDR_SETTING));
-			    break;
-		    case DDR_133_MHZ:
-				psDDRSetting = asT3_DDRSetting133MHz;
-			    RegCount = (sizeof(asT3_DDRSetting133MHz)/
-		 	  	sizeof(DDR_SETTING));
-				break;
-		    default:
-			    return -EINVAL;
-        }
+		switch (Adapter->DDRSetting)
+		{
+		case DDR_80_MHZ:
+			psDDRSetting = asT3_DDRSetting80MHz;
+			RegCount = (sizeof(asT3_DDRSetting80MHz)/
+				    sizeof(DDR_SETTING));
+			break;
+		case DDR_100_MHZ:
+			psDDRSetting = asT3_DDRSetting100MHz;
+			RegCount = (sizeof(asT3_DDRSetting100MHz)/
+				    sizeof(DDR_SETTING));
+			break;
+		case DDR_133_MHZ:
+			psDDRSetting = asT3_DDRSetting133MHz;
+			RegCount = (sizeof(asT3_DDRSetting133MHz)/
+				    sizeof(DDR_SETTING));
+			break;
+		default:
+			return -EINVAL;
+		}
 	case 0xbece0310:
 	{
-	    switch (Adapter->DDRSetting)
-	    {
-	        case DDR_80_MHZ:
-				psDDRSetting = asT3B_DDRSetting80MHz;
-		        RegCount=(sizeof(asT3B_DDRSetting80MHz)/
-		                  sizeof(DDR_SETTING));
-		    break;
-            case DDR_100_MHZ:
-				psDDRSetting=asT3B_DDRSetting100MHz;
-		        RegCount=(sizeof(asT3B_DDRSetting100MHz)/
-		                 sizeof(DDR_SETTING));
+		switch (Adapter->DDRSetting)
+		{
+		case DDR_80_MHZ:
+			psDDRSetting = asT3B_DDRSetting80MHz;
+			RegCount=(sizeof(asT3B_DDRSetting80MHz)/
+				  sizeof(DDR_SETTING));
+			break;
+		case DDR_100_MHZ:
+			psDDRSetting=asT3B_DDRSetting100MHz;
+			RegCount=(sizeof(asT3B_DDRSetting100MHz)/
+				  sizeof(DDR_SETTING));
 			break;
-            case DDR_133_MHZ:
+		case DDR_133_MHZ:
 
-				if(Adapter->bDPLLConfig == PLL_266_MHZ)//266Mhz PLL selected.
+			if(Adapter->bDPLLConfig == PLL_266_MHZ)//266Mhz PLL selected.
+			{
+				memcpy(asT3B_DDRSetting133MHz, asDPLL_266MHZ,
+				       sizeof(asDPLL_266MHZ));
+				psDDRSetting = asT3B_DDRSetting133MHz;
+				RegCount=(sizeof(asT3B_DDRSetting133MHz)/
+					  sizeof(DDR_SETTING));
+			}
+			else
+			{
+				psDDRSetting = asT3B_DDRSetting133MHz;
+				RegCount=(sizeof(asT3B_DDRSetting133MHz)/
+					  sizeof(DDR_SETTING));
+				if(Adapter->bMipsConfig == MIPS_200_MHZ)
 				{
-					memcpy(asT3B_DDRSetting133MHz, asDPLL_266MHZ,
-									 sizeof(asDPLL_266MHZ));
-					psDDRSetting = asT3B_DDRSetting133MHz;
-					RegCount=(sizeof(asT3B_DDRSetting133MHz)/
-									sizeof(DDR_SETTING));
+					uiClockSetting = 0x07F13652;
 				}
 				else
 				{
-					psDDRSetting = asT3B_DDRSetting133MHz;
-					RegCount=(sizeof(asT3B_DDRSetting133MHz)/
-									sizeof(DDR_SETTING));
-					if(Adapter->bMipsConfig == MIPS_200_MHZ)
-					{
-						uiClockSetting = 0x07F13652;
-					}
-					else
-					{
-						uiClockSetting = 0x07F1365B;
-					}
+					uiClockSetting = 0x07F1365B;
 				}
-				break;
-		    default:
-			    return -EINVAL;
+			}
+			break;
+		default:
+			return -EINVAL;
 		}
 		break;
 
@@ -991,8 +991,8 @@ int ddr_init(MINI_ADAPTER *Adapter)
 
 		mdelay(3);
 		if( (Adapter->chip_id != BCS220_2)&&
-			(Adapter->chip_id != BCS220_2BC)&&
-			(Adapter->chip_id != BCS220_3))
+		    (Adapter->chip_id != BCS220_2BC)&&
+		    (Adapter->chip_id != BCS220_3))
 		{
 			/* drive MDDR to half in case of UMA-B:	*/
 			uiResetValue = 0x01010001;
@@ -1034,8 +1034,8 @@ int ddr_init(MINI_ADAPTER *Adapter)
 		 * This is to be done only for Hybrid PMU mode.
 		 * with the current h/w there is no way to detect this.
 		 * and since we dont have internal PMU lets do it under UMA-B chip id.
-	     * we will change this when we will have internal PMU.
-	     */
+		 * we will change this when we will have internal PMU.
+		 */
 		if(Adapter->PmuMode == HYBRID_MODE_7C)
 		{
 			retval = rdmalt(Adapter,(UINT)0x0f000c00, &uiResetValue, sizeof(uiResetValue));
@@ -1148,30 +1148,30 @@ int download_ddr_settings(PMINI_ADAPTER Adapter)
 	switch (Adapter->chip_id)
 	{
 	case 0xbece3200:
-	    switch (Adapter->DDRSetting)
-	    {
-	        case DDR_80_MHZ:
-				psDDRSetting = asT3LP_DDRSetting80MHz;
-                RegCount = (sizeof(asT3LP_DDRSetting80MHz)/sizeof(DDR_SET_NODE));
-				RegCount -= T3LP_SKIP_CLOCK_PROGRAM_DUMP_80MHZ ;
-                psDDRSetting += T3LP_SKIP_CLOCK_PROGRAM_DUMP_80MHZ;
+		switch (Adapter->DDRSetting)
+		{
+		case DDR_80_MHZ:
+			psDDRSetting = asT3LP_DDRSetting80MHz;
+			RegCount = (sizeof(asT3LP_DDRSetting80MHz)/sizeof(DDR_SET_NODE));
+			RegCount -= T3LP_SKIP_CLOCK_PROGRAM_DUMP_80MHZ ;
+			psDDRSetting += T3LP_SKIP_CLOCK_PROGRAM_DUMP_80MHZ;
+			break;
+		case DDR_100_MHZ:
+			psDDRSetting = asT3LP_DDRSetting100MHz;
+			RegCount = (sizeof(asT3LP_DDRSetting100MHz)/sizeof(DDR_SET_NODE));
+			RegCount -= T3LP_SKIP_CLOCK_PROGRAM_DUMP_100MHZ ;
+			psDDRSetting += T3LP_SKIP_CLOCK_PROGRAM_DUMP_100MHZ;
+			break;
+		case DDR_133_MHZ:
+			bOverrideSelfRefresh = TRUE;
+			psDDRSetting = asT3LP_DDRSetting133MHz;
+			RegCount = (sizeof(asT3LP_DDRSetting133MHz)/sizeof(DDR_SET_NODE));
+			RegCount -= T3LP_SKIP_CLOCK_PROGRAM_DUMP_133MHZ ;
+			psDDRSetting += T3LP_SKIP_CLOCK_PROGRAM_DUMP_133MHZ;
 			break;
-		    case DDR_100_MHZ:
-				psDDRSetting = asT3LP_DDRSetting100MHz;
-			    RegCount = (sizeof(asT3LP_DDRSetting100MHz)/sizeof(DDR_SET_NODE));
-				RegCount -= T3LP_SKIP_CLOCK_PROGRAM_DUMP_100MHZ ;
-                psDDRSetting += T3LP_SKIP_CLOCK_PROGRAM_DUMP_100MHZ;
-			    break;
-		     case DDR_133_MHZ:
-				bOverrideSelfRefresh = TRUE;
-				psDDRSetting = asT3LP_DDRSetting133MHz;
-			    RegCount = (sizeof(asT3LP_DDRSetting133MHz)/sizeof(DDR_SET_NODE));
-				RegCount -= T3LP_SKIP_CLOCK_PROGRAM_DUMP_133MHZ ;
-		        psDDRSetting += T3LP_SKIP_CLOCK_PROGRAM_DUMP_133MHZ;
-				break;
-			default:
-			    return -EINVAL;
-        }
+		default:
+			return -EINVAL;
+		}
 		break;
 
 	case T3LPB:
@@ -1179,91 +1179,91 @@ int download_ddr_settings(PMINI_ADAPTER Adapter)
 	case BCS220_2BC:
 	case BCS250_BC:
 	case BCS220_3 :
-	    switch (Adapter->DDRSetting)
-	    {
-	        case DDR_80_MHZ:
-				psDDRSetting = asT3LPB_DDRSetting80MHz;
-                RegCount=(sizeof(asT3LPB_DDRSetting80MHz)/sizeof(DDR_SET_NODE));
-				RegCount -= T3LPB_SKIP_CLOCK_PROGRAM_DUMP_80MHZ ;
-                psDDRSetting += T3LPB_SKIP_CLOCK_PROGRAM_DUMP_80MHZ;
+		switch (Adapter->DDRSetting)
+		{
+		case DDR_80_MHZ:
+			psDDRSetting = asT3LPB_DDRSetting80MHz;
+			RegCount=(sizeof(asT3LPB_DDRSetting80MHz)/sizeof(DDR_SET_NODE));
+			RegCount -= T3LPB_SKIP_CLOCK_PROGRAM_DUMP_80MHZ ;
+			psDDRSetting += T3LPB_SKIP_CLOCK_PROGRAM_DUMP_80MHZ;
+			break;
+		case DDR_100_MHZ:
+			psDDRSetting = asT3LPB_DDRSetting100MHz;
+			RegCount = (sizeof(asT3LPB_DDRSetting100MHz)/sizeof(DDR_SET_NODE));
+			RegCount -= T3LPB_SKIP_CLOCK_PROGRAM_DUMP_100MHZ ;
+			psDDRSetting += T3LPB_SKIP_CLOCK_PROGRAM_DUMP_100MHZ;
+			break;
+		case DDR_133_MHZ:
+			bOverrideSelfRefresh = TRUE;
+			psDDRSetting = asT3LPB_DDRSetting133MHz;
+			RegCount = (sizeof(asT3LPB_DDRSetting133MHz)/sizeof(DDR_SET_NODE));
+			RegCount -= T3LPB_SKIP_CLOCK_PROGRAM_DUMP_133MHZ ;
+			psDDRSetting += T3LPB_SKIP_CLOCK_PROGRAM_DUMP_133MHZ;
 			break;
-		    case DDR_100_MHZ:
-				psDDRSetting = asT3LPB_DDRSetting100MHz;
-			    RegCount = (sizeof(asT3LPB_DDRSetting100MHz)/sizeof(DDR_SET_NODE));
-				RegCount -= T3LPB_SKIP_CLOCK_PROGRAM_DUMP_100MHZ ;
-                psDDRSetting += T3LPB_SKIP_CLOCK_PROGRAM_DUMP_100MHZ;
-			    break;
-		     case DDR_133_MHZ:
-				bOverrideSelfRefresh = TRUE;
-				psDDRSetting = asT3LPB_DDRSetting133MHz;
-			    RegCount = (sizeof(asT3LPB_DDRSetting133MHz)/sizeof(DDR_SET_NODE));
-				RegCount -= T3LPB_SKIP_CLOCK_PROGRAM_DUMP_133MHZ ;
-		        psDDRSetting += T3LPB_SKIP_CLOCK_PROGRAM_DUMP_133MHZ;
-				break;
 
-			case DDR_160_MHZ:
-					bOverrideSelfRefresh = TRUE;
-					psDDRSetting = asT3LPB_DDRSetting160MHz;
-					RegCount = sizeof(asT3LPB_DDRSetting160MHz)/sizeof(DDR_SET_NODE);
-					RegCount -= T3LPB_SKIP_CLOCK_PROGRAM_DUMP_160MHZ;
-					psDDRSetting += T3LPB_SKIP_CLOCK_PROGRAM_DUMP_160MHZ;
+		case DDR_160_MHZ:
+			bOverrideSelfRefresh = TRUE;
+			psDDRSetting = asT3LPB_DDRSetting160MHz;
+			RegCount = sizeof(asT3LPB_DDRSetting160MHz)/sizeof(DDR_SET_NODE);
+			RegCount -= T3LPB_SKIP_CLOCK_PROGRAM_DUMP_160MHZ;
+			psDDRSetting += T3LPB_SKIP_CLOCK_PROGRAM_DUMP_160MHZ;
 
-					break;
-			default:
-			    return -EINVAL;
-        }
+			break;
+		default:
+			return -EINVAL;
+		}
 		break;
 	case 0xbece0300:
-	    switch (Adapter->DDRSetting)
-	    {
-	        case DDR_80_MHZ:
-				psDDRSetting = asT3_DDRSetting80MHz;
-                RegCount = (sizeof(asT3_DDRSetting80MHz)/sizeof(DDR_SET_NODE));
-				RegCount-=T3_SKIP_CLOCK_PROGRAM_DUMP_80MHZ ;
-                psDDRSetting += T3_SKIP_CLOCK_PROGRAM_DUMP_80MHZ;
+		switch (Adapter->DDRSetting)
+		{
+		case DDR_80_MHZ:
+			psDDRSetting = asT3_DDRSetting80MHz;
+			RegCount = (sizeof(asT3_DDRSetting80MHz)/sizeof(DDR_SET_NODE));
+			RegCount-=T3_SKIP_CLOCK_PROGRAM_DUMP_80MHZ ;
+			psDDRSetting += T3_SKIP_CLOCK_PROGRAM_DUMP_80MHZ;
+			break;
+		case DDR_100_MHZ:
+			psDDRSetting = asT3_DDRSetting100MHz;
+			RegCount = (sizeof(asT3_DDRSetting100MHz)/sizeof(DDR_SET_NODE));
+			RegCount-=T3_SKIP_CLOCK_PROGRAM_DUMP_100MHZ ;
+			psDDRSetting += T3_SKIP_CLOCK_PROGRAM_DUMP_100MHZ;
 			break;
-		    case DDR_100_MHZ:
-				psDDRSetting = asT3_DDRSetting100MHz;
-			    RegCount = (sizeof(asT3_DDRSetting100MHz)/sizeof(DDR_SET_NODE));
-				RegCount-=T3_SKIP_CLOCK_PROGRAM_DUMP_100MHZ ;
-                psDDRSetting += T3_SKIP_CLOCK_PROGRAM_DUMP_100MHZ;
-			    break;
-		     case DDR_133_MHZ:
-				psDDRSetting = asT3_DDRSetting133MHz;
-			    RegCount = (sizeof(asT3_DDRSetting133MHz)/sizeof(DDR_SET_NODE));
-				RegCount-=T3_SKIP_CLOCK_PROGRAM_DUMP_133MHZ ;
-		        psDDRSetting += T3_SKIP_CLOCK_PROGRAM_DUMP_133MHZ ;
-				break;
-			default:
-			    return -EINVAL;
-        }
-	break;
+		case DDR_133_MHZ:
+			psDDRSetting = asT3_DDRSetting133MHz;
+			RegCount = (sizeof(asT3_DDRSetting133MHz)/sizeof(DDR_SET_NODE));
+			RegCount-=T3_SKIP_CLOCK_PROGRAM_DUMP_133MHZ ;
+			psDDRSetting += T3_SKIP_CLOCK_PROGRAM_DUMP_133MHZ ;
+			break;
+		default:
+			return -EINVAL;
+		}
+		break;
 	case 0xbece0310:
-	    {
-		    switch (Adapter->DDRSetting)
-		    {
-		        case DDR_80_MHZ:
-					psDDRSetting = asT3B_DDRSetting80MHz;
-                    RegCount = (sizeof(asT3B_DDRSetting80MHz)/sizeof(DDR_SET_NODE));
-                    RegCount -= T3B_SKIP_CLOCK_PROGRAM_DUMP_80MHZ ;
-                    psDDRSetting += T3B_SKIP_CLOCK_PROGRAM_DUMP_80MHZ;
-			        break;
-		        case DDR_100_MHZ:
-					psDDRSetting = asT3B_DDRSetting100MHz;
-			        RegCount = (sizeof(asT3B_DDRSetting100MHz)/sizeof(DDR_SET_NODE));
-                    RegCount -= T3B_SKIP_CLOCK_PROGRAM_DUMP_100MHZ ;
-                    psDDRSetting += T3B_SKIP_CLOCK_PROGRAM_DUMP_100MHZ;
-			        break;
-		        case DDR_133_MHZ:
-					bOverrideSelfRefresh = TRUE;
-					psDDRSetting = asT3B_DDRSetting133MHz;
-			        RegCount = (sizeof(asT3B_DDRSetting133MHz)/sizeof(DDR_SET_NODE));
-	                RegCount -= T3B_SKIP_CLOCK_PROGRAM_DUMP_133MHZ ;
-		            psDDRSetting += T3B_SKIP_CLOCK_PROGRAM_DUMP_133MHZ;
-					break;
-		      }
-		      break;
-	     }
+	{
+		switch (Adapter->DDRSetting)
+		{
+		case DDR_80_MHZ:
+			psDDRSetting = asT3B_DDRSetting80MHz;
+			RegCount = (sizeof(asT3B_DDRSetting80MHz)/sizeof(DDR_SET_NODE));
+			RegCount -= T3B_SKIP_CLOCK_PROGRAM_DUMP_80MHZ ;
+			psDDRSetting += T3B_SKIP_CLOCK_PROGRAM_DUMP_80MHZ;
+			break;
+		case DDR_100_MHZ:
+			psDDRSetting = asT3B_DDRSetting100MHz;
+			RegCount = (sizeof(asT3B_DDRSetting100MHz)/sizeof(DDR_SET_NODE));
+			RegCount -= T3B_SKIP_CLOCK_PROGRAM_DUMP_100MHZ ;
+			psDDRSetting += T3B_SKIP_CLOCK_PROGRAM_DUMP_100MHZ;
+			break;
+		case DDR_133_MHZ:
+			bOverrideSelfRefresh = TRUE;
+			psDDRSetting = asT3B_DDRSetting133MHz;
+			RegCount = (sizeof(asT3B_DDRSetting133MHz)/sizeof(DDR_SET_NODE));
+			RegCount -= T3B_SKIP_CLOCK_PROGRAM_DUMP_133MHZ ;
+			psDDRSetting += T3B_SKIP_CLOCK_PROGRAM_DUMP_133MHZ;
+			break;
+		}
+		break;
+	}
 	default:
 		return -EINVAL;
 	}
@@ -1300,7 +1300,7 @@ int download_ddr_settings(PMINI_ADAPTER Adapter)
 			{
 				value = (psDDRSetting->ulRegValue |(1<<8));
 				if(STATUS_SUCCESS != wrmalt(Adapter, ul_ddr_setting_load_addr,
-						&value, sizeof(value))){
+							    &value, sizeof(value))){
 					pr_info("%s:%d\n", __func__, __LINE__);
 					break;
 				}
@@ -1310,7 +1310,7 @@ int download_ddr_settings(PMINI_ADAPTER Adapter)
 				value =  psDDRSetting->ulRegValue;
 
 				if(STATUS_SUCCESS != wrmalt(Adapter, ul_ddr_setting_load_addr ,
-							&value, sizeof(value))){
+							    &value, sizeof(value))){
 					pr_info("%s:%d\n", __func__, __LINE__);
 					break;
 				}
diff --git a/drivers/staging/bcm/Debug.h b/drivers/staging/bcm/Debug.h
index c7d49da..cddf47f 100644
--- a/drivers/staging/bcm/Debug.h
+++ b/drivers/staging/bcm/Debug.h
@@ -29,8 +29,8 @@
 /*-----------------BEGIN SUBTYPEs---------------------------------------*/
 
 /*-SUBTYPEs for TX :  TYPE is DBG_TYPE_TX -----//
- Transmit.c ,Arp.c, LeakyBucket.c, And Qos.c
- total 17 macros */
+  Transmit.c ,Arp.c, LeakyBucket.c, And Qos.c
+  total 17 macros */
 // Transmit.c
 #define TX 			1
 #define MP_SEND  	(TX<<0)
@@ -67,7 +67,7 @@
 
 //--SUBTYPEs for ------INIT & EXIT---------------------
 /*------------ TYPE is DBG_TYPE_INITEXIT -----//
-DriverEntry.c, bcmfwup.c, ChipDetectTask.c, HaltnReset.c, InterfaceDDR.c */
+  DriverEntry.c, bcmfwup.c, ChipDetectTask.c, HaltnReset.c, InterfaceDDR.c */
 #define MP 1
 #define DRV_ENTRY 	(MP<<0)
 #define MP_INIT  	(MP<<1)
@@ -177,7 +177,7 @@ DriverEntry.c, bcmfwup.c, ChipDetectTask.c, HaltnReset.c, InterfaceDDR.c */
 /* The current driver logging level.
  * Everything at this level and (numerically) lower (meaning higher prio)
  * is logged.
-* Replace 'BCM_ALL' in the DBG_LVL_CURR macro with the logging level desired.
+ * Replace 'BCM_ALL' in the DBG_LVL_CURR macro with the logging level desired.
  * For eg. to set the logging level to 'errors only' use:
  *	 #define DBG_LVL_CURR	(BCM_ERR)
  */
@@ -227,17 +227,20 @@ do {									\
 		pr_debug(fmt, ##__VA_ARGS__);				\
 } while (0)
 
-#define BCM_DEBUG_PRINT_BUFFER(Adapter, Type, SubType, dbg_level,  buffer, bufferlen) do { \
+#define BCM_DEBUG_PRINT_BUFFER(Adapter, Type, SubType,			\
+			       dbg_level,  buffer, bufferlen)		\
+do {									\
 	if (DBG_TYPE_PRINTK == Type ||					\
-	    (Adapter &&							\
-	     (dbg_level & DBG_LVL_BITMASK) <= Adapter->stDebugState.debug_level  && \
-	     (Type & Adapter->stDebugState.type) &&			\
-	     (SubType & Adapter->stDebugState.subtype[Type]))) {	\
+	    ((Adapter) &&						\
+	     (dbg_level & DBG_LVL_BITMASK) <=				\
+	     (Adapter)->stDebugState.debug_level &&			\
+	     (Type & (Adapter)->stDebugState.type) &&			\
+	     (SubType & (Adapter)->stDebugState.subtype[Type]))) {	\
 		printk(KERN_DEBUG "%s:\n", __func__);			\
 		print_hex_dump(KERN_DEBUG, " ", DUMP_PREFIX_OFFSET,	\
 			       16, 1, buffer, bufferlen, false);	\
 	}								\
-} while(0)
+} while (0)
 
 
 #define BCM_SHOW_DEBUG_BITMAP(Adapter)					\
diff --git a/drivers/staging/bcm/HandleControlPacket.c b/drivers/staging/bcm/HandleControlPacket.c
index 1a680f0..56ecc1f 100644
--- a/drivers/staging/bcm/HandleControlPacket.c
+++ b/drivers/staging/bcm/HandleControlPacket.c
@@ -22,7 +22,7 @@ static VOID handle_rx_control_packet(PMINI_ADAPTER Adapter, struct sk_buff *skb)
 
 	if (netif_msg_pktdata(Adapter))
 		print_hex_dump(KERN_DEBUG, PFX "rx control: ", DUMP_PREFIX_NONE,
-				16, 1, skb->data, skb->len, 0);
+			       16, 1, skb->data, skb->len, 0);
 
 	switch (usStatus) {
 	case CM_RESPONSES:               /* 0xA0 */
@@ -34,7 +34,7 @@ static VOID handle_rx_control_packet(PMINI_ADAPTER Adapter, struct sk_buff *skb)
 		HighPriorityMessage = TRUE;
 		if (Adapter->LinkStatus == LINKUP_DONE)
 			CmControlResponseMessage(Adapter,
-				(skb->data + sizeof(USHORT)));
+						 (skb->data + sizeof(USHORT)));
 		break;
 	case LINK_CONTROL_RESP:          /* 0xA2 */
 	case STATUS_RSP:                 /* 0xA1 */
@@ -42,7 +42,7 @@ static VOID handle_rx_control_packet(PMINI_ADAPTER Adapter, struct sk_buff *skb)
 			"LINK_CONTROL_RESP\n");
 		HighPriorityMessage = TRUE;
 		LinkControlResponseMessage(Adapter,
-			(skb->data + sizeof(USHORT)));
+					   (skb->data + sizeof(USHORT)));
 		break;
 	case STATS_POINTER_RESP:         /* 0xA6 */
 		HighPriorityMessage = TRUE;
@@ -52,7 +52,7 @@ static VOID handle_rx_control_packet(PMINI_ADAPTER Adapter, struct sk_buff *skb)
 		bcm_dbg(Adapter, OTHERS, CP_CTRL_PKT, ALL,
 			"IDLE_MODE_STATUS Type Message Got from F/W\n");
 		InterfaceIdleModeRespond(Adapter, (PUINT)(skb->data +
-					sizeof(USHORT)));
+							  sizeof(USHORT)));
 		HighPriorityMessage = TRUE;
 		break;
 
@@ -92,10 +92,10 @@ static VOID handle_rx_control_packet(PMINI_ADAPTER Adapter, struct sk_buff *skb)
 			drop_pkt_flag = FALSE;
 
 		if ((drop_pkt_flag == TRUE) ||
-				(pTarang->AppCtrlQueueLen > MAX_APP_QUEUE_LEN)
-				|| ((pTarang->AppCtrlQueueLen >
-					MAX_APP_QUEUE_LEN / 2) &&
-				    (HighPriorityMessage == FALSE))) {
+		    (pTarang->AppCtrlQueueLen > MAX_APP_QUEUE_LEN)
+		    || ((pTarang->AppCtrlQueueLen >
+			 MAX_APP_QUEUE_LEN / 2) &&
+			(HighPriorityMessage == FALSE))) {
 			/*
 			 * Assumption:-
 			 * 1. every tarang manages it own dropped pkt
@@ -138,7 +138,7 @@ static VOID handle_rx_control_packet(PMINI_ADAPTER Adapter, struct sk_buff *skb)
 		if (!newPacket)
 			break;
 		ENQUEUEPACKET(pTarang->RxAppControlHead,
-				pTarang->RxAppControlTail, newPacket);
+			      pTarang->RxAppControlTail, newPacket);
 		pTarang->AppCtrlQueueLen++;
 	}
 	up(&Adapter->RxAppControlQueuelock);
@@ -162,9 +162,9 @@ int control_packet_handler(PMINI_ADAPTER Adapter /* pointer to adapter object*/)
 		"Entering to make thread wait on control packet event!\n");
 	while (1) {
 		wait_event_interruptible(Adapter->process_rx_cntrlpkt,
-			atomic_read(&Adapter->cntrlpktCnt) ||
-			Adapter->bWakeUpDevice ||
-			kthread_should_stop());
+					 atomic_read(&Adapter->cntrlpktCnt) ||
+					 Adapter->bWakeUpDevice ||
+					 kthread_should_stop());
 
 
 		if (kthread_should_stop()) {
@@ -175,8 +175,8 @@ int control_packet_handler(PMINI_ADAPTER Adapter /* pointer to adapter object*/)
 		if (TRUE == Adapter->bWakeUpDevice) {
 			Adapter->bWakeUpDevice = FALSE;
 			if ((FALSE == Adapter->bTriedToWakeUpFromlowPowerMode)
-					&& ((TRUE == Adapter->IdleMode) ||
-					    (TRUE == Adapter->bShutStatus))) {
+			    && ((TRUE == Adapter->IdleMode) ||
+				(TRUE == Adapter->bShutStatus))) {
 				bcm_dbg(Adapter, OTHERS, CP_CTRL_PKT, ALL,
 					"Calling InterfaceAbortIdlemode\n");
 				/*
@@ -193,12 +193,12 @@ int control_packet_handler(PMINI_ADAPTER Adapter /* pointer to adapter object*/)
 			ctrl_packet = Adapter->RxControlHead;
 			if (ctrl_packet) {
 				DEQUEUEPACKET(Adapter->RxControlHead,
-					Adapter->RxControlTail);
+					      Adapter->RxControlTail);
 				/* Adapter->RxControlHead=ctrl_packet->next; */
 			}
 
 			spin_unlock_irqrestore(&Adapter->control_queue_lock,
-						flags);
+					       flags);
 			handle_rx_control_packet(Adapter, ctrl_packet);
 			atomic_dec(&Adapter->cntrlpktCnt);
 		}
@@ -217,13 +217,13 @@ INT flushAllAppQ(void)
 		while (pTarang->RxAppControlHead != NULL) {
 			PacketToDrop = pTarang->RxAppControlHead;
 			DEQUEUEPACKET(pTarang->RxAppControlHead,
-					pTarang->RxAppControlTail);
+				      pTarang->RxAppControlTail);
 			dev_kfree_skb(PacketToDrop);
 		}
 		pTarang->AppCtrlQueueLen = 0;
 		/* dropped contrl packet statistics also should be reset. */
 		memset((PVOID)&pTarang->stDroppedAppCntrlMsgs, 0,
-			sizeof(S_MIBS_DROPPED_APP_CNTRL_MESSAGES));
+		       sizeof(S_MIBS_DROPPED_APP_CNTRL_MESSAGES));
 
 	}
 	return STATUS_SUCCESS;
diff --git a/drivers/staging/bcm/HostMIBSInterface.h b/drivers/staging/bcm/HostMIBSInterface.h
index e34531b..4f8e7c8 100644
--- a/drivers/staging/bcm/HostMIBSInterface.h
+++ b/drivers/staging/bcm/HostMIBSInterface.h
@@ -24,7 +24,7 @@
 
 typedef union _U_MIBS_IP_ADDRESS
 {
-    struct
+	struct
 	{
 		//Source Ip Address Range
 		ULONG		ulIpv4Addr[MIBS_MAX_IP_RANGE_LENGTH];
@@ -42,9 +42,9 @@ typedef union _U_MIBS_IP_ADDRESS
 	struct
 	{
 		UCHAR		ucIpv4Address[MIBS_MAX_IP_RANGE_LENGTH *
-									MIBS_IP_LENGTH_OF_ADDRESS];
+					      MIBS_IP_LENGTH_OF_ADDRESS];
 		UCHAR		ucIpv4Mask[MIBS_MAX_IP_RANGE_LENGTH *
-									MIBS_IP_LENGTH_OF_ADDRESS];
+					   MIBS_IP_LENGTH_OF_ADDRESS];
 	};
 	struct
 	{
@@ -167,9 +167,9 @@ typedef struct _S_MIBS_EXTSERVICEFLOW_PARAMETERS
 
 typedef struct _S_MIBS_SERVICEFLOW_TABLE
 {
-	 //classification extension Rule
+	//classification extension Rule
 	ULONG		ulSFID;
-    USHORT		usVCID_Value;
+	USHORT		usVCID_Value;
 	UINT		uiThreshold;
 	// This field determines the priority of the SF Queues
 	B_UINT8     u8TrafficPriority;
diff --git a/drivers/staging/bcm/IPv6Protocol.c b/drivers/staging/bcm/IPv6Protocol.c
index 3aff6e7..49e084c 100644
--- a/drivers/staging/bcm/IPv6Protocol.c
+++ b/drivers/staging/bcm/IPv6Protocol.c
@@ -9,7 +9,7 @@ static UCHAR * GetNextIPV6ChainedHeader(UCHAR **ppucPayload,UCHAR *pucNextHeader
 	UCHAR *pucRetHeaderPtr = NULL;
 	UCHAR *pucPayloadPtr = NULL;
 	USHORT  usNextHeaderOffset = 0 ;
-    PMINI_ADAPTER Adapter = GET_BCM_ADAPTER(gblpnetdev);
+	PMINI_ADAPTER Adapter = GET_BCM_ADAPTER(gblpnetdev);
 
 	if((NULL == ppucPayload) || (*pusPayloadLength == 0) || (*bParseDone))
 	{
@@ -35,85 +35,85 @@ static UCHAR * GetNextIPV6ChainedHeader(UCHAR **ppucPayload,UCHAR *pucNextHeader
 	switch(*pucNextHeader)
 	{
 	case IPV6HDR_TYPE_HOPBYHOP:
-		{
+	{
 
-			bcm_dbg(Adapter, TX, IPV6_DBG, ALL,
-				"IPv6 HopByHop Header\n");
-			usNextHeaderOffset+=sizeof(IPV6HopByHopOptionsHeader);
-		}
-		break;
+		bcm_dbg(Adapter, TX, IPV6_DBG, ALL,
+			"IPv6 HopByHop Header\n");
+		usNextHeaderOffset+=sizeof(IPV6HopByHopOptionsHeader);
+	}
+	break;
 
 	case IPV6HDR_TYPE_ROUTING:
-		{
-			IPV6RoutingHeader *pstIpv6RoutingHeader;
-			bcm_dbg(Adapter, TX, IPV6_DBG, ALL,
-				"IPv6 Routing Header\n");
-			pstIpv6RoutingHeader = (IPV6RoutingHeader *)pucPayloadPtr;
-			usNextHeaderOffset += sizeof(IPV6RoutingHeader);
-			usNextHeaderOffset += pstIpv6RoutingHeader->ucNumAddresses * IPV6_ADDRESS_SIZEINBYTES;
+	{
+		IPV6RoutingHeader *pstIpv6RoutingHeader;
+		bcm_dbg(Adapter, TX, IPV6_DBG, ALL,
+			"IPv6 Routing Header\n");
+		pstIpv6RoutingHeader = (IPV6RoutingHeader *)pucPayloadPtr;
+		usNextHeaderOffset += sizeof(IPV6RoutingHeader);
+		usNextHeaderOffset += pstIpv6RoutingHeader->ucNumAddresses * IPV6_ADDRESS_SIZEINBYTES;
 
-		}
-		break;
+	}
+	break;
 	case IPV6HDR_TYPE_FRAGMENTATION:
-		{
-			bcm_dbg(Adapter, TX, IPV6_DBG, ALL,
-				"IPv6 Fragmentation Header\n");
-			usNextHeaderOffset+= sizeof(IPV6FragmentHeader);
+	{
+		bcm_dbg(Adapter, TX, IPV6_DBG, ALL,
+			"IPv6 Fragmentation Header\n");
+		usNextHeaderOffset+= sizeof(IPV6FragmentHeader);
 
-		}
-		break;
+	}
+	break;
 	case IPV6HDR_TYPE_DESTOPTS:
-		{
-			IPV6DestOptionsHeader *pstIpv6DestOptsHdr = (IPV6DestOptionsHeader *)pucPayloadPtr;
-			int nTotalOptions = pstIpv6DestOptsHdr->ucHdrExtLen;
-			bcm_dbg(Adapter, TX, IPV6_DBG, ALL,
-				"IPv6 DestOpts Header Header\n");
-			usNextHeaderOffset+= sizeof(IPV6DestOptionsHeader);
-			usNextHeaderOffset+= nTotalOptions * IPV6_DESTOPTS_HDR_OPTIONSIZE ;
+	{
+		IPV6DestOptionsHeader *pstIpv6DestOptsHdr = (IPV6DestOptionsHeader *)pucPayloadPtr;
+		int nTotalOptions = pstIpv6DestOptsHdr->ucHdrExtLen;
+		bcm_dbg(Adapter, TX, IPV6_DBG, ALL,
+			"IPv6 DestOpts Header Header\n");
+		usNextHeaderOffset+= sizeof(IPV6DestOptionsHeader);
+		usNextHeaderOffset+= nTotalOptions * IPV6_DESTOPTS_HDR_OPTIONSIZE ;
 
-		}
-		break;
+	}
+	break;
 	case IPV6HDR_TYPE_AUTHENTICATION:
-		{
-			IPV6AuthenticationHeader *pstIpv6AuthHdr = (IPV6AuthenticationHeader *)pucPayloadPtr;
-			int nHdrLen = pstIpv6AuthHdr->ucLength;
-			bcm_dbg(Adapter, TX, IPV6_DBG, ALL,
-				"IPv6 Authentication Header\n");
-			usNextHeaderOffset+= nHdrLen * 4;
-		}
-		break;
+	{
+		IPV6AuthenticationHeader *pstIpv6AuthHdr = (IPV6AuthenticationHeader *)pucPayloadPtr;
+		int nHdrLen = pstIpv6AuthHdr->ucLength;
+		bcm_dbg(Adapter, TX, IPV6_DBG, ALL,
+			"IPv6 Authentication Header\n");
+		usNextHeaderOffset+= nHdrLen * 4;
+	}
+	break;
 	case IPV6HDR_TYPE_ENCRYPTEDSECURITYPAYLOAD:
-		{
-			bcm_dbg(Adapter, TX, IPV6_DBG, ALL,
-				"IPv6 Encrypted Security Payload Header\n");
-			*bParseDone = TRUE;
+	{
+		bcm_dbg(Adapter, TX, IPV6_DBG, ALL,
+			"IPv6 Encrypted Security Payload Header\n");
+		*bParseDone = TRUE;
 
-		}
-		break;
+	}
+	break;
 	case IPV6_ICMP_HDR_TYPE:
-		{
-			bcm_dbg(Adapter, TX, IPV6_DBG, ALL, "ICMP Header\n");
-			*bParseDone = TRUE;
-		}
-		break;
+	{
+		bcm_dbg(Adapter, TX, IPV6_DBG, ALL, "ICMP Header\n");
+		*bParseDone = TRUE;
+	}
+	break;
 	case TCP_HEADER_TYPE:
-		{
-			bcm_dbg(Adapter, TX, IPV6_DBG, ALL, "TCP Header\n");
-			*bParseDone = TRUE;
-		}
-		break;
+	{
+		bcm_dbg(Adapter, TX, IPV6_DBG, ALL, "TCP Header\n");
+		*bParseDone = TRUE;
+	}
+	break;
 	case UDP_HEADER_TYPE:
-		{
-			bcm_dbg(Adapter, TX, IPV6_DBG, ALL, "UDP Header\n");
-			*bParseDone = TRUE;
-		}
-		break;
+	{
+		bcm_dbg(Adapter, TX, IPV6_DBG, ALL, "UDP Header\n");
+		*bParseDone = TRUE;
+	}
+	break;
 	default :
-		{
-			*bParseDone = TRUE;
+	{
+		*bParseDone = TRUE;
 
-		}
-		break;
+	}
+	break;
 
 
 	}
@@ -146,7 +146,7 @@ static UCHAR GetIpv6ProtocolPorts(UCHAR *pucPayload,USHORT *pusSrcPort,USHORT *p
 	BOOLEAN bDone = FALSE;
 	UCHAR ucHeaderType =0;
 	UCHAR *pucNextHeader = NULL;
-    PMINI_ADAPTER Adapter = GET_BCM_ADAPTER(gblpnetdev);
+	PMINI_ADAPTER Adapter = GET_BCM_ADAPTER(gblpnetdev);
 
 	if( !pucPayload || (usPayloadLength == 0))
 	{
@@ -162,12 +162,12 @@ static UCHAR GetIpv6ProtocolPorts(UCHAR *pucPayload,USHORT *pusSrcPort,USHORT *p
 		{
 			if((ucHeaderType==TCP_HEADER_TYPE) || (ucHeaderType == UDP_HEADER_TYPE))
 			{
-				 *pusSrcPort=*((PUSHORT)(pucNextHeader));
-				 *pusDestPort=*((PUSHORT)(pucNextHeader+2));
-				 bcm_dbg(Adapter, TX, IPV6_DBG, ALL,
-					 "Protocol Ports - Src Port :0x%x Dest Port : 0x%x\n",
-					 ntohs(*pusSrcPort),
-					 ntohs(*pusDestPort));
+				*pusSrcPort=*((PUSHORT)(pucNextHeader));
+				*pusDestPort=*((PUSHORT)(pucNextHeader+2));
+				bcm_dbg(Adapter, TX, IPV6_DBG, ALL,
+					"Protocol Ports - Src Port :0x%x Dest Port : 0x%x\n",
+					ntohs(*pusSrcPort),
+					ntohs(*pusDestPort));
 			}
 			break;
 
@@ -179,8 +179,8 @@ static UCHAR GetIpv6ProtocolPorts(UCHAR *pucPayload,USHORT *pusSrcPort,USHORT *p
 
 
 USHORT	IpVersion6(PMINI_ADAPTER Adapter, /**< Pointer to the driver control structure */
-					PVOID pcIpHeader, /**<Pointer to the IP Hdr of the packet*/
-					S_CLASSIFIER_RULE *pstClassifierRule )
+		   PVOID pcIpHeader, /**<Pointer to the IP Hdr of the packet*/
+		   S_CLASSIFIER_RULE *pstClassifierRule )
 {
 	USHORT	ushDestPort = 0;
 	USHORT	ushSrcPort = 0;
@@ -196,17 +196,17 @@ USHORT	IpVersion6(PMINI_ADAPTER Adapter, /**< Pointer to the driver control stru
 
 	//Try to get the next higher layer protocol and the Ports Nos if TCP or UDP
 	ucNextProtocolAboveIP = GetIpv6ProtocolPorts((UCHAR *)(pcIpHeader + sizeof(IPV6Header)),
-							&ushSrcPort,
-							&ushDestPort,
-							pstIpv6Header->usPayloadLength,
-							pstIpv6Header->ucNextHeader);
+						     &ushSrcPort,
+						     &ushDestPort,
+						     pstIpv6Header->usPayloadLength,
+						     pstIpv6Header->ucNextHeader);
 
 	do
 	{
 		if(0 == pstClassifierRule->ucDirection)
 		{
 			//cannot be processed for classification.
-		   // it is a down link connection
+			// it is a down link connection
 			break;
 		}
 
@@ -217,18 +217,18 @@ USHORT	IpVersion6(PMINI_ADAPTER Adapter, /**< Pointer to the driver control stru
 		}
 
 		bClassificationSucceed=MatchSrcIpv6Address(pstClassifierRule,pstIpv6Header);
-        if(!bClassificationSucceed)
-            break;
+		if(!bClassificationSucceed)
+			break;
 
-        bClassificationSucceed=MatchDestIpv6Address(pstClassifierRule,pstIpv6Header);
-        if(!bClassificationSucceed)
-            break;
+		bClassificationSucceed=MatchDestIpv6Address(pstClassifierRule,pstIpv6Header);
+		if(!bClassificationSucceed)
+			break;
 
 		//Match the protocol type.For IPv6 the next protocol at end of Chain of IPv6 prot headers
 		bClassificationSucceed=MatchProtocol(pstClassifierRule,ucNextProtocolAboveIP);
-        if(!bClassificationSucceed)
-            break;
-	bcm_dbg(Adapter, TX, IPV6_DBG, ALL, "IPv6 Protocol Matched\n");
+		if(!bClassificationSucceed)
+			break;
+		bcm_dbg(Adapter, TX, IPV6_DBG, ALL, "IPv6 Protocol Matched\n");
 
 		if((ucNextProtocolAboveIP == TCP_HEADER_TYPE) || (ucNextProtocolAboveIP == UDP_HEADER_TYPE))
 		{
@@ -281,7 +281,7 @@ static BOOLEAN MatchSrcIpv6Address(S_CLASSIFIER_RULE *pstClassifierRule,IPV6Head
 	UINT  uiIpv6AddIndex=0;
 	UINT  uiIpv6AddrNoLongWords = 4;
 	ULONG aulSrcIP[4];
-    PMINI_ADAPTER Adapter = GET_BCM_ADAPTER(gblpnetdev);
+	PMINI_ADAPTER Adapter = GET_BCM_ADAPTER(gblpnetdev);
 	/*
 	//This is the no. of Src Addresses ie Range of IP Addresses contained
 	//in the classifier rule for which we need to match
@@ -314,7 +314,7 @@ static BOOLEAN MatchSrcIpv6Address(S_CLASSIFIER_RULE *pstClassifierRule,IPV6Head
 		for(uiIpv6AddIndex=0;uiIpv6AddIndex<uiIpv6AddrNoLongWords;uiIpv6AddIndex++)
 		{
 			if((pstClassifierRule->stSrcIpAddress.ulIpv6Mask[uiLoopIndex+uiIpv6AddIndex] & aulSrcIP[uiIpv6AddIndex])
-				!= pstClassifierRule->stSrcIpAddress.ulIpv6Addr[uiLoopIndex+uiIpv6AddIndex])
+			   != pstClassifierRule->stSrcIpAddress.ulIpv6Addr[uiLoopIndex+uiIpv6AddIndex])
 			{
 				//Match failed for current Ipv6 Address.Try next Ipv6 Address
 				break;
@@ -338,7 +338,7 @@ static BOOLEAN MatchDestIpv6Address(S_CLASSIFIER_RULE *pstClassifierRule,IPV6Hea
 	UINT  uiIpv6AddIndex=0;
 	UINT  uiIpv6AddrNoLongWords = 4;
 	ULONG aulDestIP[4];
-    PMINI_ADAPTER Adapter = GET_BCM_ADAPTER(gblpnetdev);
+	PMINI_ADAPTER Adapter = GET_BCM_ADAPTER(gblpnetdev);
 	/*
 	//This is the no. of Destination Addresses ie Range of IP Addresses contained
 	//in the classifier rule for which we need to match
@@ -371,7 +371,7 @@ static BOOLEAN MatchDestIpv6Address(S_CLASSIFIER_RULE *pstClassifierRule,IPV6Hea
 		for(uiIpv6AddIndex=0;uiIpv6AddIndex<uiIpv6AddrNoLongWords;uiIpv6AddIndex++)
 		{
 			if((pstClassifierRule->stDestIpAddress.ulIpv6Mask[uiLoopIndex+uiIpv6AddIndex] & aulDestIP[uiIpv6AddIndex])
-				!= pstClassifierRule->stDestIpAddress.ulIpv6Addr[uiLoopIndex+uiIpv6AddIndex])
+			   != pstClassifierRule->stDestIpAddress.ulIpv6Addr[uiLoopIndex+uiIpv6AddIndex])
 			{
 				//Match failed for current Ipv6 Address.Try next Ipv6 Address
 				break;
@@ -394,7 +394,7 @@ VOID DumpIpv6Address(ULONG *puIpv6Address)
 {
 	UINT uiIpv6AddrNoLongWords = 4;
 	UINT  uiIpv6AddIndex=0;
-    PMINI_ADAPTER Adapter = GET_BCM_ADAPTER(gblpnetdev);
+	PMINI_ADAPTER Adapter = GET_BCM_ADAPTER(gblpnetdev);
 	for(uiIpv6AddIndex=0;uiIpv6AddIndex<uiIpv6AddrNoLongWords;uiIpv6AddIndex++)
 	{
 		bcm_dbg(Adapter, TX, IPV6_DBG, ALL, ":%lx\n",
@@ -407,7 +407,7 @@ static VOID DumpIpv6Header(IPV6Header *pstIpv6Header)
 {
 	UCHAR ucVersion;
 	UCHAR  ucPrio ;
-    PMINI_ADAPTER Adapter = GET_BCM_ADAPTER(gblpnetdev);
+	PMINI_ADAPTER Adapter = GET_BCM_ADAPTER(gblpnetdev);
 	bcm_dbg(Adapter, TX, IPV6_DBG, ALL, "----Ipv6 Header---\n");
 	ucVersion = pstIpv6Header->ucVersionPrio & 0xf0;
 	bcm_dbg(Adapter, TX, IPV6_DBG, ALL, "Version : %x\n", ucVersion);
diff --git a/drivers/staging/bcm/IPv6ProtocolHdr.h b/drivers/staging/bcm/IPv6ProtocolHdr.h
index a0db5a1..b32a953 100644
--- a/drivers/staging/bcm/IPv6ProtocolHdr.h
+++ b/drivers/staging/bcm/IPv6ProtocolHdr.h
@@ -103,8 +103,8 @@ typedef enum _E_IPADDR_CONTEXT
 //Function Prototypes
 
 USHORT	IpVersion6(PMINI_ADAPTER Adapter, /**< Pointer to the driver control structure */
-					PVOID pcIpHeader, /**<Pointer to the IP Hdr of the packet*/
-					S_CLASSIFIER_RULE *pstClassifierRule );
+		   PVOID pcIpHeader, /**<Pointer to the IP Hdr of the packet*/
+		   S_CLASSIFIER_RULE *pstClassifierRule );
 
 VOID DumpIpv6Address(ULONG *puIpv6Address);
 
diff --git a/drivers/staging/bcm/InterfaceAdapter.h b/drivers/staging/bcm/InterfaceAdapter.h
index 6397c20..42abce9 100644
--- a/drivers/staging/bcm/InterfaceAdapter.h
+++ b/drivers/staging/bcm/InterfaceAdapter.h
@@ -3,39 +3,39 @@
 
 typedef struct _BULK_ENDP_IN
 {
-    PCHAR		    bulk_in_buffer;
-    size_t          bulk_in_size;
-    UCHAR			bulk_in_endpointAddr;
-    UINT bulk_in_pipe;
+	PCHAR		    bulk_in_buffer;
+	size_t          bulk_in_size;
+	UCHAR			bulk_in_endpointAddr;
+	UINT bulk_in_pipe;
 }BULK_ENDP_IN, *PBULK_ENDP_IN;
 
 
 typedef struct _BULK_ENDP_OUT
 {
-    UCHAR			bulk_out_buffer;
-    size_t          bulk_out_size;
-    UCHAR			bulk_out_endpointAddr;
-    UINT bulk_out_pipe;
-    //this is used when int out endpoint is used as bulk out end point
+	UCHAR			bulk_out_buffer;
+	size_t          bulk_out_size;
+	UCHAR			bulk_out_endpointAddr;
+	UINT bulk_out_pipe;
+	//this is used when int out endpoint is used as bulk out end point
 	UCHAR			int_out_interval;
 }BULK_ENDP_OUT, *PBULK_ENDP_OUT;
 
 typedef struct _INTR_ENDP_IN
 {
-    PCHAR		    int_in_buffer;
-    size_t          int_in_size;
-    UCHAR			int_in_endpointAddr;
-    UCHAR			int_in_interval;
-    UINT int_in_pipe;
+	PCHAR		    int_in_buffer;
+	size_t          int_in_size;
+	UCHAR			int_in_endpointAddr;
+	UCHAR			int_in_interval;
+	UINT int_in_pipe;
 }INTR_ENDP_IN, *PINTR_ENDP_IN;
 
 typedef struct _INTR_ENDP_OUT
 {
-    PCHAR		    int_out_buffer;
-    size_t          int_out_size;
-    UCHAR			int_out_endpointAddr;
-    UCHAR			int_out_interval;
-    UINT int_out_pipe;
+	PCHAR		    int_out_buffer;
+	size_t          int_out_size;
+	UCHAR			int_out_endpointAddr;
+	UCHAR			int_out_interval;
+	UINT int_out_pipe;
 }INTR_ENDP_OUT, *PINTR_ENDP_OUT;
 
 
@@ -60,8 +60,8 @@ typedef struct _USB_RCB
 */
 typedef struct _S_INTERFACE_ADAPTER
 {
-    struct usb_device * udev;
-    struct usb_interface *  interface;
+	struct usb_device * udev;
+	struct usb_interface *  interface;
 
 	/* Bulk endpoint in info */
 	BULK_ENDP_IN	sBulkIn;
diff --git a/drivers/staging/bcm/InterfaceDld.c b/drivers/staging/bcm/InterfaceDld.c
index 62a5d63..167428b 100644
--- a/drivers/staging/bcm/InterfaceDld.c
+++ b/drivers/staging/bcm/InterfaceDld.c
@@ -17,7 +17,7 @@ int InterfaceFileDownload(PVOID arg, struct file *flp, unsigned int on_chip_loc)
 		oldfs = get_fs();
 		set_fs(get_ds());
 		len = vfs_read(flp, (void __force __user *)buff,
-			MAX_TRANSFER_CTRL_BYTE_USB, &pos);
+			       MAX_TRANSFER_CTRL_BYTE_USB, &pos);
 		set_fs(oldfs);
 		if (len <= 0) {
 			if (len < 0) {
diff --git a/drivers/staging/bcm/InterfaceIdleMode.c b/drivers/staging/bcm/InterfaceIdleMode.c
index 8cc9298..161cbcf 100644
--- a/drivers/staging/bcm/InterfaceIdleMode.c
+++ b/drivers/staging/bcm/InterfaceIdleMode.c
@@ -1,43 +1,43 @@
 #include "headers.h"
 
 /*
-Function:				InterfaceIdleModeWakeup
+  Function:				InterfaceIdleModeWakeup
 
-Description:			This is the hardware specific Function for waking up HW device from Idle mode.
-						A software abort pattern is written to the device to wake it and necessary power state
-						transitions from host are performed here.
+  Description:			This is the hardware specific Function for waking up HW device from Idle mode.
+  A software abort pattern is written to the device to wake it and necessary power state
+  transitions from host are performed here.
 
-Input parameters:		IN PMINI_ADAPTER Adapter   - Miniport Adapter Context
+  Input parameters:		IN PMINI_ADAPTER Adapter   - Miniport Adapter Context
 
 
-Return:				BCM_STATUS_SUCCESS - If Wakeup of the HW Interface was successful.
-						Other           - If an error occurred.
+  Return:				BCM_STATUS_SUCCESS - If Wakeup of the HW Interface was successful.
+  Other           - If an error occurred.
 */
 
 
 /*
-Function:				InterfaceIdleModeRespond
+  Function:				InterfaceIdleModeRespond
 
-Description:			This is the hardware specific Function for responding to Idle mode request from target.
-						Necessary power state transitions from host for idle mode or other device specific
-						initializations are performed here.
+  Description:			This is the hardware specific Function for responding to Idle mode request from target.
+  Necessary power state transitions from host for idle mode or other device specific
+  initializations are performed here.
 
-Input parameters:		IN PMINI_ADAPTER Adapter   - Miniport Adapter Context
+  Input parameters:		IN PMINI_ADAPTER Adapter   - Miniport Adapter Context
 
 
-Return:				BCM_STATUS_SUCCESS - If Idle mode response related HW configuration was successful.
-						Other           - If an error occurred.
+  Return:				BCM_STATUS_SUCCESS - If Idle mode response related HW configuration was successful.
+  Other           - If an error occurred.
 */
 
 /*
-"dmem bfc02f00  100" tells how many time device went in Idle mode.
-this value will be at address bfc02fa4.just before value d0ea1dle.
+  "dmem bfc02f00  100" tells how many time device went in Idle mode.
+  this value will be at address bfc02fa4.just before value d0ea1dle.
 
-Set time value by writing at bfc02f98 7d0
+  Set time value by writing at bfc02f98 7d0
 
-checking the Ack timer expire on kannon by running command
-d qcslog .. if it shows e means host has not send response to f/w with in 200 ms. Response should be
-send to f/w with in 200 ms after the Idle/Shutdown req issued
+  checking the Ack timer expire on kannon by running command
+  d qcslog .. if it shows e means host has not send response to f/w with in 200 ms. Response should be
+  send to f/w with in 200 ms after the Idle/Shutdown req issued
 
 */
 
@@ -119,9 +119,9 @@ int InterfaceIdleModeRespond(PMINI_ADAPTER Adapter, unsigned int* puiBuffer)
 				"Got Req from F/W to go in IDLE mode\n");
 
 			if (Adapter->chip_id== BCS220_2 ||
-				Adapter->chip_id == BCS220_2BC ||
-					Adapter->chip_id== BCS250_BC ||
-					Adapter->chip_id== BCS220_3)
+			    Adapter->chip_id == BCS220_2BC ||
+			    Adapter->chip_id== BCS250_BC ||
+			    Adapter->chip_id== BCS220_3)
 			{
 
 				bytes = rdmalt(Adapter, HPM_CONFIG_MSW, &uiRegRead, sizeof(uiRegRead));
@@ -177,7 +177,7 @@ static int InterfaceAbortIdlemode(PMINI_ADAPTER Adapter, unsigned int Pattern)
 	}
 
 	if((Adapter->ulPowerSaveMode == DEVICE_POWERSAVE_MODE_AS_MANUAL_CLOCK_GATING)
-									||
+	   ||
 	   (Adapter->ulPowerSaveMode == DEVICE_POWERSAVE_MODE_AS_PROTOCOL_IDLE_MODE))
 	{
 		//write the SW abort pattern.
@@ -189,7 +189,7 @@ static int InterfaceAbortIdlemode(PMINI_ADAPTER Adapter, unsigned int Pattern)
 		{
 			bcm_dbg(Adapter, OTHERS, IDLE_MODE, ALL,
 				"WRM to Register SW_ABORT_IDLEMODE_LOC failed..\n");
-				return status;
+			return status;
 		}
 	}
 
@@ -212,12 +212,12 @@ static int InterfaceAbortIdlemode(PMINI_ADAPTER Adapter, unsigned int Pattern)
 		 * Not using Asynchronous Mechanism.
 		 */
 		status = usb_interrupt_msg (psInterfaceAdapter->udev,
-			usb_sndintpipe(psInterfaceAdapter->udev,
-			psInterfaceAdapter->sIntrOut.int_out_endpointAddr),
-			aucAbortPattern,
-			8,
-			&lenwritten,
-			5000);
+					    usb_sndintpipe(psInterfaceAdapter->udev,
+							   psInterfaceAdapter->sIntrOut.int_out_endpointAddr),
+					    aucAbortPattern,
+					    8,
+					    &lenwritten,
+					    5000);
 		if(status)
 		{
 			bcm_dbg(Adapter, OTHERS, IDLE_MODE, ALL,
@@ -304,10 +304,10 @@ void InterfaceHandleShutdownModeWakeup(PMINI_ADAPTER Adapter)
 		}
 	}
 
-    else
+	else
 	{
 
-        //clear Interrupt EP registers.
+		//clear Interrupt EP registers.
 		bytes = rdmalt(Adapter,DEVICE_INT_OUT_EP_REG0, &uiRegVal, sizeof(uiRegVal));
 		if (bytes < 0) {
 			Status = bytes;
diff --git a/drivers/staging/bcm/InterfaceInit.c b/drivers/staging/bcm/InterfaceInit.c
index 01100f2..40a517a 100644
--- a/drivers/staging/bcm/InterfaceInit.c
+++ b/drivers/staging/bcm/InterfaceInit.c
@@ -329,7 +329,7 @@ static int device_run(PS_INTERFACE_ADAPTER psIntfAdapter)
 		 */
 		psIntfAdapter->psAdapter->waiting_to_fw_download_done = FALSE;
 		value = wait_event_timeout(psIntfAdapter->psAdapter->ioctl_fw_dnld_wait_queue,
-					psIntfAdapter->psAdapter->waiting_to_fw_download_done, 5*HZ);
+					   psIntfAdapter->psAdapter->waiting_to_fw_download_done, 5*HZ);
 
 		if (value == 0)
 			pr_err("Timeout waiting for mailbox interrupt\n");
@@ -437,7 +437,7 @@ static int InterfaceAdapterInit(PS_INTERFACE_ADAPTER psIntfAdapter)
 	psIntfAdapter->psAdapter->interface_wrm = BcmWRM;
 
 	bytes = rdmalt(psIntfAdapter->psAdapter, CHIP_ID_REG,
-			(u32 *)&(psIntfAdapter->psAdapter->chip_id), sizeof(u32));
+		       (u32 *)&(psIntfAdapter->psAdapter->chip_id), sizeof(u32));
 	if (bytes < 0) {
 		retval = bytes;
 		pr_info("CHIP ID Read Failed\n");
@@ -477,7 +477,7 @@ static int InterfaceAdapterInit(PS_INTERFACE_ADAPTER psIntfAdapter)
 				 * If Mode is FS then EP2 should be bulk end point
 				 */
 				if (((psIntfAdapter->bHighSpeedDevice == TRUE) && (bcm_usb_endpoint_is_int_out(endpoint) == FALSE))
-					|| ((psIntfAdapter->bHighSpeedDevice == FALSE) && (bcm_usb_endpoint_is_bulk_out(endpoint) == FALSE))) {
+				    || ((psIntfAdapter->bHighSpeedDevice == FALSE) && (bcm_usb_endpoint_is_bulk_out(endpoint) == FALSE))) {
 					bcm_dbg(psIntfAdapter->psAdapter, INITEXIT, DRV_ENTRY, ALL,
 						"Configuring the EEPROM\n");
 					/* change the EP2, EP4 to INT OUT end point */
@@ -541,15 +541,15 @@ static int InterfaceAdapterInit(PS_INTERFACE_ADAPTER psIntfAdapter)
 			psIntfAdapter->sBulkIn.bulk_in_size = buffer_size;
 			psIntfAdapter->sBulkIn.bulk_in_endpointAddr = endpoint->bEndpointAddress;
 			psIntfAdapter->sBulkIn.bulk_in_pipe =
-					usb_rcvbulkpipe(psIntfAdapter->udev,
-								psIntfAdapter->sBulkIn.bulk_in_endpointAddr);
+				usb_rcvbulkpipe(psIntfAdapter->udev,
+						psIntfAdapter->sBulkIn.bulk_in_endpointAddr);
 		}
 
 		if (!psIntfAdapter->sBulkOut.bulk_out_endpointAddr && bcm_usb_endpoint_is_bulk_out(endpoint)) {
 			psIntfAdapter->sBulkOut.bulk_out_endpointAddr = endpoint->bEndpointAddress;
 			psIntfAdapter->sBulkOut.bulk_out_pipe =
 				usb_sndbulkpipe(psIntfAdapter->udev,
-					psIntfAdapter->sBulkOut.bulk_out_endpointAddr);
+						psIntfAdapter->sBulkOut.bulk_out_endpointAddr);
 		}
 
 		if (!psIntfAdapter->sIntrIn.int_in_endpointAddr && bcm_usb_endpoint_is_int_in(endpoint)) {
@@ -558,7 +558,7 @@ static int InterfaceAdapterInit(PS_INTERFACE_ADAPTER psIntfAdapter)
 			psIntfAdapter->sIntrIn.int_in_endpointAddr = endpoint->bEndpointAddress;
 			psIntfAdapter->sIntrIn.int_in_interval = endpoint->bInterval;
 			psIntfAdapter->sIntrIn.int_in_buffer =
-						kmalloc(buffer_size, GFP_KERNEL);
+				kmalloc(buffer_size, GFP_KERNEL);
 			if (!psIntfAdapter->sIntrIn.int_in_buffer) {
 				dev_err(&psIntfAdapter->udev->dev,
 					"could not allocate interrupt_in_buffer\n");
@@ -568,13 +568,13 @@ static int InterfaceAdapterInit(PS_INTERFACE_ADAPTER psIntfAdapter)
 
 		if (!psIntfAdapter->sIntrOut.int_out_endpointAddr && bcm_usb_endpoint_is_int_out(endpoint)) {
 			if (!psIntfAdapter->sBulkOut.bulk_out_endpointAddr &&
-				(psIntfAdapter->psAdapter->chip_id == T3B) && (value == usedIntOutForBulkTransfer)) {
+			    (psIntfAdapter->psAdapter->chip_id == T3B) && (value == usedIntOutForBulkTransfer)) {
 				/* use first intout end point as a bulk out end point */
 				buffer_size = le16_to_cpu(endpoint->wMaxPacketSize);
 				psIntfAdapter->sBulkOut.bulk_out_size = buffer_size;
 				psIntfAdapter->sBulkOut.bulk_out_endpointAddr = endpoint->bEndpointAddress;
 				psIntfAdapter->sBulkOut.bulk_out_pipe = usb_sndintpipe(psIntfAdapter->udev,
-									psIntfAdapter->sBulkOut.bulk_out_endpointAddr);
+										       psIntfAdapter->sBulkOut.bulk_out_endpointAddr);
 				psIntfAdapter->sBulkOut.int_out_interval = endpoint->bInterval;
 			} else if (value == EP6) {
 				buffer_size = le16_to_cpu(endpoint->wMaxPacketSize);
@@ -595,7 +595,7 @@ static int InterfaceAdapterInit(PS_INTERFACE_ADAPTER psIntfAdapter)
 
 	psIntfAdapter->psAdapter->bcm_file_download = InterfaceFileDownload;
 	psIntfAdapter->psAdapter->bcm_file_readback_from_chip =
-				InterfaceFileReadbackFromChip;
+		InterfaceFileReadbackFromChip;
 	psIntfAdapter->psAdapter->interface_transmit = InterfaceTransmitPacket;
 
 	retval = CreateInterruptUrb(psIntfAdapter);
diff --git a/drivers/staging/bcm/InterfaceIsr.c b/drivers/staging/bcm/InterfaceIsr.c
index 007d736..d22581b 100644
--- a/drivers/staging/bcm/InterfaceIsr.c
+++ b/drivers/staging/bcm/InterfaceIsr.c
@@ -19,19 +19,19 @@ static void read_int_callback(struct urb *urb/*, struct pt_regs *regs*/)
 	}
 
 	if(((Adapter->bPreparingForLowPowerMode == TRUE) && (Adapter->bDoSuspend == TRUE)) ||
-		psIntfAdapter->bSuspended ||
-		psIntfAdapter->bPreparingForBusSuspend)
+	   psIntfAdapter->bSuspended ||
+	   psIntfAdapter->bPreparingForBusSuspend)
 	{
 		bcm_dbg(Adapter, OTHERS, INTF_INIT, ALL,
 			"Interrupt call back is called while suspending the device\n");
-			return ;
+		return ;
 	}
 
 	//bcm_dbg(Adapter, TX, NEXT_SEND, ALL,
 	//"interrupt urb status %d\n", status);
 	switch (status) {
-	    /* success */
-	    case STATUS_SUCCESS:
+		/* success */
+	case STATUS_SUCCESS:
 		if ( urb->actual_length )
 		{
 
@@ -44,7 +44,7 @@ static void read_int_callback(struct urb *urb/*, struct pt_regs *regs*/)
 			if(psIntfAdapter->ulInterruptData[1] & 0xFF00)
 			{
 				atomic_set(&Adapter->CurrNumFreeTxDesc,
-					(psIntfAdapter->ulInterruptData[1] & 0xFF00) >> 8);
+					   (psIntfAdapter->ulInterruptData[1] & 0xFF00) >> 8);
 				atomic_set (&Adapter->uiMBupdate, TRUE);
 				bcm_dbg(Adapter, OTHERS, INTF_INIT, ALL,
 					"TX mailbox contains %d\n",
@@ -60,8 +60,8 @@ static void read_int_callback(struct urb *urb/*, struct pt_regs *regs*/)
 				InterfaceRx(psIntfAdapter);
 			}
 			if(Adapter->fw_download_done &&
-				!Adapter->downloadDDR &&
-				atomic_read(&Adapter->CurrNumFreeTxDesc))
+			   !Adapter->downloadDDR &&
+			   atomic_read(&Adapter->CurrNumFreeTxDesc))
 			{
 				psIntfAdapter->psAdapter->downloadDDR +=1;
 				wake_up(&Adapter->tx_packet_wait_queue);
@@ -80,45 +80,45 @@ static void read_int_callback(struct urb *urb/*, struct pt_regs *regs*/)
 				"Firing interrupt in URB\n");
 		}
 		break;
-		case -ENOENT :
-		{
-			bcm_dbg(Adapter, OTHERS, INTF_INIT, ALL,
-				"URB has got disconnected ....\n");
-			return ;
-		}
-		case -EINPROGRESS:
-		{
-			//This situation may happened when URBunlink is used. for detail check usb_unlink_urb documentation.
-			bcm_dbg(Adapter, OTHERS, INTF_INIT, ALL,
-				"Impossibe condition has occurred... something very bad is going on\n");
-			break ;
-			//return;
-		}
-		case -EPIPE:
-		{
-			bcm_dbg(Adapter, OTHERS, INTF_INIT, ALL,
-				"Interrupt IN endPoint  has got halted/stalled...need to clear this\n");
-				Adapter->bEndPointHalted = TRUE ;
-				wake_up(&Adapter->tx_packet_wait_queue);
-				urb->status = STATUS_SUCCESS ;
-				return;
-		}
-	    /* software-driven interface shutdown */
-	    case -ECONNRESET: //URB got unlinked.
-	    case -ESHUTDOWN:		// hardware gone. this is the serious problem.
-	    						//Occurs only when something happens with the host controller device
-	    case -ENODEV : //Device got removed
-		case -EINVAL : //Some thing very bad happened with the URB. No description is available.
-		    bcm_dbg(Adapter, OTHERS, INTF_INIT, ALL,
-			    "interrupt urb error %d\n", status);
-			urb->status = STATUS_SUCCESS ;
-			break ;
-			//return;
-	    default:
-			//This is required to check what is the defaults conditions when it occurs..
-		    bcm_dbg(Adapter, TX, NEXT_SEND, ALL,
-			    "GOT DEFAULT INTERRUPT URB STATUS :%d..Please Analyze it...\n",
-			    status);
+	case -ENOENT :
+	{
+		bcm_dbg(Adapter, OTHERS, INTF_INIT, ALL,
+			"URB has got disconnected ....\n");
+		return ;
+	}
+	case -EINPROGRESS:
+	{
+		//This situation may happened when URBunlink is used. for detail check usb_unlink_urb documentation.
+		bcm_dbg(Adapter, OTHERS, INTF_INIT, ALL,
+			"Impossibe condition has occurred... something very bad is going on\n");
+		break ;
+		//return;
+	}
+	case -EPIPE:
+	{
+		bcm_dbg(Adapter, OTHERS, INTF_INIT, ALL,
+			"Interrupt IN endPoint  has got halted/stalled...need to clear this\n");
+		Adapter->bEndPointHalted = TRUE ;
+		wake_up(&Adapter->tx_packet_wait_queue);
+		urb->status = STATUS_SUCCESS ;
+		return;
+	}
+	/* software-driven interface shutdown */
+	case -ECONNRESET: //URB got unlinked.
+	case -ESHUTDOWN:		// hardware gone. this is the serious problem.
+		//Occurs only when something happens with the host controller device
+	case -ENODEV : //Device got removed
+	case -EINVAL : //Some thing very bad happened with the URB. No description is available.
+		bcm_dbg(Adapter, OTHERS, INTF_INIT, ALL,
+			"interrupt urb error %d\n", status);
+		urb->status = STATUS_SUCCESS ;
+		break ;
+		//return;
+	default:
+		//This is required to check what is the defaults conditions when it occurs..
+		bcm_dbg(Adapter, TX, NEXT_SEND, ALL,
+			"GOT DEFAULT INTERRUPT URB STATUS :%d..Please Analyze it...\n",
+			status);
 		break;
 	}
 
@@ -137,19 +137,19 @@ int CreateInterruptUrb(PS_INTERFACE_ADAPTER psIntfAdapter)
 		return -ENOMEM;
 	}
 	psIntfAdapter->psInterruptUrb->transfer_buffer =
-								psIntfAdapter->ulInterruptData;
+		psIntfAdapter->ulInterruptData;
 	psIntfAdapter->psInterruptUrb->transfer_buffer_length =
-							sizeof(psIntfAdapter->ulInterruptData);
+		sizeof(psIntfAdapter->ulInterruptData);
 
 	psIntfAdapter->sIntrIn.int_in_pipe = usb_rcvintpipe(psIntfAdapter->udev,
-						psIntfAdapter->sIntrIn.int_in_endpointAddr);
+							    psIntfAdapter->sIntrIn.int_in_endpointAddr);
 
 	usb_fill_int_urb(psIntfAdapter->psInterruptUrb, psIntfAdapter->udev,
-					psIntfAdapter->sIntrIn.int_in_pipe,
-					psIntfAdapter->psInterruptUrb->transfer_buffer,
-					psIntfAdapter->psInterruptUrb->transfer_buffer_length,
-					read_int_callback, psIntfAdapter,
-					psIntfAdapter->sIntrIn.int_in_interval);
+			 psIntfAdapter->sIntrIn.int_in_pipe,
+			 psIntfAdapter->psInterruptUrb->transfer_buffer,
+			 psIntfAdapter->psInterruptUrb->transfer_buffer_length,
+			 read_int_callback, psIntfAdapter,
+			 psIntfAdapter->sIntrIn.int_in_interval);
 
 	bcm_dbg(psIntfAdapter->psAdapter, OTHERS, INTF_INIT, ALL,
 		"Interrupt Interval: %d\n",
@@ -163,10 +163,10 @@ INT StartInterruptUrb(PS_INTERFACE_ADAPTER psIntfAdapter)
 	INT status = 0;
 
 	if( FALSE == psIntfAdapter->psAdapter->device_removed &&
-		FALSE == psIntfAdapter->psAdapter->bEndPointHalted &&
-		FALSE == psIntfAdapter->bSuspended &&
-		FALSE == psIntfAdapter->bPreparingForBusSuspend &&
-		FALSE == psIntfAdapter->psAdapter->StopAllXaction)
+	    FALSE == psIntfAdapter->psAdapter->bEndPointHalted &&
+	    FALSE == psIntfAdapter->bSuspended &&
+	    FALSE == psIntfAdapter->bPreparingForBusSuspend &&
+	    FALSE == psIntfAdapter->psAdapter->StopAllXaction)
 	{
 		status = usb_submit_urb(psIntfAdapter->psInterruptUrb, GFP_ATOMIC);
 		if (status)
diff --git a/drivers/staging/bcm/InterfaceMisc.c b/drivers/staging/bcm/InterfaceMisc.c
index 5c15dde..5dfc961 100644
--- a/drivers/staging/bcm/InterfaceMisc.c
+++ b/drivers/staging/bcm/InterfaceMisc.c
@@ -1,9 +1,9 @@
 #include "headers.h"
 
 INT InterfaceRDM(PS_INTERFACE_ADAPTER psIntfAdapter,
-		UINT addr,
-		PVOID buff,
-		INT len)
+		 UINT addr,
+		 PVOID buff,
+		 INT len)
 {
 	int bytes;
 	USHORT usRetries = 0;
@@ -63,9 +63,9 @@ INT InterfaceRDM(PS_INTERFACE_ADAPTER psIntfAdapter,
 }
 
 INT InterfaceWRM(PS_INTERFACE_ADAPTER psIntfAdapter,
-		UINT addr,
-		PVOID buff,
-		INT len)
+		 UINT addr,
+		 PVOID buff,
+		 INT len)
 {
 	int retval = 0;
 	USHORT usRetries = 0;
@@ -96,14 +96,14 @@ INT InterfaceWRM(PS_INTERFACE_ADAPTER psIntfAdapter,
 
 	do {
 		retval = usb_control_msg(psIntfAdapter->udev,
-					usb_sndctrlpipe(psIntfAdapter->udev, 0),
-					0x01,
-					0x42,
-					(addr & 0xFFFF),
-					((addr >> 16) & 0xFFFF),
-					buff,
-					len,
-					5000);
+					 usb_sndctrlpipe(psIntfAdapter->udev, 0),
+					 0x01,
+					 0x42,
+					 (addr & 0xFFFF),
+					 ((addr >> 16) & 0xFFFF),
+					 buff,
+					 len,
+					 5000);
 
 		usRetries++;
 		if (-ENODEV == retval) {
@@ -128,17 +128,17 @@ INT InterfaceWRM(PS_INTERFACE_ADAPTER psIntfAdapter,
 }
 
 INT BcmRDM(PVOID arg,
-	UINT addr,
-	PVOID buff,
-	INT len)
+	   UINT addr,
+	   PVOID buff,
+	   INT len)
 {
 	return InterfaceRDM((PS_INTERFACE_ADAPTER)arg, addr, buff, len);
 }
 
 INT BcmWRM(PVOID arg,
-	UINT addr,
-	PVOID buff,
-	INT len)
+	   UINT addr,
+	   PVOID buff,
+	   INT len)
 {
 	return InterfaceWRM((PS_INTERFACE_ADAPTER)arg, addr, buff, len);
 }
diff --git a/drivers/staging/bcm/InterfaceMisc.h b/drivers/staging/bcm/InterfaceMisc.h
index 6c9e39b..9daaa22 100644
--- a/drivers/staging/bcm/InterfaceMisc.h
+++ b/drivers/staging/bcm/InterfaceMisc.h
@@ -3,35 +3,35 @@
 
 INT
 InterfaceRDM(PS_INTERFACE_ADAPTER psIntfAdapter,
-			UINT addr,
-			PVOID buff,
-			INT len);
+	     UINT addr,
+	     PVOID buff,
+	     INT len);
 
 INT
 InterfaceWRM(PS_INTERFACE_ADAPTER psIntfAdapter,
-			UINT addr,
-			PVOID buff,
-			INT len);
+	     UINT addr,
+	     PVOID buff,
+	     INT len);
 
 
 int InterfaceFileDownload( PVOID psIntfAdapter,
-                        struct file *flp,
-                        unsigned int on_chip_loc);
+			   struct file *flp,
+			   unsigned int on_chip_loc);
 
 int InterfaceFileReadbackFromChip( PVOID psIntfAdapter,
-                        struct file *flp,
-                        unsigned int on_chip_loc);
+				   struct file *flp,
+				   unsigned int on_chip_loc);
 
 
 int BcmRDM(PVOID arg,
-			UINT addr,
-			PVOID buff,
-			INT len);
+	   UINT addr,
+	   PVOID buff,
+	   INT len);
 
 int BcmWRM(PVOID arg,
-			UINT addr,
-			PVOID buff,
-			INT len);
+	   UINT addr,
+	   PVOID buff,
+	   INT len);
 
 INT Bcm_clear_halt_of_endpoints(PMINI_ADAPTER Adapter);
 
diff --git a/drivers/staging/bcm/InterfaceRx.c b/drivers/staging/bcm/InterfaceRx.c
index 9124c49..2e5b174 100644
--- a/drivers/staging/bcm/InterfaceRx.c
+++ b/drivers/staging/bcm/InterfaceRx.c
@@ -19,7 +19,7 @@ GetBulkInRcb(PS_INTERFACE_ADAPTER psIntfAdapter)
 	UINT index = 0;
 
 	if((atomic_read(&psIntfAdapter->uNumRcbUsed) < MAXIMUM_USB_RCB) &&
-		(psIntfAdapter->psAdapter->StopAllXaction == FALSE))
+	   (psIntfAdapter->psAdapter->StopAllXaction == FALSE))
 	{
 		index = atomic_read(&psIntfAdapter->uCurrRcb);
 		pRcb = &psIntfAdapter->asUsbRcb[index];
@@ -54,8 +54,8 @@ static void read_bulk_callback(struct urb *urb)
 			Adapter->dev->name, urb->status, urb->actual_length);
 
 	if((Adapter->device_removed == TRUE)  ||
-		(TRUE == Adapter->bEndPointHalted) ||
-		(0 == urb->actual_length)
+	   (TRUE == Adapter->bEndPointHalted) ||
+	   (0 == urb->actual_length)
 		)
 	{
 	 	pRcb->bUsed = FALSE;
@@ -126,15 +126,15 @@ static void read_bulk_callback(struct urb *urb)
 		atomic_dec(&psIntfAdapter->uNumRcbUsed);
 		return;
 	}
-    /* If it is a control Packet, then call handle_bcm_packet ()*/
+	/* If it is a control Packet, then call handle_bcm_packet ()*/
 	if((ntohs(pLeader->Vcid) == VCID_CONTROL_PACKET) ||
-	    (!(pLeader->Status >= 0x20  &&  pLeader->Status <= 0x3F)))
+	   (!(pLeader->Status >= 0x20  &&  pLeader->Status <= 0x3F)))
 	{
 		bcm_dbg(psIntfAdapter->psAdapter, RX, RX_CTRL, ALL,
 			"Received control pkt...\n");
 		*(PUSHORT)skb->data = pLeader->Status;
-       	memcpy(skb->data+sizeof(USHORT), urb->transfer_buffer +
-			(sizeof(LEADER)), pLeader->PLength);
+		memcpy(skb->data+sizeof(USHORT), urb->transfer_buffer +
+		       (sizeof(LEADER)), pLeader->PLength);
 		skb->len = pLeader->PLength + sizeof(USHORT);
 
 		spin_lock(&Adapter->control_queue_lock);
@@ -147,9 +147,9 @@ static void read_bulk_callback(struct urb *urb)
 	else
 	{
 		/*
-		  * Data Packet, Format a proper Ethernet Header
-        	  * and give it to the stack
-		  */
+		 * Data Packet, Format a proper Ethernet Header
+		 * and give it to the stack
+		 */
 		bcm_dbg(psIntfAdapter->psAdapter, RX, RX_DATA, ALL,
 			"Received Data pkt...\n");
 		skb_reserve(skb, 2 + SKB_RESERVE_PHS_BYTES);
@@ -168,7 +168,7 @@ static void read_bulk_callback(struct urb *urb)
 			/* Moving ahead by ETH_HLEN to the data ptr as received from FW */
 			skb_pull(skb, ETH_HLEN);
 			PHSReceive(Adapter, pLeader->Vcid, skb, &skb->len,
-					NULL,bHeaderSupressionEnabled);
+				   NULL,bHeaderSupressionEnabled);
 
 			if(!Adapter->PackInfo[QueueIndex].bEthCSSupport)
 			{
@@ -198,7 +198,7 @@ static void read_bulk_callback(struct urb *urb)
 		for(uiIndex = 0 ; uiIndex < MIBS_MAX_HIST_ENTRIES ; uiIndex++)
 		{
 			if((pLeader->PLength <= MIBS_PKTSIZEHIST_RANGE*(uiIndex+1))
-				&& (pLeader->PLength > MIBS_PKTSIZEHIST_RANGE*(uiIndex)))
+			   && (pLeader->PLength > MIBS_PKTSIZEHIST_RANGE*(uiIndex)))
 				Adapter->aRxPktSizeHist[uiIndex]++;
 		}
 	}
@@ -213,9 +213,9 @@ static int ReceiveRcb(PS_INTERFACE_ADAPTER psIntfAdapter, PUSB_RCB pRcb)
 	int retval = 0;
 
 	usb_fill_bulk_urb(urb, psIntfAdapter->udev, usb_rcvbulkpipe(
-			psIntfAdapter->udev, psIntfAdapter->sBulkIn.bulk_in_endpointAddr),
-		  	urb->transfer_buffer, BCM_USB_MAX_READ_LENGTH, read_bulk_callback,
-			pRcb);
+				  psIntfAdapter->udev, psIntfAdapter->sBulkIn.bulk_in_endpointAddr),
+			  urb->transfer_buffer, BCM_USB_MAX_READ_LENGTH, read_bulk_callback,
+			  pRcb);
 	if(FALSE == psIntfAdapter->psAdapter->device_removed &&
 	   FALSE == psIntfAdapter->psAdapter->bEndPointHalted &&
 	   FALSE == psIntfAdapter->bSuspended &&
@@ -240,17 +240,17 @@ static int ReceiveRcb(PS_INTERFACE_ADAPTER psIntfAdapter, PUSB_RCB pRcb)
 }
 
 /*
-Function:				InterfaceRx
+  Function:				InterfaceRx
 
-Description:			This is the hardware specific Function for Receiving
-						data packet/control packets from the device.
+  Description:			This is the hardware specific Function for Receiving
+  data packet/control packets from the device.
 
-Input parameters:		IN PMINI_ADAPTER Adapter   - Miniport Adapter Context
+  Input parameters:		IN PMINI_ADAPTER Adapter   - Miniport Adapter Context
 
 
 
-Return:				TRUE  - If Rx was successful.
-					Other - If an error occurred.
+  Return:				TRUE  - If Rx was successful.
+  Other - If an error occurred.
 */
 
 BOOLEAN InterfaceRx (PS_INTERFACE_ADAPTER psIntfAdapter)
@@ -271,7 +271,7 @@ BOOLEAN InterfaceRx (PS_INTERFACE_ADAPTER psIntfAdapter)
 		//atomic_inc(&psIntfAdapter->uNumRcbUsed);
 		ReceiveRcb(psIntfAdapter, pRcb);
 		RxDescCount--;
-    }
+	}
 	return TRUE;
 }
 
diff --git a/drivers/staging/bcm/InterfaceTx.c b/drivers/staging/bcm/InterfaceTx.c
index ce82366..2065ac0 100644
--- a/drivers/staging/bcm/InterfaceTx.c
+++ b/drivers/staging/bcm/InterfaceTx.c
@@ -8,10 +8,10 @@ static void write_bulk_callback(struct urb *urb/*, struct pt_regs *regs*/)
 	CONTROL_MESSAGE *pControlMsg = (CONTROL_MESSAGE *)urb->transfer_buffer;
 	PMINI_ADAPTER psAdapter = psIntfAdapter->psAdapter ;
 	BOOLEAN bpowerDownMsg = FALSE ;
-    PMINI_ADAPTER Adapter = GET_BCM_ADAPTER(gblpnetdev);
+	PMINI_ADAPTER Adapter = GET_BCM_ADAPTER(gblpnetdev);
 
-    if (unlikely(netif_msg_tx_done(Adapter)))
-	    pr_info("%s: transmit status %d\n", Adapter->dev->name, urb->status);
+	if (unlikely(netif_msg_tx_done(Adapter)))
+		pr_info("%s: transmit status %d\n", Adapter->dev->name, urb->status);
 
 	if(urb->status != STATUS_SUCCESS)
 	{
@@ -37,7 +37,7 @@ static void write_bulk_callback(struct urb *urb/*, struct pt_regs *regs*/)
 	{
 
 		if(((pControlMsg->szData[0] == GO_TO_IDLE_MODE_PAYLOAD) &&
-			(pControlMsg->szData[1] == TARGET_CAN_GO_TO_IDLE_MODE)))
+		    (pControlMsg->szData[1] == TARGET_CAN_GO_TO_IDLE_MODE)))
 
 		{
 			bpowerDownMsg = TRUE ;
@@ -110,7 +110,7 @@ static void write_bulk_callback(struct urb *urb/*, struct pt_regs *regs*/)
 
 err_exit :
 	usb_free_coherent(urb->dev, urb->transfer_buffer_length,
- 			urb->transfer_buffer, urb->transfer_dma);
+			  urb->transfer_buffer, urb->transfer_dma);
 }
 
 
@@ -120,7 +120,7 @@ static PUSB_TCB GetBulkOutTcb(PS_INTERFACE_ADAPTER psIntfAdapter)
 	UINT index = 0;
 
 	if((atomic_read(&psIntfAdapter->uNumTcbUsed) < MAXIMUM_USB_TCB) &&
-		(psIntfAdapter->psAdapter->StopAllXaction ==FALSE))
+	   (psIntfAdapter->psAdapter->StopAllXaction ==FALSE))
 	{
 		index = atomic_read(&psIntfAdapter->uCurrTcb);
 		pTcb = &psIntfAdapter->asUsbTcb[index];
@@ -143,7 +143,7 @@ static int TransmitTcb(PS_INTERFACE_ADAPTER psIntfAdapter, PUSB_TCB pTcb, PVOID
 	int retval = 0;
 
 	urb->transfer_buffer = usb_alloc_coherent(psIntfAdapter->udev, len,
- 						GFP_ATOMIC, &urb->transfer_dma);
+						  GFP_ATOMIC, &urb->transfer_dma);
 	if (!urb->transfer_buffer)
 	{
 		pr_info("Error allocating memory\n");
@@ -158,15 +158,15 @@ static int TransmitTcb(PS_INTERFACE_ADAPTER psIntfAdapter, PUSB_TCB pTcb, PVOID
 	if((psIntfAdapter->psAdapter->chip_id == T3B) && (psIntfAdapter->bHighSpeedDevice == TRUE))
 	{
 		usb_fill_int_urb(urb, psIntfAdapter->udev,
-	    	psIntfAdapter->sBulkOut.bulk_out_pipe,
-			urb->transfer_buffer, len, write_bulk_callback, pTcb,
-			psIntfAdapter->sBulkOut.int_out_interval);
+				 psIntfAdapter->sBulkOut.bulk_out_pipe,
+				 urb->transfer_buffer, len, write_bulk_callback, pTcb,
+				 psIntfAdapter->sBulkOut.int_out_interval);
 	}
 	else
 	{
-	usb_fill_bulk_urb(urb, psIntfAdapter->udev,
-		  psIntfAdapter->sBulkOut.bulk_out_pipe,
-		  urb->transfer_buffer, len, write_bulk_callback, pTcb);
+		usb_fill_bulk_urb(urb, psIntfAdapter->udev,
+				  psIntfAdapter->sBulkOut.bulk_out_pipe,
+				  urb->transfer_buffer, len, write_bulk_callback, pTcb);
 	}
 	urb->transfer_flags |= URB_NO_TRANSFER_DMA_MAP; /* For DMA transfer */
 
diff --git a/drivers/staging/bcm/Ioctl.h b/drivers/staging/bcm/Ioctl.h
index f859cf1..1607a93 100644
--- a/drivers/staging/bcm/Ioctl.h
+++ b/drivers/staging/bcm/Ioctl.h
@@ -234,10 +234,10 @@ typedef struct bulkwrmbuffer
 /***********Structure used for FlashMap2.x *******************************/
 
 /*
-*	These are Sction present inside the Flash.
-*	There is sectional RD/WR for flash Map 2.x.
-*	hence these section will be used in read/write API.
-*/
+ *	These are Sction present inside the Flash.
+ *	There is sectional RD/WR for flash Map 2.x.
+ *	hence these section will be used in read/write API.
+ */
 
 typedef enum _FLASH2X_SECTION_VAL
 {
@@ -260,8 +260,8 @@ typedef enum _FLASH2X_SECTION_VAL
 }FLASH2X_SECTION_VAL;
 
 /*
-*	Structure used for READ/WRITE Flash  Map2.x
-*/
+ *	Structure used for READ/WRITE Flash  Map2.x
+ */
 typedef struct _FLASH2X_READWRITE
 {
 
@@ -273,11 +273,11 @@ typedef struct _FLASH2X_READWRITE
 
 }FLASH2X_READWRITE, *PFLASH2X_READWRITE;
 /*
-*	This structure is used for coping one section to other.
-*	there are two ways to copy one section to other.
-*	it NOB =0, complete section will be copied on to other.
-*	if NOB !=0, only NOB will be copied from the given offset.
-*/
+ *	This structure is used for coping one section to other.
+ *	there are two ways to copy one section to other.
+ *	it NOB =0, complete section will be copied on to other.
+ *	if NOB !=0, only NOB will be copied from the given offset.
+ */
 
 typedef struct _FLASH2X_COPY_SECTION
 {
@@ -303,15 +303,15 @@ typedef enum _SECTION_TYPE
 } SECTION_TYPE, *PSECTION_TYPE;
 
 /*
-*	This section provide the complete bitmap of the Flash.
-*	using this map lib/APP will isssue read/write command.
-	Fields are defined as :
-	Bit [0] = section is present  //1:present, 0: Not present
-*      Bit [1] = section is valid  //1: valid, 0: not valid
-*      Bit [2] = Section is R/W  //0: RW, 1: RO
-*	Bit [3] = Section is Active or not 1 means Active, 0->inactive
-*      Bit [7...3] = Reserved
-*/
+ *	This section provide the complete bitmap of the Flash.
+ *	using this map lib/APP will isssue read/write command.
+ Fields are defined as :
+ Bit [0] = section is present  //1:present, 0: Not present
+ *      Bit [1] = section is valid  //1: valid, 0: not valid
+ *      Bit [2] = Section is R/W  //0: RW, 1: RO
+ *	Bit [3] = Section is Active or not 1 means Active, 0->inactive
+ *      Bit [7...3] = Reserved
+ */
 
 typedef struct _FLASH2X_BITMAP
 {
@@ -339,21 +339,21 @@ typedef struct _ST_TIME_ELAPSED_
 }ST_TIME_ELAPSED,*PST_TIME_ELAPSED;
 
 enum {
-  WIMAX_IDX=0, /*To access WiMAX chip GPIO's for GPIO_MULTI_INFO or GPIO_MULTI_MODE*/
-  HOST_IDX,    /*To access Host chip GPIO's for GPIO_MULTI_INFO or GPIO_MULTI_MODE*/
-  MAX_IDX
+	WIMAX_IDX=0, /*To access WiMAX chip GPIO's for GPIO_MULTI_INFO or GPIO_MULTI_MODE*/
+	HOST_IDX,    /*To access Host chip GPIO's for GPIO_MULTI_INFO or GPIO_MULTI_MODE*/
+	MAX_IDX
 };
 typedef struct stGPIOMultiInfo
 {
-  UINT uiGPIOCommand; /* 1 for set and 0 for get*/
-  UINT uiGPIOMask;    /* set the correspondig bit to 1 to access GPIO*/
-  UINT uiGPIOValue;   /* 0 or 1; value to be set when command is 1.*/
+	UINT uiGPIOCommand; /* 1 for set and 0 for get*/
+	UINT uiGPIOMask;    /* set the correspondig bit to 1 to access GPIO*/
+	UINT uiGPIOValue;   /* 0 or 1; value to be set when command is 1.*/
 }__attribute__((packed))GPIO_MULTI_INFO , *PGPIO_MULTI_INFO;
 
 typedef struct stGPIOMultiMode
 {
-  UINT uiGPIOMode;    /* 1 for OUT mode, 0 for IN mode*/
-  UINT uiGPIOMask;    /* GPIO mask to set mode*/
+	UINT uiGPIOMode;    /* 1 for OUT mode, 0 for IN mode*/
+	UINT uiGPIOMask;    /* GPIO mask to set mode*/
 }__attribute__((packed))GPIO_MULTI_MODE, *PGPIO_MULTI_MODE;
 
 
diff --git a/drivers/staging/bcm/LeakyBucket.c b/drivers/staging/bcm/LeakyBucket.c
index b77ed10..d1b1907 100644
--- a/drivers/staging/bcm/LeakyBucket.c
+++ b/drivers/staging/bcm/LeakyBucket.c
@@ -1,19 +1,19 @@
 /**********************************************************************
-* 			LEAKYBUCKET.C
-*	This file contains the routines related to Leaky Bucket Algorithm.
-***********************************************************************/
+ * 			LEAKYBUCKET.C
+ *	This file contains the routines related to Leaky Bucket Algorithm.
+ ***********************************************************************/
 #include "headers.h"
 
 /*********************************************************************
-* Function    - UpdateTokenCount()
-*
-* Description - This function calculates the token count for each
-*				channel and updates the same in Adapter strucuture.
-*
-* Parameters  - Adapter: Pointer to the Adapter structure.
-*
-* Returns     - None
-**********************************************************************/
+ * Function    - UpdateTokenCount()
+ *
+ * Description - This function calculates the token count for each
+ *				channel and updates the same in Adapter strucuture.
+ *
+ * Parameters  - Adapter: Pointer to the Adapter structure.
+ *
+ * Returns     - None
+ **********************************************************************/
 
 static VOID UpdateTokenCount(register PMINI_ADAPTER Adapter)
 {
@@ -33,22 +33,22 @@ static VOID UpdateTokenCount(register PMINI_ADAPTER Adapter)
 	for(i = 0; i < NO_OF_QUEUES; i++)
 	{
 		if(TRUE == Adapter->PackInfo[i].bValid &&
-			(1 == Adapter->PackInfo[i].ucDirection))
+		   (1 == Adapter->PackInfo[i].ucDirection))
 		{
 			liCurrentTime = ((tv.tv_sec-
-				Adapter->PackInfo[i].stLastUpdateTokenAt.tv_sec)*1000 +
-				(tv.tv_usec-Adapter->PackInfo[i].stLastUpdateTokenAt.tv_usec)/
-				1000);
+					  Adapter->PackInfo[i].stLastUpdateTokenAt.tv_sec)*1000 +
+					 (tv.tv_usec-Adapter->PackInfo[i].stLastUpdateTokenAt.tv_usec)/
+					 1000);
 			if(0!=liCurrentTime)
 			{
 				Adapter->PackInfo[i].uiCurrentTokenCount += (ULONG)
 					((Adapter->PackInfo[i].uiMaxAllowedRate) *
-					((ULONG)((liCurrentTime)))/1000);
+					 ((ULONG)((liCurrentTime)))/1000);
 				memcpy(&Adapter->PackInfo[i].stLastUpdateTokenAt,
-					&tv, sizeof(struct timeval));
+				       &tv, sizeof(struct timeval));
 				Adapter->PackInfo[i].liLastUpdateTokenAt = liCurrentTime;
 				if((Adapter->PackInfo[i].uiCurrentTokenCount) >=
-				Adapter->PackInfo[i].uiMaxBucketSize)
+				   Adapter->PackInfo[i].uiMaxBucketSize)
 				{
 					Adapter->PackInfo[i].uiCurrentTokenCount =
 						Adapter->PackInfo[i].uiMaxBucketSize;
@@ -63,26 +63,26 @@ static VOID UpdateTokenCount(register PMINI_ADAPTER Adapter)
 
 
 /*********************************************************************
-* Function    - IsPacketAllowedForFlow()
-*
-* Description - This function checks whether the given packet from the
-*				specified queue can be allowed for transmission by
-*				checking the token count.
-*
-* Parameters  - Adapter	      :	Pointer to the Adpater structure.
-* 			  - iQIndex	      :	The queue Identifier.
-* 			  - ulPacketLength:	Number of bytes to be transmitted.
-*
-* Returns     - The number of bytes allowed for transmission.
-*
-***********************************************************************/
+ * Function    - IsPacketAllowedForFlow()
+ *
+ * Description - This function checks whether the given packet from the
+ *				specified queue can be allowed for transmission by
+ *				checking the token count.
+ *
+ * Parameters  - Adapter	      :	Pointer to the Adpater structure.
+ * 			  - iQIndex	      :	The queue Identifier.
+ * 			  - ulPacketLength:	Number of bytes to be transmitted.
+ *
+ * Returns     - The number of bytes allowed for transmission.
+ *
+ ***********************************************************************/
 static ULONG GetSFTokenCount(PMINI_ADAPTER Adapter, PacketInfo *psSF)
 {
 	bcm_dbg(Adapter, TX, TOKEN_COUNTS, ALL,
 		"IsPacketAllowedForFlow ===>\n");
 	/* Validate the parameters */
 	if(NULL == Adapter || (psSF < Adapter->PackInfo &&
-		(uintptr_t)psSF > (uintptr_t) &Adapter->PackInfo[HiPriority]))
+			       (uintptr_t)psSF > (uintptr_t) &Adapter->PackInfo[HiPriority]))
 	{
 		bcm_dbg(Adapter, TX, TOKEN_COUNTS, ALL,
 			"IPAFF: Got wrong Parameters:Adapter: %p, QIndex: %zd\n",
@@ -94,7 +94,7 @@ static ULONG GetSFTokenCount(PMINI_ADAPTER Adapter, PacketInfo *psSF)
 	{
 		if(0 != psSF->uiCurrentTokenCount)
 		{
-				return psSF->uiCurrentTokenCount;
+			return psSF->uiCurrentTokenCount;
 		}
 		else
 		{
@@ -115,9 +115,9 @@ static ULONG GetSFTokenCount(PMINI_ADAPTER Adapter, PacketInfo *psSF)
 }
 
 /**
-@ingroup tx_functions
-This function despatches packet from the specified queue.
-@return Zero(success) or Negative value(failure)
+   @ingroup tx_functions
+   This function despatches packet from the specified queue.
+   @return Zero(success) or Negative value(failure)
 */
 static INT SendPacketFromQueue(PMINI_ADAPTER Adapter,/**<Logical Adapter*/
 			       PacketInfo *psSF,		/**<Queue identifier*/
@@ -153,17 +153,17 @@ static INT SendPacketFromQueue(PMINI_ADAPTER Adapter,/**<Logical Adapter*/
 }
 
 /************************************************************************
-* Function    - CheckAndSendPacketFromIndex()
-*
-* Description - This function dequeues the data/control packet from the
-*				specified queue for transmission.
-*
-* Parameters  - Adapter : Pointer to the driver control structure.
-* 			  - iQIndex : The queue Identifier.
-*
-* Returns     - None.
-*
-****************************************************************************/
+ * Function    - CheckAndSendPacketFromIndex()
+ *
+ * Description - This function dequeues the data/control packet from the
+ *				specified queue for transmission.
+ *
+ * Parameters  - Adapter : Pointer to the driver control structure.
+ * 			  - iQIndex : The queue Identifier.
+ *
+ * Returns     - None.
+ *
+ ****************************************************************************/
 static VOID CheckAndSendPacketFromIndex(PMINI_ADAPTER Adapter, PacketInfo *psSF)
 {
 	struct sk_buff	*QueuePacket=NULL;
@@ -245,12 +245,12 @@ static VOID CheckAndSendPacketFromIndex(PMINI_ADAPTER Adapter, PacketInfo *psSF)
 	{
 
 		if((atomic_read(&Adapter->CurrNumFreeTxDesc) > 0 ) &&
-			(atomic_read(&Adapter->index_rd_txcntrlpkt) !=
-			 atomic_read(&Adapter->index_wr_txcntrlpkt))
+		   (atomic_read(&Adapter->index_rd_txcntrlpkt) !=
+		    atomic_read(&Adapter->index_wr_txcntrlpkt))
 			)
 		{
 			pControlPacket = Adapter->txctlpacket
-			[(atomic_read(&Adapter->index_rd_txcntrlpkt)%MAX_CNTRL_PKTS)];
+				[(atomic_read(&Adapter->index_rd_txcntrlpkt)%MAX_CNTRL_PKTS)];
 			if(pControlPacket)
 			{
 				bcm_dbg(Adapter, TX, TX_PACKETS, ALL,
@@ -283,15 +283,15 @@ static VOID CheckAndSendPacketFromIndex(PMINI_ADAPTER Adapter, PacketInfo *psSF)
 
 
 /*******************************************************************
-* Function    - transmit_packets()
-*
-* Description - This function transmits the packets from different
-*				queues, if free descriptors are available on target.
-*
-* Parameters  - Adapter:  Pointer to the Adapter structure.
-*
-* Returns     - None.
-********************************************************************/
+ * Function    - transmit_packets()
+ *
+ * Description - This function transmits the packets from different
+ *				queues, if free descriptors are available on target.
+ *
+ * Parameters  - Adapter:  Pointer to the Adapter structure.
+ *
+ * Returns     - None.
+ ********************************************************************/
 VOID transmit_packets(PMINI_ADAPTER Adapter)
 {
 	UINT 	uiPrevTotalCount = 0;
@@ -325,11 +325,11 @@ VOID transmit_packets(PMINI_ADAPTER Adapter)
 	for(iIndex=HiPriority;iIndex>=0;iIndex--)
 	{
 		if(	!uiPrevTotalCount || (TRUE == Adapter->device_removed))
-				break;
+			break;
 
 		if(Adapter->PackInfo[iIndex].bValid &&
-			Adapter->PackInfo[iIndex].uiPendedLast &&
-			Adapter->PackInfo[iIndex].uiCurrentBytesOnHost)
+		   Adapter->PackInfo[iIndex].uiPendedLast &&
+		   Adapter->PackInfo[iIndex].uiCurrentBytesOnHost)
 		{
 			bcm_dbg(Adapter, TX, TX_PACKETS, ALL,
 				"Calling CheckAndSendPacketFromIndex..\n");
@@ -341,15 +341,15 @@ VOID transmit_packets(PMINI_ADAPTER Adapter)
 	while(uiPrevTotalCount > 0 && !Adapter->device_removed)
 	{
 		exit_flag = TRUE ;
-			//second iteration to parse non-pending queues
+		//second iteration to parse non-pending queues
 		for(iIndex=HiPriority;iIndex>=0;iIndex--)
 		{
 			if( !uiPrevTotalCount || (TRUE == Adapter->device_removed))
-					break;
+				break;
 
 			if(Adapter->PackInfo[iIndex].bValid &&
-				Adapter->PackInfo[iIndex].uiCurrentBytesOnHost &&
-				!Adapter->PackInfo[iIndex].uiPendedLast )
+			   Adapter->PackInfo[iIndex].uiCurrentBytesOnHost &&
+			   !Adapter->PackInfo[iIndex].uiPendedLast )
 			{
 				bcm_dbg(Adapter, TX, TX_PACKETS, ALL,
 					"Calling CheckAndSendPacketFromIndex..\n");
@@ -366,7 +366,7 @@ VOID transmit_packets(PMINI_ADAPTER Adapter)
 			break;
 		}
 		if(exit_flag == TRUE )
-		    break ;
+			break ;
 	}/* end of inner while loop */
 
 	update_per_cid_rx  (Adapter);
diff --git a/drivers/staging/bcm/Macros.h b/drivers/staging/bcm/Macros.h
index 46ed99c..3393b46 100644
--- a/drivers/staging/bcm/Macros.h
+++ b/drivers/staging/bcm/Macros.h
@@ -1,6 +1,6 @@
 /*************************************
-* Macros.h
-**************************************/
+ * Macros.h
+ **************************************/
 #ifndef __MACROS_H__
 #define __MACROS_H__
 
diff --git a/drivers/staging/bcm/Misc.c b/drivers/staging/bcm/Misc.c
index bfa0e68..36929e6 100644
--- a/drivers/staging/bcm/Misc.c
+++ b/drivers/staging/bcm/Misc.c
@@ -267,8 +267,8 @@ INT CopyBufferToControlPacket(PMINI_ADAPTER Adapter, PVOID ioBuffer)
 	pLeader = (PLEADER)ioBuffer; /* ioBuffer Contains sw_Status and Payload */
 
 	if (Adapter->bShutStatus == TRUE &&
-		pLinkReq->szData[0] == LINK_DOWN_REQ_PAYLOAD &&
-		pLinkReq->szData[1] == LINK_SYNC_UP_SUBTYPE) {
+	    pLinkReq->szData[0] == LINK_DOWN_REQ_PAYLOAD &&
+	    pLinkReq->szData[1] == LINK_SYNC_UP_SUBTYPE) {
 
 		/* Got sync down in SHUTDOWN..we could not process this. */
 		bcm_dbg(Adapter, TX, TX_CONTROL, ALL,
@@ -277,9 +277,9 @@ INT CopyBufferToControlPacket(PMINI_ADAPTER Adapter, PVOID ioBuffer)
 	}
 
 	if ((pLeader->Status == LINK_UP_CONTROL_REQ) &&
-		((pLinkReq->szData[0] == LINK_UP_REQ_PAYLOAD &&
-			(pLinkReq->szData[1] == LINK_SYNC_UP_SUBTYPE)) || /* Sync Up Command */
-			pLinkReq->szData[0] == NETWORK_ENTRY_REQ_PAYLOAD)) /* Net Entry Command */ {
+	    ((pLinkReq->szData[0] == LINK_UP_REQ_PAYLOAD &&
+	      (pLinkReq->szData[1] == LINK_SYNC_UP_SUBTYPE)) || /* Sync Up Command */
+	     pLinkReq->szData[0] == NETWORK_ENTRY_REQ_PAYLOAD)) /* Net Entry Command */ {
 
 		if (Adapter->LinkStatus > PHY_SYNC_ACHIVED) {
 			bcm_dbg(Adapter, TX, TX_CONTROL, ALL,
@@ -316,7 +316,7 @@ INT CopyBufferToControlPacket(PMINI_ADAPTER Adapter, PVOID ioBuffer)
 	if (TRUE == Adapter->IdleMode) {
 		/* pr_info("Device is in Idle mode ... hence\n"); */
 		if (pLeader->Status == LINK_UP_CONTROL_REQ || pLeader->Status == 0x80 ||
-			pLeader->Status == CM_CONTROL_NEWDSX_MULTICLASSIFIER_REQ) {
+		    pLeader->Status == CM_CONTROL_NEWDSX_MULTICLASSIFIER_REQ) {
 
 			if ((pLeader->Status == LINK_UP_CONTROL_REQ) && (pLinkReq->szData[0] == LINK_DOWN_REQ_PAYLOAD))	{
 				if ((pLinkReq->szData[1] == LINK_SYNC_DOWN_SUBTYPE)) {
@@ -374,7 +374,7 @@ INT CopyBufferToControlPacket(PMINI_ADAPTER Adapter, PVOID ioBuffer)
 	if (ctrl_buff) {
 		if (pLeader) {
 			if ((pLeader->Status == 0x80) ||
-				(pLeader->Status == CM_CONTROL_NEWDSX_MULTICLASSIFIER_REQ)) {
+			    (pLeader->Status == CM_CONTROL_NEWDSX_MULTICLASSIFIER_REQ)) {
 				/*
 				 * Restructure the DSX message to handle Multiple classifier Support
 				 * Write the Service Flow param Structures directly to the target
@@ -440,16 +440,16 @@ INT CopyBufferToControlPacket(PMINI_ADAPTER Adapter, PVOID ioBuffer)
 
 #if 0
 /*****************************************************************
-* Function    - SendStatisticsPointerRequest()
-*
-* Description - This function builds and forwards the Statistics
-* Pointer Request control Packet.
-*
-* Parameters  - Adapter					: Pointer to Adapter structure.
-* - pstStatisticsPtrRequest : Pointer to link request.
-*
-* Returns     - None.
-*****************************************************************/
+ * Function    - SendStatisticsPointerRequest()
+ *
+ * Description - This function builds and forwards the Statistics
+ * Pointer Request control Packet.
+ *
+ * Parameters  - Adapter					: Pointer to Adapter structure.
+ * - pstStatisticsPtrRequest : Pointer to link request.
+ *
+ * Returns     - None.
+ *****************************************************************/
 static VOID SendStatisticsPointerRequest(PMINI_ADAPTER Adapter, PLINK_REQUEST pstStatisticsPtrRequest)
 {
 	bcm_dbg(Adapter, RX, RX_DPC, ALL, "======>\n");
@@ -463,15 +463,15 @@ static VOID SendStatisticsPointerRequest(PMINI_ADAPTER Adapter, PLINK_REQUEST ps
 #endif
 
 /******************************************************************
-* Function    - LinkMessage()
-*
-* Description - This function builds the Sync-up and Link-up request
-* packet messages depending on the device Link status.
-*
-* Parameters  - Adapter:	Pointer to the Adapter structure.
-*
-* Returns     - None.
-*******************************************************************/
+ * Function    - LinkMessage()
+ *
+ * Description - This function builds the Sync-up and Link-up request
+ * packet messages depending on the device Link status.
+ *
+ * Parameters  - Adapter:	Pointer to the Adapter structure.
+ *
+ * Returns     - None.
+ *******************************************************************/
 VOID LinkMessage(PMINI_ADAPTER Adapter)
 {
 	PLINK_REQUEST pstLinkRequest = NULL;
@@ -519,15 +519,15 @@ VOID LinkMessage(PMINI_ADAPTER Adapter)
 }
 
 /**********************************************************************
-* Function    - StatisticsResponse()
-*
-* Description - This function handles the Statistics response packet.
-*
-* Parameters  - Adapter	: Pointer to the Adapter structure.
-* - pvBuffer: Starting address of Statistic response data.
-*
-* Returns     - None.
-************************************************************************/
+ * Function    - StatisticsResponse()
+ *
+ * Description - This function handles the Statistics response packet.
+ *
+ * Parameters  - Adapter	: Pointer to the Adapter structure.
+ * - pvBuffer: Starting address of Statistic response data.
+ *
+ * Returns     - None.
+ ************************************************************************/
 VOID StatisticsResponse(PMINI_ADAPTER Adapter, PVOID pvBuffer)
 {
 	bcm_dbg(Adapter, OTHERS, DUMP_INFO, ALL, "%s====>\n", __func__);
@@ -539,15 +539,15 @@ VOID StatisticsResponse(PMINI_ADAPTER Adapter, PVOID pvBuffer)
 }
 
 /**********************************************************************
-* Function    - LinkControlResponseMessage()
-*
-* Description - This function handles the Link response packets.
-*
-* Parameters  - Adapter	 : Pointer to the Adapter structure.
-* - pucBuffer: Starting address of Link response data.
-*
-* Returns     - None.
-***********************************************************************/
+ * Function    - LinkControlResponseMessage()
+ *
+ * Description - This function handles the Link response packets.
+ *
+ * Parameters  - Adapter	 : Pointer to the Adapter structure.
+ * - pucBuffer: Starting address of Link response data.
+ *
+ * Returns     - None.
+ ***********************************************************************/
 VOID LinkControlResponseMessage(PMINI_ADAPTER Adapter, PUCHAR pucBuffer)
 {
 	bcm_dbg(Adapter, RX, RX_DPC, ALL, "=====>\n");
@@ -557,19 +557,19 @@ VOID LinkControlResponseMessage(PMINI_ADAPTER Adapter, PUCHAR pucBuffer)
 		case PHY_SYNC_ACHIVED: /* SYNCed UP */
 			pr_info("PHY_SYNC_ACHIVED\n");
 
-				if (Adapter->LinkStatus == LINKUP_DONE)
-					beceem_protocol_reset(Adapter);
+			if (Adapter->LinkStatus == LINKUP_DONE)
+				beceem_protocol_reset(Adapter);
 
-				Adapter->usBestEffortQueueIndex = INVALID_QUEUE_INDEX;
-				Adapter->LinkStatus = PHY_SYNC_ACHIVED;
+			Adapter->usBestEffortQueueIndex = INVALID_QUEUE_INDEX;
+			Adapter->LinkStatus = PHY_SYNC_ACHIVED;
 
-				if (Adapter->LEDInfo.led_thread_running & BCM_LED_THREAD_RUNNING_ACTIVELY) {
-					Adapter->DriverState = NO_NETWORK_ENTRY;
-					wake_up(&Adapter->LEDInfo.notify_led_event);
-				}
+			if (Adapter->LEDInfo.led_thread_running & BCM_LED_THREAD_RUNNING_ACTIVELY) {
+				Adapter->DriverState = NO_NETWORK_ENTRY;
+				wake_up(&Adapter->LEDInfo.notify_led_event);
+			}
 
-				LinkMessage(Adapter);
-				break;
+			LinkMessage(Adapter);
+			break;
 
 		case LINKUP_DONE:
 			bcm_dbg(Adapter, RX, RX_DPC, ALL, "LINKUP_DONE\n");
@@ -650,7 +650,7 @@ void SendIdleModeResponse(PMINI_ADAPTER Adapter)
 
 
 	if ((NVMAccess || lowPwrAbortMsg || atomic_read(&Adapter->TotalPacketCount)) &&
-		(Adapter->ulPowerSaveMode != DEVICE_POWERSAVE_MODE_AS_PROTOCOL_IDLE_MODE)) {
+	    (Adapter->ulPowerSaveMode != DEVICE_POWERSAVE_MODE_AS_PROTOCOL_IDLE_MODE)) {
 
 		if (!NVMAccess)
 			up(&Adapter->NVMRdmWrmLock);
@@ -723,14 +723,14 @@ void SendIdleModeResponse(PMINI_ADAPTER Adapter)
 }
 
 /******************************************************************
-* Function    - DumpPackInfo()
-*
-* Description - This function dumps the all Queue(PackInfo[]) details.
-*
-* Parameters  - Adapter: Pointer to the Adapter structure.
-*
-* Returns     - None.
-*******************************************************************/
+ * Function    - DumpPackInfo()
+ *
+ * Description - This function dumps the all Queue(PackInfo[]) details.
+ *
+ * Parameters  - Adapter: Pointer to the Adapter structure.
+ *
+ * Returns     - None.
+ *******************************************************************/
 VOID DumpPackInfo(PMINI_ADAPTER Adapter)
 {
 	UINT uiLoopIndex = 0;
@@ -953,9 +953,9 @@ VOID DumpPackInfo(PMINI_ADAPTER Adapter)
 			Adapter->PackInfo[uiLoopIndex].ucServiceClassName[2],
 			Adapter->PackInfo[uiLoopIndex].ucServiceClassName[3]);
 /* bcm_dbg(Adapter, OTHERS, DUMP_INFO, ALL, "bHeaderSuppressionEnabled :%X\n", Adapter->PackInfo[uiLoopIndex].bHeaderSuppressionEnabled);
-   * bcm_dbg(Adapter, OTHERS, DUMP_INFO, ALL, "uiTotalTxBytes:%X\n", Adapter->PackInfo[uiLoopIndex].uiTotalTxBytes);
-   * bcm_dbg(Adapter, OTHERS, DUMP_INFO, ALL, "uiTotalRxBytes:%X\n", Adapter->PackInfo[uiLoopIndex].uiTotalRxBytes);
-   *		DumpDebug(DUMP_INFO,("				uiRanOutOfResCount:%X\n",Adapter->PackInfo[uiLoopIndex].uiRanOutOfResCount));
+ * bcm_dbg(Adapter, OTHERS, DUMP_INFO, ALL, "uiTotalTxBytes:%X\n", Adapter->PackInfo[uiLoopIndex].uiTotalTxBytes);
+ * bcm_dbg(Adapter, OTHERS, DUMP_INFO, ALL, "uiTotalRxBytes:%X\n", Adapter->PackInfo[uiLoopIndex].uiTotalRxBytes);
+ *		DumpDebug(DUMP_INFO,("				uiRanOutOfResCount:%X\n",Adapter->PackInfo[uiLoopIndex].uiRanOutOfResCount));
  */
 	}
 
@@ -1009,9 +1009,9 @@ int reset_card_proc(PMINI_ADAPTER ps_adapter)
 		}
 
 		if (ps_adapter->chip_id == BCS220_2 ||
-			ps_adapter->chip_id == BCS220_2BC ||
-			ps_adapter->chip_id == BCS250_BC ||
-			ps_adapter->chip_id == BCS220_3) {
+		    ps_adapter->chip_id == BCS220_2BC ||
+		    ps_adapter->chip_id == BCS250_BC ||
+		    ps_adapter->chip_id == BCS220_3) {
 
 			bytes = rdmalt(ps_adapter, HPM_CONFIG_LDO145, &value, sizeof(value));
 			if (bytes < 0) {
@@ -1456,7 +1456,7 @@ static void convertEndian(B_UINT8 rwFlag, PUINT puiBuffer, UINT uiByteCount)
 int rdm(PMINI_ADAPTER Adapter, UINT uiAddress, PCHAR pucBuff, size_t sSize)
 {
 	return Adapter->interface_rdm(Adapter->pvInterfaceAdapter,
-				uiAddress, pucBuff, sSize);
+				      uiAddress, pucBuff, sSize);
 }
 
 int wrm(PMINI_ADAPTER Adapter, UINT uiAddress, PCHAR pucBuff, size_t sSize)
@@ -1464,7 +1464,7 @@ int wrm(PMINI_ADAPTER Adapter, UINT uiAddress, PCHAR pucBuff, size_t sSize)
 	int iRetVal;
 
 	iRetVal = Adapter->interface_wrm(Adapter->pvInterfaceAdapter,
-					uiAddress, pucBuff, sSize);
+					 uiAddress, pucBuff, sSize);
 	return iRetVal;
 }
 
@@ -1490,8 +1490,8 @@ int wrmWithLock(PMINI_ADAPTER Adapter, UINT uiAddress, PCHAR pucBuff, size_t sSi
 	down(&Adapter->rdmwrmsync);
 
 	if ((Adapter->IdleMode == TRUE) ||
-		(Adapter->bShutStatus == TRUE) ||
-		(Adapter->bPreparingForLowPowerMode == TRUE)) {
+	    (Adapter->bShutStatus == TRUE) ||
+	    (Adapter->bPreparingForLowPowerMode == TRUE)) {
 
 		status = -EACCES;
 		goto exit;
@@ -1510,8 +1510,8 @@ int wrmaltWithLock(PMINI_ADAPTER Adapter, UINT uiAddress, PUINT pucBuff, size_t
 	down(&Adapter->rdmwrmsync);
 
 	if ((Adapter->IdleMode == TRUE) ||
-		(Adapter->bShutStatus == TRUE) ||
-		(Adapter->bPreparingForLowPowerMode == TRUE)) {
+	    (Adapter->bShutStatus == TRUE) ||
+	    (Adapter->bPreparingForLowPowerMode == TRUE)) {
 
 		iRetVal = -EACCES;
 		goto exit;
@@ -1529,8 +1529,8 @@ int rdmaltWithLock(PMINI_ADAPTER Adapter, UINT uiAddress, PUINT pucBuff, size_t
 
 	down(&Adapter->rdmwrmsync);
 	if ((Adapter->IdleMode == TRUE) ||
-		(Adapter->bShutStatus == TRUE) ||
-		(Adapter->bPreparingForLowPowerMode == TRUE)) {
+	    (Adapter->bShutStatus == TRUE) ||
+	    (Adapter->bPreparingForLowPowerMode == TRUE)) {
 
 		uiRetVal = -EACCES;
 		goto exit;
@@ -1674,9 +1674,9 @@ static void HandleShutDownModeRequest(PMINI_ADAPTER Adapter, PUCHAR pucBuffer)
 		/* Target wants to go to Shut Down Mode */
 		/* InterfacePrepareForShutdown(Adapter); */
 		if (Adapter->chip_id == BCS220_2 ||
-			Adapter->chip_id == BCS220_2BC ||
-			Adapter->chip_id == BCS250_BC ||
-			Adapter->chip_id == BCS220_3) {
+		    Adapter->chip_id == BCS220_2BC ||
+		    Adapter->chip_id == BCS250_BC ||
+		    Adapter->chip_id == BCS220_3) {
 
 			rdmalt(Adapter, HPM_CONFIG_MSW, &uiResetValue, 4);
 			uiResetValue |= (1<<17);
@@ -1713,9 +1713,9 @@ S_CLASSIFIER_RULE *GetFragIPClsEntry(PMINI_ADAPTER Adapter, USHORT usIpIdentific
 	UINT uiIndex = 0;
 	for (uiIndex = 0; uiIndex < MAX_FRAGMENTEDIP_CLASSIFICATION_ENTRIES; uiIndex++) {
 		if ((Adapter->astFragmentedPktClassifierTable[uiIndex].bUsed) &&
-			(Adapter->astFragmentedPktClassifierTable[uiIndex].usIpIdentification == usIpIdentification) &&
-			(Adapter->astFragmentedPktClassifierTable[uiIndex].ulSrcIpAddress == SrcIP) &&
-			!Adapter->astFragmentedPktClassifierTable[uiIndex].bOutOfOrderFragment)
+		    (Adapter->astFragmentedPktClassifierTable[uiIndex].usIpIdentification == usIpIdentification) &&
+		    (Adapter->astFragmentedPktClassifierTable[uiIndex].ulSrcIpAddress == SrcIP) &&
+		    !Adapter->astFragmentedPktClassifierTable[uiIndex].bOutOfOrderFragment)
 
 			return Adapter->astFragmentedPktClassifierTable[uiIndex].pstMatchedClassifierEntry;
 	}
@@ -1738,8 +1738,8 @@ void DelFragIPClsEntry(PMINI_ADAPTER Adapter, USHORT usIpIdentification, ULONG S
 	UINT uiIndex = 0;
 	for (uiIndex = 0; uiIndex < MAX_FRAGMENTEDIP_CLASSIFICATION_ENTRIES; uiIndex++) {
 		if ((Adapter->astFragmentedPktClassifierTable[uiIndex].bUsed) &&
-			(Adapter->astFragmentedPktClassifierTable[uiIndex].usIpIdentification == usIpIdentification) &&
-			(Adapter->astFragmentedPktClassifierTable[uiIndex].ulSrcIpAddress == SrcIp))
+		    (Adapter->astFragmentedPktClassifierTable[uiIndex].usIpIdentification == usIpIdentification) &&
+		    (Adapter->astFragmentedPktClassifierTable[uiIndex].ulSrcIpAddress == SrcIp))
 
 			memset(&Adapter->astFragmentedPktClassifierTable[uiIndex], 0, sizeof(S_FRAGMENTED_PACKET_INFO));
 	}
@@ -1756,13 +1756,13 @@ void update_per_cid_rx(PMINI_ADAPTER Adapter)
 		if (Adapter->PackInfo[qindex].ucDirection == 0) {
 			Adapter->PackInfo[qindex].uiCurrentRxRate =
 				(Adapter->PackInfo[qindex].uiCurrentRxRate +
-					Adapter->PackInfo[qindex].uiThisPeriodRxBytes) / 2;
+				 Adapter->PackInfo[qindex].uiThisPeriodRxBytes) / 2;
 
 			Adapter->PackInfo[qindex].uiThisPeriodRxBytes = 0;
 		} else {
 			Adapter->PackInfo[qindex].uiCurrentDrainRate =
 				(Adapter->PackInfo[qindex].uiCurrentDrainRate +
-					Adapter->PackInfo[qindex].uiThisPeriodSentBytes) / 2;
+				 Adapter->PackInfo[qindex].uiThisPeriodSentBytes) / 2;
 			Adapter->PackInfo[qindex].uiThisPeriodSentBytes = 0;
 		}
 	}
diff --git a/drivers/staging/bcm/PHSDefines.h b/drivers/staging/bcm/PHSDefines.h
index eed4cfc..9a0e933 100644
--- a/drivers/staging/bcm/PHSDefines.h
+++ b/drivers/staging/bcm/PHSDefines.h
@@ -46,22 +46,22 @@
 
 typedef struct _S_PHS_RULE
 {
-    /// brief 8bit PHSI Of The Service Flow
-    B_UINT8                         u8PHSI;
-    /// brief PHSF Of The Service Flow
-    B_UINT8                         u8PHSFLength;
-    B_UINT8                         u8PHSF[MAX_PHS_LENGTHS];
-    /// brief PHSM Of The Service Flow
-    B_UINT8                         u8PHSMLength;
-    B_UINT8                         u8PHSM[MAX_PHS_LENGTHS];
-    /// brief 8bit PHSS Of The Service Flow
-    B_UINT8                         u8PHSS;
-    /// brief 8bit PHSV Of The Service Flow
-    B_UINT8                         u8PHSV;
-   //Reference Count for this PHS Rule
-    B_UINT8                         u8RefCnt;
-   //Flag to Store Unclassified PHS rules only in DL
-    B_UINT8							bUnclassifiedPHSRule;
+	/// brief 8bit PHSI Of The Service Flow
+	B_UINT8                         u8PHSI;
+	/// brief PHSF Of The Service Flow
+	B_UINT8                         u8PHSFLength;
+	B_UINT8                         u8PHSF[MAX_PHS_LENGTHS];
+	/// brief PHSM Of The Service Flow
+	B_UINT8                         u8PHSMLength;
+	B_UINT8                         u8PHSM[MAX_PHS_LENGTHS];
+	/// brief 8bit PHSS Of The Service Flow
+	B_UINT8                         u8PHSS;
+	/// brief 8bit PHSV Of The Service Flow
+	B_UINT8                         u8PHSV;
+	//Reference Count for this PHS Rule
+	B_UINT8                         u8RefCnt;
+	//Flag to Store Unclassified PHS rules only in DL
+	B_UINT8							bUnclassifiedPHSRule;
 
 	B_UINT8							u8Reserved[3];
 
diff --git a/drivers/staging/bcm/PHSModule.c b/drivers/staging/bcm/PHSModule.c
index a25c276..cb0ab32 100644
--- a/drivers/staging/bcm/PHSModule.c
+++ b/drivers/staging/bcm/PHSModule.c
@@ -19,30 +19,30 @@ static UINT GetPhsRuleEntry(S_CLASSIFIER_TABLE *pstClassifierTable,B_UINT32 uiPH
 static void free_phs_serviceflow_rules(S_SERVICEFLOW_TABLE *psServiceFlowRulesTable);
 
 static int phs_compress(S_PHS_RULE   *phs_members,unsigned char *in_buf,
-						unsigned char *out_buf,unsigned int *header_size,UINT *new_header_size );
+			unsigned char *out_buf,unsigned int *header_size,UINT *new_header_size );
 
 
 static int verify_suppress_phsf(unsigned char *in_buffer,unsigned char *out_buffer,
-								unsigned char *phsf,unsigned char *phsm,unsigned int phss,unsigned int phsv,UINT *new_header_size );
+				unsigned char *phsf,unsigned char *phsm,unsigned int phss,unsigned int phsv,UINT *new_header_size );
 
 static int phs_decompress(unsigned char *in_buf,unsigned char *out_buf,\
-						  S_PHS_RULE   *phs_rules,UINT *header_size);
+			  S_PHS_RULE   *phs_rules,UINT *header_size);
 
 
 static ULONG PhsCompress(void* pvContext,
-				  B_UINT16 uiVcid,
-				  B_UINT16 uiClsId,
-				  void *pvInputBuffer,
-				  void *pvOutputBuffer,
-				  UINT *pOldHeaderSize,
-				  UINT *pNewHeaderSize );
+			 B_UINT16 uiVcid,
+			 B_UINT16 uiClsId,
+			 void *pvInputBuffer,
+			 void *pvOutputBuffer,
+			 UINT *pOldHeaderSize,
+			 UINT *pNewHeaderSize );
 
 static ULONG PhsDeCompress(void* pvContext,
-				  B_UINT16 uiVcid,
-				  void *pvInputBuffer,
-				  void *pvOutputBuffer,
-				  UINT *pInHeaderSize,
-				  UINT *pOutHeaderSize);
+			   B_UINT16 uiVcid,
+			   void *pvInputBuffer,
+			   void *pvOutputBuffer,
+			   UINT *pInHeaderSize,
+			   UINT *pOutHeaderSize);
 
 
 
@@ -50,32 +50,32 @@ static ULONG PhsDeCompress(void* pvContext,
 #define OUT
 
 /*
-Function:				PHSTransmit
+  Function:				PHSTransmit
 
-Description:			This routine handle PHS(Payload Header Suppression for Tx path.
-					It extracts a fragment of the NDIS_PACKET containing the header
-					to be suppressed.It then supresses the header by invoking PHS exported compress routine.
-					The header data after supression is copied back to the NDIS_PACKET.
+  Description:			This routine handle PHS(Payload Header Suppression for Tx path.
+  It extracts a fragment of the NDIS_PACKET containing the header
+  to be suppressed.It then supresses the header by invoking PHS exported compress routine.
+  The header data after supression is copied back to the NDIS_PACKET.
 
 
-Input parameters:		IN PMINI_ADAPTER Adapter         - Miniport Adapter Context
-						IN Packet 				- NDIS packet containing data to be transmitted
-						IN USHORT Vcid        - vcid pertaining to connection on which the packet is being sent.Used to
-										        identify PHS rule to be applied.
-						B_UINT16 uiClassifierRuleID - Classifier Rule ID
-						BOOLEAN bHeaderSuppressionEnabled - indicates if header suprression is enabled for SF.
+  Input parameters:		IN PMINI_ADAPTER Adapter         - Miniport Adapter Context
+  IN Packet 				- NDIS packet containing data to be transmitted
+  IN USHORT Vcid        - vcid pertaining to connection on which the packet is being sent.Used to
+  identify PHS rule to be applied.
+  B_UINT16 uiClassifierRuleID - Classifier Rule ID
+  BOOLEAN bHeaderSuppressionEnabled - indicates if header suprression is enabled for SF.
 
-Return:					STATUS_SUCCESS - If the send was successful.
-						Other          - If an error occured.
+  Return:					STATUS_SUCCESS - If the send was successful.
+  Other          - If an error occured.
 */
 
 int PHSTransmit(PMINI_ADAPTER Adapter,
-					 struct sk_buff	**pPacket,
-					 USHORT Vcid,
-					 B_UINT16 uiClassifierRuleID,
-					 BOOLEAN bHeaderSuppressionEnabled,
-					 UINT *PacketLen,
-					 UCHAR bEthCSSupport)
+		struct sk_buff	**pPacket,
+		USHORT Vcid,
+		B_UINT16 uiClassifierRuleID,
+		BOOLEAN bHeaderSuppressionEnabled,
+		UINT *PacketLen,
+		UCHAR bEthCSSupport)
 {
 
 	//PHS Sepcific
@@ -84,10 +84,10 @@ int PHSTransmit(PMINI_ADAPTER Adapter,
 	UINT	unPHSNewPktHeaderLen = 0;
 	/* Pointer to PHS IN Hdr Buffer */
 	PUCHAR pucPHSPktHdrInBuf =
-				Adapter->stPhsTxContextInfo.ucaHdrSupressionInBuf;
+		Adapter->stPhsTxContextInfo.ucaHdrSupressionInBuf;
 	/* Pointer to PHS OUT Hdr Buffer */
 	PUCHAR  pucPHSPktHdrOutBuf =
-					Adapter->stPhsTxContextInfo.ucaHdrSupressionOutBuf;
+		Adapter->stPhsTxContextInfo.ucaHdrSupressionOutBuf;
 	UINT       usPacketType;
 	UINT       BytesToRemove=0;
 	BOOLEAN  bPHSI = 0;
@@ -101,8 +101,8 @@ int PHSTransmit(PMINI_ADAPTER Adapter,
 	if(!bEthCSSupport)
 		BytesToRemove=ETH_HLEN;
 	/*
-		Accumulate the header upto the size we support supression
-		from NDIS packet
+	  Accumulate the header upto the size we support supression
+	  from NDIS packet
 	*/
 
 	usPacketType=((struct ethhdr *)(Packet->data))->h_proto;
@@ -121,82 +121,82 @@ int PHSTransmit(PMINI_ADAPTER Adapter,
 	}
 
 	if( (unPHSPktHdrBytesCopied > 0 ) &&
-		(unPHSPktHdrBytesCopied <= MAX_PHS_LENGTHS))
+	    (unPHSPktHdrBytesCopied <= MAX_PHS_LENGTHS))
 	{
 
 
 		// Step 2 Supress Header using PHS and fill into intermediate ucaPHSPktHdrOutBuf.
-	// Suppress only if IP Header and PHS Enabled For the Service Flow
+		// Suppress only if IP Header and PHS Enabled For the Service Flow
 		if(((usPacketType == ETHERNET_FRAMETYPE_IPV4) ||
-			(usPacketType == ETHERNET_FRAMETYPE_IPV6)) &&
-			(bHeaderSuppressionEnabled))
+		    (usPacketType == ETHERNET_FRAMETYPE_IPV6)) &&
+		   (bHeaderSuppressionEnabled))
 		{
 			bcm_dbg(Adapter, OTHERS, PHS_SEND, ALL,
 				"Trying to PHS Compress Using Classifier rule 0x%X\n",
 				uiClassifierRuleID);
 
 
-				unPHSNewPktHeaderLen = unPHSPktHdrBytesCopied;
-				ulPhsStatus = PhsCompress(&Adapter->stBCMPhsContext,
-					Vcid,
-					uiClassifierRuleID,
-					pucPHSPktHdrInBuf,
-					pucPHSPktHdrOutBuf,
-					&unPhsOldHdrSize,
-					&unPHSNewPktHeaderLen);
-				bcm_dbg(Adapter, OTHERS, PHS_SEND, ALL,
-					"PHS Old header Size : %d New Header Size  %d\n",
-					unPhsOldHdrSize, unPHSNewPktHeaderLen);
-
-				if(unPHSNewPktHeaderLen == unPhsOldHdrSize)
-				{
-					if(  ulPhsStatus == STATUS_PHS_COMPRESSED)
-							bPHSI = *pucPHSPktHdrOutBuf;
-					ulPhsStatus = STATUS_PHS_NOCOMPRESSION;
-				}
+			unPHSNewPktHeaderLen = unPHSPktHdrBytesCopied;
+			ulPhsStatus = PhsCompress(&Adapter->stBCMPhsContext,
+						  Vcid,
+						  uiClassifierRuleID,
+						  pucPHSPktHdrInBuf,
+						  pucPHSPktHdrOutBuf,
+						  &unPhsOldHdrSize,
+						  &unPHSNewPktHeaderLen);
+			bcm_dbg(Adapter, OTHERS, PHS_SEND, ALL,
+				"PHS Old header Size : %d New Header Size  %d\n",
+				unPhsOldHdrSize, unPHSNewPktHeaderLen);
 
+			if(unPHSNewPktHeaderLen == unPhsOldHdrSize)
+			{
 				if(  ulPhsStatus == STATUS_PHS_COMPRESSED)
-				{
-					bcm_dbg(Adapter, OTHERS, PHS_SEND, ALL,
-						"PHS Sending packet Compressed\n");
+					bPHSI = *pucPHSPktHdrOutBuf;
+				ulPhsStatus = STATUS_PHS_NOCOMPRESSION;
+			}
 
-					if(skb_cloned(Packet))
-					{
-						newPacket = skb_copy(Packet, GFP_ATOMIC);
+			if(  ulPhsStatus == STATUS_PHS_COMPRESSED)
+			{
+				bcm_dbg(Adapter, OTHERS, PHS_SEND, ALL,
+					"PHS Sending packet Compressed\n");
 
-						if(newPacket == NULL)
-							return STATUS_FAILURE;
+				if(skb_cloned(Packet))
+				{
+					newPacket = skb_copy(Packet, GFP_ATOMIC);
 
-						dev_kfree_skb(Packet);
-						*pPacket = Packet = newPacket;
-						pucPHSPktHdrInBuf = Packet->data  + BytesToRemove;
-					}
+					if(newPacket == NULL)
+						return STATUS_FAILURE;
 
-					numBytesCompressed = unPhsOldHdrSize - (unPHSNewPktHeaderLen+PHSI_LEN);
+					dev_kfree_skb(Packet);
+					*pPacket = Packet = newPacket;
+					pucPHSPktHdrInBuf = Packet->data  + BytesToRemove;
+				}
 
-					memcpy(pucPHSPktHdrInBuf + numBytesCompressed, pucPHSPktHdrOutBuf, unPHSNewPktHeaderLen + PHSI_LEN);
-					memcpy(Packet->data + numBytesCompressed, Packet->data, BytesToRemove);
-					skb_pull(Packet, numBytesCompressed);
+				numBytesCompressed = unPhsOldHdrSize - (unPHSNewPktHeaderLen+PHSI_LEN);
 
-					return STATUS_SUCCESS;
-				}
+				memcpy(pucPHSPktHdrInBuf + numBytesCompressed, pucPHSPktHdrOutBuf, unPHSNewPktHeaderLen + PHSI_LEN);
+				memcpy(Packet->data + numBytesCompressed, Packet->data, BytesToRemove);
+				skb_pull(Packet, numBytesCompressed);
 
-				else
+				return STATUS_SUCCESS;
+			}
+
+			else
+			{
+				//if one byte headroom is not available, increase it through skb_cow
+				if(!(skb_headroom(Packet) > 0))
 				{
-					//if one byte headroom is not available, increase it through skb_cow
-					if(!(skb_headroom(Packet) > 0))
+					if(skb_cow(Packet, 1))
 					{
-						if(skb_cow(Packet, 1))
-						{
-							pr_info("SKB Cow Failed\n");
-							return STATUS_FAILURE;
-						}
+						pr_info("SKB Cow Failed\n");
+						return STATUS_FAILURE;
 					}
-					skb_push(Packet, 1);
+				}
+				skb_push(Packet, 1);
 
-					// CAUTION: The MAC Header is getting corrupted here for IP CS - can be saved by copying 14 Bytes.  not needed .... hence corrupting it.
-					*(Packet->data + BytesToRemove) = bPHSI;
-					return STATUS_SUCCESS;
+				// CAUTION: The MAC Header is getting corrupted here for IP CS - can be saved by copying 14 Bytes.  not needed .... hence corrupting it.
+				*(Packet->data + BytesToRemove) = bPHSI;
+				return STATUS_SUCCESS;
 			}
 		}
 		else
@@ -216,11 +216,11 @@ int PHSTransmit(PMINI_ADAPTER Adapter,
 }
 
 int PHSReceive(PMINI_ADAPTER Adapter,
-					USHORT usVcid,
-					struct sk_buff *packet,
-					UINT *punPacketLen,
-					UCHAR *pucEthernetHdr,
-					UINT	bHeaderSuppressionEnabled)
+	       USHORT usVcid,
+	       struct sk_buff *packet,
+	       UINT *punPacketLen,
+	       UCHAR *pucEthernetHdr,
+	       UINT	bHeaderSuppressionEnabled)
 {
 	u32   nStandardPktHdrLen            		= 0;
 	u32   nTotalsupressedPktHdrBytes  = 0;
@@ -239,11 +239,11 @@ int PHSReceive(PMINI_ADAPTER Adapter,
 	//Restore  PHS suppressed header
 	nStandardPktHdrLen = packet->len;
 	ulPhsStatus = PhsDeCompress(&Adapter->stBCMPhsContext,
-		usVcid,
-		pucInBuff,
-		Adapter->ucaPHSPktRestoreBuf,
-		&nTotalsupressedPktHdrBytes,
-		&nStandardPktHdrLen);
+				    usVcid,
+				    pucInBuff,
+				    Adapter->ucaPHSPktRestoreBuf,
+				    &nTotalsupressedPktHdrBytes,
+				    &nStandardPktHdrLen);
 
 	bcm_dbg(Adapter, OTHERS, PHS_RECEIVE, ALL,
 		"Supressed PktHdrLen : 0x%x Restored PktHdrLen : 0x%x\n",
@@ -283,7 +283,7 @@ void DumpFullPacket(UCHAR *pBuf,UINT nPktLen)
 {
 	PMINI_ADAPTER Adapter = GET_BCM_ADAPTER(gblpnetdev);
 	bcm_dbg(Adapter, TX, IPV4_DBG, ALL, "Dumping Data Packet\n");
-    BCM_DEBUG_PRINT_BUFFER(Adapter,DBG_TYPE_TX, IPV4_DBG, DBG_LVL_ALL,pBuf,nPktLen);
+	BCM_DEBUG_PRINT_BUFFER(Adapter,DBG_TYPE_TX, IPV4_DBG, DBG_LVL_ALL,pBuf,nPktLen);
 }
 
 //-----------------------------------------------------------------------------
@@ -311,7 +311,7 @@ int phs_init(PPHS_DEVICE_EXTENSION pPhsdeviceExtension,PMINI_ADAPTER Adapter)
 	pPhsdeviceExtension->pstServiceFlowPhsRulesTable =
 		kzalloc(sizeof(S_SERVICEFLOW_TABLE), GFP_KERNEL);
 
-    if(!pPhsdeviceExtension->pstServiceFlowPhsRulesTable)
+	if(!pPhsdeviceExtension->pstServiceFlowPhsRulesTable)
 	{
 		bcm_dbg(Adapter, OTHERS, PHS_DISPATCH, ALL,
 			"Allocation ServiceFlowPhsRulesTable failed\n");
@@ -328,7 +328,7 @@ int phs_init(PPHS_DEVICE_EXTENSION pPhsdeviceExtension,PMINI_ADAPTER Adapter)
 			bcm_dbg(Adapter, OTHERS, PHS_DISPATCH, ALL,
 				"Allocation failed\n");
 			free_phs_serviceflow_rules(pPhsdeviceExtension->
-                pstServiceFlowPhsRulesTable);
+						   pstServiceFlowPhsRulesTable);
 			pPhsdeviceExtension->pstServiceFlowPhsRulesTable = NULL;
 			return -ENOMEM;
 		}
@@ -336,7 +336,7 @@ int phs_init(PPHS_DEVICE_EXTENSION pPhsdeviceExtension,PMINI_ADAPTER Adapter)
 
 	pPhsdeviceExtension->CompressedTxBuffer = kmalloc(PHS_BUFFER_SIZE, GFP_KERNEL);
 
-    if(pPhsdeviceExtension->CompressedTxBuffer == NULL)
+	if(pPhsdeviceExtension->CompressedTxBuffer == NULL)
 	{
 		bcm_dbg(Adapter, OTHERS, PHS_DISPATCH, ALL,
 			"Allocation failed\n");
@@ -345,7 +345,7 @@ int phs_init(PPHS_DEVICE_EXTENSION pPhsdeviceExtension,PMINI_ADAPTER Adapter)
 		return -ENOMEM;
 	}
 
-    pPhsdeviceExtension->UnCompressedRxBuffer = kmalloc(PHS_BUFFER_SIZE, GFP_KERNEL);
+	pPhsdeviceExtension->UnCompressedRxBuffer = kmalloc(PHS_BUFFER_SIZE, GFP_KERNEL);
 	if(pPhsdeviceExtension->UnCompressedRxBuffer == NULL)
 	{
 		bcm_dbg(Adapter, OTHERS, PHS_DISPATCH, ALL,
@@ -384,33 +384,33 @@ int PhsCleanup(IN PPHS_DEVICE_EXTENSION pPHSDeviceExt)
 
 //PHS functions
 /*++
-PhsUpdateClassifierRule
+  PhsUpdateClassifierRule
 
-Routine Description:
-    Exported function to add or modify a PHS Rule.
+  Routine Description:
+  Exported function to add or modify a PHS Rule.
 
-Arguments:
-	IN void* pvContext - PHS Driver Specific Context
-	IN B_UINT16 uiVcid    - The Service Flow ID for which the PHS rule applies
-	IN B_UINT16  uiClsId   - The Classifier ID within the Service Flow for which the PHS rule applies.
-	IN S_PHS_RULE *psPhsRule - The PHS Rule strcuture to be added to the PHS Rule table.
+  Arguments:
+  IN void* pvContext - PHS Driver Specific Context
+  IN B_UINT16 uiVcid    - The Service Flow ID for which the PHS rule applies
+  IN B_UINT16  uiClsId   - The Classifier ID within the Service Flow for which the PHS rule applies.
+  IN S_PHS_RULE *psPhsRule - The PHS Rule strcuture to be added to the PHS Rule table.
 
-Return Value:
+  Return Value:
 
-    0 if successful,
-    >0 Error.
+  0 if successful,
+  >0 Error.
 
---*/
+  --*/
 ULONG PhsUpdateClassifierRule(IN void* pvContext,
-								IN B_UINT16  uiVcid ,
-								IN B_UINT16  uiClsId   ,
-								IN S_PHS_RULE *psPhsRule,
-								IN B_UINT8  u8AssociatedPHSI)
+			      IN B_UINT16  uiVcid ,
+			      IN B_UINT16  uiClsId   ,
+			      IN S_PHS_RULE *psPhsRule,
+			      IN B_UINT8  u8AssociatedPHSI)
 {
 	ULONG lStatus =0;
 	UINT nSFIndex =0 ;
 	S_SERVICEFLOW_ENTRY *pstServiceFlowEntry = NULL;
-    PMINI_ADAPTER Adapter = GET_BCM_ADAPTER(gblpnetdev);
+	PMINI_ADAPTER Adapter = GET_BCM_ADAPTER(gblpnetdev);
 
 
 
@@ -435,40 +435,40 @@ ULONG PhsUpdateClassifierRule(IN void* pvContext,
 	/* Retrieve the SFID Entry Index for requested Service Flow */
 
 	nSFIndex = GetServiceFlowEntry(pDeviceExtension->pstServiceFlowPhsRulesTable,
-	                uiVcid,&pstServiceFlowEntry);
+				       uiVcid,&pstServiceFlowEntry);
 
-    if(nSFIndex == PHS_INVALID_TABLE_INDEX)
+	if(nSFIndex == PHS_INVALID_TABLE_INDEX)
 	{
 		/* This is a new SF. Create a mapping entry for this */
 		lStatus = CreateSFToClassifierRuleMapping(uiVcid, uiClsId,
-		      pDeviceExtension->pstServiceFlowPhsRulesTable, psPhsRule, u8AssociatedPHSI);
+							  pDeviceExtension->pstServiceFlowPhsRulesTable, psPhsRule, u8AssociatedPHSI);
 		return lStatus;
 	}
 
 	/* SF already Exists Add PHS Rule to existing SF */
   	lStatus = CreateClassiferToPHSRuleMapping(uiVcid, uiClsId,
-  	          pstServiceFlowEntry, psPhsRule, u8AssociatedPHSI);
+						  pstServiceFlowEntry, psPhsRule, u8AssociatedPHSI);
 
-    return lStatus;
+	return lStatus;
 }
 
 /*++
-PhsDeletePHSRule
+  PhsDeletePHSRule
 
-Routine Description:
-   Deletes the specified phs Rule within Vcid
+  Routine Description:
+  Deletes the specified phs Rule within Vcid
 
-Arguments:
-	IN void* pvContext - PHS Driver Specific Context
-	IN B_UINT16  uiVcid    - The Service Flow ID for which the PHS rule applies
-	IN B_UINT8  u8PHSI   - the PHS Index identifying PHS rule to be deleted.
+  Arguments:
+  IN void* pvContext - PHS Driver Specific Context
+  IN B_UINT16  uiVcid    - The Service Flow ID for which the PHS rule applies
+  IN B_UINT8  u8PHSI   - the PHS Index identifying PHS rule to be deleted.
 
-Return Value:
+  Return Value:
 
-    0 if successful,
-    >0 Error.
+  0 if successful,
+  >0 Error.
 
---*/
+  --*/
 
 ULONG PhsDeletePHSRule(IN void* pvContext,IN B_UINT16 uiVcid,IN B_UINT8 u8PHSI)
 {
@@ -476,7 +476,7 @@ ULONG PhsDeletePHSRule(IN void* pvContext,IN B_UINT16 uiVcid,IN B_UINT8 u8PHSI)
 	UINT nSFIndex =0, nClsidIndex =0 ;
 	S_SERVICEFLOW_ENTRY *pstServiceFlowEntry = NULL;
 	S_CLASSIFIER_TABLE *pstClassifierRulesTable = NULL;
-    PMINI_ADAPTER Adapter = GET_BCM_ADAPTER(gblpnetdev);
+	PMINI_ADAPTER Adapter = GET_BCM_ADAPTER(gblpnetdev);
 
 
 	PPHS_DEVICE_EXTENSION pDeviceExtension= (PPHS_DEVICE_EXTENSION)pvContext;
@@ -488,9 +488,9 @@ ULONG PhsDeletePHSRule(IN void* pvContext,IN B_UINT16 uiVcid,IN B_UINT8 u8PHSI)
 
 		//Retrieve the SFID Entry Index for requested Service Flow
 		nSFIndex = GetServiceFlowEntry(pDeviceExtension
-		      ->pstServiceFlowPhsRulesTable,uiVcid,&pstServiceFlowEntry);
+					       ->pstServiceFlowPhsRulesTable,uiVcid,&pstServiceFlowEntry);
 
-       if(nSFIndex == PHS_INVALID_TABLE_INDEX)
+		if(nSFIndex == PHS_INVALID_TABLE_INDEX)
 		{
 			bcm_dbg(Adapter, OTHERS, PHS_DISPATCH, ALL,
 				"SFID Match Failed\n");
@@ -510,7 +510,7 @@ ULONG PhsDeletePHSRule(IN void* pvContext,IN B_UINT16 uiVcid,IN B_UINT8 u8PHSI)
 						if(0 == pstClassifierRulesTable->stActivePhsRulesList[nClsidIndex].pstPhsRule->u8RefCnt)
 							kfree(pstClassifierRulesTable->stActivePhsRulesList[nClsidIndex].pstPhsRule);
 						memset(&pstClassifierRulesTable->stActivePhsRulesList[nClsidIndex], 0,
-							sizeof(S_CLASSIFIER_ENTRY));
+						       sizeof(S_CLASSIFIER_ENTRY));
 					}
 				}
 			}
@@ -521,36 +521,36 @@ ULONG PhsDeletePHSRule(IN void* pvContext,IN B_UINT16 uiVcid,IN B_UINT8 u8PHSI)
 }
 
 /*++
-PhsDeleteClassifierRule
+  PhsDeleteClassifierRule
 
-Routine Description:
-    Exported function to Delete a PHS Rule for the SFID,CLSID Pair.
+  Routine Description:
+  Exported function to Delete a PHS Rule for the SFID,CLSID Pair.
 
-Arguments:
-	IN void* pvContext - PHS Driver Specific Context
-	IN B_UINT16  uiVcid    - The Service Flow ID for which the PHS rule applies
-	IN B_UINT16  uiClsId   - The Classifier ID within the Service Flow for which the PHS rule applies.
+  Arguments:
+  IN void* pvContext - PHS Driver Specific Context
+  IN B_UINT16  uiVcid    - The Service Flow ID for which the PHS rule applies
+  IN B_UINT16  uiClsId   - The Classifier ID within the Service Flow for which the PHS rule applies.
 
-Return Value:
+  Return Value:
 
-    0 if successful,
-    >0 Error.
+  0 if successful,
+  >0 Error.
 
---*/
+  --*/
 ULONG PhsDeleteClassifierRule(IN void* pvContext,IN B_UINT16 uiVcid ,IN B_UINT16  uiClsId)
 {
 	ULONG lStatus =0;
 	UINT nSFIndex =0, nClsidIndex =0 ;
 	S_SERVICEFLOW_ENTRY *pstServiceFlowEntry = NULL;
 	S_CLASSIFIER_ENTRY *pstClassifierEntry = NULL;
-    PMINI_ADAPTER Adapter = GET_BCM_ADAPTER(gblpnetdev);
+	PMINI_ADAPTER Adapter = GET_BCM_ADAPTER(gblpnetdev);
 	PPHS_DEVICE_EXTENSION pDeviceExtension= (PPHS_DEVICE_EXTENSION)pvContext;
 
 	if(pDeviceExtension)
 	{
 		//Retrieve the SFID Entry Index for requested Service Flow
 		nSFIndex = GetServiceFlowEntry(pDeviceExtension
-		      ->pstServiceFlowPhsRulesTable, uiVcid, &pstServiceFlowEntry);
+					       ->pstServiceFlowPhsRulesTable, uiVcid, &pstServiceFlowEntry);
 		if(nSFIndex == PHS_INVALID_TABLE_INDEX)
 		{
 			bcm_dbg(Adapter, OTHERS, PHS_DISPATCH, ALL,
@@ -559,13 +559,13 @@ ULONG PhsDeleteClassifierRule(IN void* pvContext,IN B_UINT16 uiVcid ,IN B_UINT16
 		}
 
 		nClsidIndex = GetClassifierEntry(pstServiceFlowEntry->pstClassifierTable,
-                  uiClsId, eActiveClassifierRuleContext, &pstClassifierEntry);
+						 uiClsId, eActiveClassifierRuleContext, &pstClassifierEntry);
 		if((nClsidIndex != PHS_INVALID_TABLE_INDEX) && (!pstClassifierEntry->bUnclassifiedPHSRule))
 		{
 			if(pstClassifierEntry->pstPhsRule)
 			{
 				if(pstClassifierEntry->pstPhsRule->u8RefCnt)
-				pstClassifierEntry->pstPhsRule->u8RefCnt--;
+					pstClassifierEntry->pstPhsRule->u8RefCnt--;
 				if(0==pstClassifierEntry->pstPhsRule->u8RefCnt)
 					kfree(pstClassifierEntry->pstPhsRule);
 
@@ -574,9 +574,9 @@ ULONG PhsDeleteClassifierRule(IN void* pvContext,IN B_UINT16 uiVcid ,IN B_UINT16
 		}
 
 		nClsidIndex = GetClassifierEntry(pstServiceFlowEntry->pstClassifierTable,
-                    uiClsId,eOldClassifierRuleContext,&pstClassifierEntry);
+						 uiClsId,eOldClassifierRuleContext,&pstClassifierEntry);
 
-	   if((nClsidIndex != PHS_INVALID_TABLE_INDEX) && (!pstClassifierEntry->bUnclassifiedPHSRule))
+		if((nClsidIndex != PHS_INVALID_TABLE_INDEX) && (!pstClassifierEntry->bUnclassifiedPHSRule))
 		{
 			kfree(pstClassifierEntry->pstPhsRule);
 			memset(pstClassifierEntry, 0, sizeof(S_CLASSIFIER_ENTRY));
@@ -586,21 +586,21 @@ ULONG PhsDeleteClassifierRule(IN void* pvContext,IN B_UINT16 uiVcid ,IN B_UINT16
 }
 
 /*++
-PhsDeleteSFRules
+  PhsDeleteSFRules
 
-Routine Description:
-    Exported function to Delete a all PHS Rules for the SFID.
+  Routine Description:
+  Exported function to Delete a all PHS Rules for the SFID.
 
-Arguments:
-	IN void* pvContext - PHS Driver Specific Context
-	IN B_UINT16 uiVcid   - The Service Flow ID for which the PHS rules need to be deleted
+  Arguments:
+  IN void* pvContext - PHS Driver Specific Context
+  IN B_UINT16 uiVcid   - The Service Flow ID for which the PHS rules need to be deleted
 
-Return Value:
+  Return Value:
 
-    0 if successful,
-    >0 Error.
+  0 if successful,
+  >0 Error.
 
---*/
+  --*/
 ULONG PhsDeleteSFRules(IN void* pvContext,IN B_UINT16 uiVcid)
 {
 
@@ -608,7 +608,7 @@ ULONG PhsDeleteSFRules(IN void* pvContext,IN B_UINT16 uiVcid)
 	UINT nSFIndex =0, nClsidIndex =0  ;
 	S_SERVICEFLOW_ENTRY *pstServiceFlowEntry = NULL;
 	S_CLASSIFIER_TABLE *pstClassifierRulesTable = NULL;
-    PMINI_ADAPTER Adapter = GET_BCM_ADAPTER(gblpnetdev);
+	PMINI_ADAPTER Adapter = GET_BCM_ADAPTER(gblpnetdev);
 	PPHS_DEVICE_EXTENSION pDeviceExtension= (PPHS_DEVICE_EXTENSION)pvContext;
 	bcm_dbg(Adapter, OTHERS, PHS_DISPATCH, ALL, "====>\n");
 
@@ -616,7 +616,7 @@ ULONG PhsDeleteSFRules(IN void* pvContext,IN B_UINT16 uiVcid)
 	{
 		//Retrieve the SFID Entry Index for requested Service Flow
 		nSFIndex = GetServiceFlowEntry(pDeviceExtension->pstServiceFlowPhsRulesTable,
-		                  uiVcid,&pstServiceFlowEntry);
+					       uiVcid,&pstServiceFlowEntry);
 		if(nSFIndex == PHS_INVALID_TABLE_INDEX)
 		{
 			bcm_dbg(Adapter, OTHERS, PHS_DISPATCH, ALL,
@@ -632,28 +632,28 @@ ULONG PhsDeleteSFRules(IN void* pvContext,IN B_UINT16 uiVcid)
 				if(pstClassifierRulesTable->stActivePhsRulesList[nClsidIndex].pstPhsRule)
 				{
 					if(pstClassifierRulesTable->stActivePhsRulesList[nClsidIndex]
-                                                        .pstPhsRule->u8RefCnt)
+					   .pstPhsRule->u8RefCnt)
 						pstClassifierRulesTable->stActivePhsRulesList[nClsidIndex]
-						                                    .pstPhsRule->u8RefCnt--;
+							.pstPhsRule->u8RefCnt--;
 					if(0==pstClassifierRulesTable->stActivePhsRulesList[nClsidIndex]
-                                                          .pstPhsRule->u8RefCnt)
+					   .pstPhsRule->u8RefCnt)
 						kfree(pstClassifierRulesTable->stActivePhsRulesList[nClsidIndex].pstPhsRule);
-					    pstClassifierRulesTable->stActivePhsRulesList[nClsidIndex]
-                                        .pstPhsRule = NULL;
+					pstClassifierRulesTable->stActivePhsRulesList[nClsidIndex]
+						.pstPhsRule = NULL;
 				}
 				memset(&pstClassifierRulesTable->stActivePhsRulesList[nClsidIndex], 0, sizeof(S_CLASSIFIER_ENTRY));
 				if(pstClassifierRulesTable->stOldPhsRulesList[nClsidIndex].pstPhsRule)
 				{
 					if(pstClassifierRulesTable->stOldPhsRulesList[nClsidIndex]
-                                        .pstPhsRule->u8RefCnt)
+					   .pstPhsRule->u8RefCnt)
 						pstClassifierRulesTable->stOldPhsRulesList[nClsidIndex]
-						                  .pstPhsRule->u8RefCnt--;
+							.pstPhsRule->u8RefCnt--;
 					if(0 == pstClassifierRulesTable->stOldPhsRulesList[nClsidIndex]
-                                        .pstPhsRule->u8RefCnt)
+					   .pstPhsRule->u8RefCnt)
 						kfree(pstClassifierRulesTable
 						      ->stOldPhsRulesList[nClsidIndex].pstPhsRule);
 					pstClassifierRulesTable->stOldPhsRulesList[nClsidIndex]
-                              .pstPhsRule = NULL;
+						.pstPhsRule = NULL;
 				}
 				memset(&pstClassifierRulesTable->stOldPhsRulesList[nClsidIndex], 0, sizeof(S_CLASSIFIER_ENTRY));
 			}
@@ -668,40 +668,40 @@ ULONG PhsDeleteSFRules(IN void* pvContext,IN B_UINT16 uiVcid)
 
 
 /*++
-PhsCompress
+  PhsCompress
 
-Routine Description:
-    Exported function to compress the data using PHS.
+  Routine Description:
+  Exported function to compress the data using PHS.
 
-Arguments:
-	IN void* pvContext - PHS Driver Specific Context.
-	IN B_UINT16 uiVcid    - The Service Flow ID to which current packet header compression applies.
-	IN UINT  uiClsId   - The Classifier ID to which current packet header compression applies.
-	IN void *pvInputBuffer - The Input buffer containg packet header data
-	IN void *pvOutputBuffer - The output buffer returned by this function after PHS
-	IN UINT *pOldHeaderSize  - The actual size of the header before PHS
-	IN UINT *pNewHeaderSize - The new size of the header after applying PHS
+  Arguments:
+  IN void* pvContext - PHS Driver Specific Context.
+  IN B_UINT16 uiVcid    - The Service Flow ID to which current packet header compression applies.
+  IN UINT  uiClsId   - The Classifier ID to which current packet header compression applies.
+  IN void *pvInputBuffer - The Input buffer containg packet header data
+  IN void *pvOutputBuffer - The output buffer returned by this function after PHS
+  IN UINT *pOldHeaderSize  - The actual size of the header before PHS
+  IN UINT *pNewHeaderSize - The new size of the header after applying PHS
 
-Return Value:
+  Return Value:
 
-    0 if successful,
-    >0 Error.
+  0 if successful,
+  >0 Error.
 
---*/
+  --*/
 ULONG PhsCompress(IN void* pvContext,
-				  IN B_UINT16 uiVcid,
-				  IN B_UINT16 uiClsId,
-				  IN void *pvInputBuffer,
-				  OUT void *pvOutputBuffer,
-				  OUT UINT *pOldHeaderSize,
-				  OUT UINT *pNewHeaderSize )
+		  IN B_UINT16 uiVcid,
+		  IN B_UINT16 uiClsId,
+		  IN void *pvInputBuffer,
+		  OUT void *pvOutputBuffer,
+		  OUT UINT *pOldHeaderSize,
+		  OUT UINT *pNewHeaderSize )
 {
 	UINT nSFIndex =0, nClsidIndex =0  ;
 	S_SERVICEFLOW_ENTRY *pstServiceFlowEntry = NULL;
 	S_CLASSIFIER_ENTRY *pstClassifierEntry = NULL;
 	S_PHS_RULE *pstPhsRule = NULL;
 	ULONG lStatus =0;
-    PMINI_ADAPTER Adapter = GET_BCM_ADAPTER(gblpnetdev);
+	PMINI_ADAPTER Adapter = GET_BCM_ADAPTER(gblpnetdev);
 
 
 
@@ -722,7 +722,7 @@ ULONG PhsCompress(IN void* pvContext,
 
 	//Retrieve the SFID Entry Index for requested Service Flow
 	nSFIndex = GetServiceFlowEntry(pDeviceExtension->pstServiceFlowPhsRulesTable,
-	                  uiVcid,&pstServiceFlowEntry);
+				       uiVcid,&pstServiceFlowEntry);
 	if(nSFIndex == PHS_INVALID_TABLE_INDEX)
 	{
 		bcm_dbg(Adapter, OTHERS, PHS_SEND, ALL, "SFID Match Failed\n");
@@ -731,9 +731,9 @@ ULONG PhsCompress(IN void* pvContext,
 	}
 
 	nClsidIndex = GetClassifierEntry(pstServiceFlowEntry->pstClassifierTable,
-                uiClsId,eActiveClassifierRuleContext,&pstClassifierEntry);
+					 uiClsId,eActiveClassifierRuleContext,&pstClassifierEntry);
 
-    if(nClsidIndex == PHS_INVALID_TABLE_INDEX)
+	if(nClsidIndex == PHS_INVALID_TABLE_INDEX)
 	{
 		bcm_dbg(Adapter, OTHERS, PHS_SEND, ALL,
 			"No PHS Rule Defined For Classifier\n");
@@ -755,7 +755,7 @@ ULONG PhsCompress(IN void* pvContext,
 
 	//Compress Packet
 	lStatus = phs_compress(pstPhsRule,(PUCHAR)pvInputBuffer,
-	      (PUCHAR)pvOutputBuffer, pOldHeaderSize,pNewHeaderSize);
+			       (PUCHAR)pvOutputBuffer, pOldHeaderSize,pNewHeaderSize);
 
 	if(lStatus == STATUS_PHS_COMPRESSED)
 	{
@@ -769,38 +769,38 @@ ULONG PhsCompress(IN void* pvContext,
 }
 
 /*++
-PhsDeCompress
+  PhsDeCompress
 
-Routine Description:
-    Exported function to restore the packet header in Rx path.
+  Routine Description:
+  Exported function to restore the packet header in Rx path.
 
-Arguments:
-	IN void* pvContext - PHS Driver Specific Context.
-	IN B_UINT16 uiVcid    - The Service Flow ID to which current packet header restoration applies.
-	IN  void *pvInputBuffer - The Input buffer containg suppressed packet header data
-	OUT void *pvOutputBuffer - The output buffer returned by this function after restoration
-	OUT UINT *pHeaderSize   - The packet header size after restoration is returned in this parameter.
+  Arguments:
+  IN void* pvContext - PHS Driver Specific Context.
+  IN B_UINT16 uiVcid    - The Service Flow ID to which current packet header restoration applies.
+  IN  void *pvInputBuffer - The Input buffer containg suppressed packet header data
+  OUT void *pvOutputBuffer - The output buffer returned by this function after restoration
+  OUT UINT *pHeaderSize   - The packet header size after restoration is returned in this parameter.
 
-Return Value:
+  Return Value:
 
-    0 if successful,
-    >0 Error.
+  0 if successful,
+  >0 Error.
 
---*/
+  --*/
 ULONG PhsDeCompress(IN void* pvContext,
-				  IN B_UINT16 uiVcid,
-				  IN void *pvInputBuffer,
-				  OUT void *pvOutputBuffer,
-				  OUT UINT *pInHeaderSize,
-				  OUT UINT *pOutHeaderSize )
+		    IN B_UINT16 uiVcid,
+		    IN void *pvInputBuffer,
+		    OUT void *pvOutputBuffer,
+		    OUT UINT *pInHeaderSize,
+		    OUT UINT *pOutHeaderSize )
 {
 	UINT nSFIndex =0, nPhsRuleIndex =0 ;
 	S_SERVICEFLOW_ENTRY *pstServiceFlowEntry = NULL;
 	S_PHS_RULE *pstPhsRule = NULL;
 	UINT phsi;
-    PMINI_ADAPTER Adapter = GET_BCM_ADAPTER(gblpnetdev);
+	PMINI_ADAPTER Adapter = GET_BCM_ADAPTER(gblpnetdev);
 	PPHS_DEVICE_EXTENSION pDeviceExtension=
-        (PPHS_DEVICE_EXTENSION)pvContext;
+		(PPHS_DEVICE_EXTENSION)pvContext;
 
 	*pInHeaderSize = 0;
 
@@ -816,14 +816,14 @@ ULONG PhsDeCompress(IN void* pvContext,
 	phsi = *((unsigned char *)(pvInputBuffer));
 	bcm_dbg(Adapter, OTHERS, PHS_RECEIVE, ALL,
 		"PHSI To Be Used For restore : %x\n", phsi);
-    if(phsi == UNCOMPRESSED_PACKET )
+	if(phsi == UNCOMPRESSED_PACKET )
 	{
 		return STATUS_PHS_NOCOMPRESSION;
 	}
 
 	//Retrieve the SFID Entry Index for requested Service Flow
 	nSFIndex = GetServiceFlowEntry(pDeviceExtension->pstServiceFlowPhsRulesTable,
-	      uiVcid,&pstServiceFlowEntry);
+				       uiVcid,&pstServiceFlowEntry);
 	if(nSFIndex == PHS_INVALID_TABLE_INDEX)
 	{
 		bcm_dbg(Adapter, OTHERS, PHS_RECEIVE, ALL,
@@ -832,12 +832,12 @@ ULONG PhsDeCompress(IN void* pvContext,
 	}
 
 	nPhsRuleIndex = GetPhsRuleEntry(pstServiceFlowEntry->pstClassifierTable,phsi,
-          eActiveClassifierRuleContext,&pstPhsRule);
+					eActiveClassifierRuleContext,&pstPhsRule);
 	if(nPhsRuleIndex == PHS_INVALID_TABLE_INDEX)
 	{
 		//Phs Rule does not exist in  active rules table. Lets try in the old rules table.
 		nPhsRuleIndex = GetPhsRuleEntry(pstServiceFlowEntry->pstClassifierTable,
-		      phsi,eOldClassifierRuleContext,&pstPhsRule);
+						phsi,eOldClassifierRuleContext,&pstPhsRule);
 		if(nPhsRuleIndex == PHS_INVALID_TABLE_INDEX)
 		{
 			return ERR_PHSRULE_MATCH_FAIL;
@@ -846,7 +846,7 @@ ULONG PhsDeCompress(IN void* pvContext,
 	}
 
 	*pInHeaderSize = phs_decompress((PUCHAR)pvInputBuffer,
-            (PUCHAR)pvOutputBuffer,pstPhsRule,pOutHeaderSize);
+					(PUCHAR)pvOutputBuffer,pstPhsRule,pOutHeaderSize);
 
 	pstPhsRule->PHSModifiedBytes += *pOutHeaderSize - *pInHeaderSize - 1;
 
@@ -870,17 +870,17 @@ ULONG PhsDeCompress(IN void* pvContext,
 static void free_phs_serviceflow_rules(S_SERVICEFLOW_TABLE *psServiceFlowRulesTable)
 {
 	int i,j;
-    PMINI_ADAPTER Adapter = GET_BCM_ADAPTER(gblpnetdev);
+	PMINI_ADAPTER Adapter = GET_BCM_ADAPTER(gblpnetdev);
 
 	bcm_dbg(Adapter, OTHERS, PHS_DISPATCH, ALL, "=======>\n");
-    if(psServiceFlowRulesTable)
+	if(psServiceFlowRulesTable)
 	{
 		for(i=0;i<MAX_SERVICEFLOWS;i++)
 		{
 			S_SERVICEFLOW_ENTRY stServiceFlowEntry =
-                psServiceFlowRulesTable->stSFList[i];
+				psServiceFlowRulesTable->stSFList[i];
 			S_CLASSIFIER_TABLE *pstClassifierRulesTable =
-                stServiceFlowEntry.pstClassifierTable;
+				stServiceFlowEntry.pstClassifierTable;
 
 			if(pstClassifierRulesTable)
 			{
@@ -889,34 +889,34 @@ static void free_phs_serviceflow_rules(S_SERVICEFLOW_TABLE *psServiceFlowRulesTa
 					if(pstClassifierRulesTable->stActivePhsRulesList[j].pstPhsRule)
 					{
 						if(pstClassifierRulesTable->stActivePhsRulesList[j].pstPhsRule
-                                                                                        ->u8RefCnt)
+						   ->u8RefCnt)
 							pstClassifierRulesTable->stActivePhsRulesList[j].pstPhsRule
-  							                                                ->u8RefCnt--;
+								->u8RefCnt--;
 						if(0==pstClassifierRulesTable->stActivePhsRulesList[j].pstPhsRule
-                                                                ->u8RefCnt)
+						   ->u8RefCnt)
 							kfree(pstClassifierRulesTable->stActivePhsRulesList[j].pstPhsRule);
 						pstClassifierRulesTable->stActivePhsRulesList[j].pstPhsRule = NULL;
 					}
 					if(pstClassifierRulesTable->stOldPhsRulesList[j].pstPhsRule)
 					{
 						if(pstClassifierRulesTable->stOldPhsRulesList[j].pstPhsRule
-                                                                ->u8RefCnt)
+						   ->u8RefCnt)
 							pstClassifierRulesTable->stOldPhsRulesList[j].pstPhsRule
-							                                          ->u8RefCnt--;
+								->u8RefCnt--;
 						if(0==pstClassifierRulesTable->stOldPhsRulesList[j].pstPhsRule
-                                                                      ->u8RefCnt)
+						   ->u8RefCnt)
 							kfree(pstClassifierRulesTable->stOldPhsRulesList[j].pstPhsRule);
 						pstClassifierRulesTable->stOldPhsRulesList[j].pstPhsRule = NULL;
 					}
 				}
 				kfree(pstClassifierRulesTable);
-			    stServiceFlowEntry.pstClassifierTable = pstClassifierRulesTable = NULL;
+				stServiceFlowEntry.pstClassifierTable = pstClassifierRulesTable = NULL;
 			}
 		}
 	}
 
-    kfree(psServiceFlowRulesTable);
-    psServiceFlowRulesTable = NULL;
+	kfree(psServiceFlowRulesTable);
+	psServiceFlowRulesTable = NULL;
 }
 
 
@@ -951,7 +951,7 @@ static BOOLEAN ValidatePHSRuleComplete(IN S_PHS_RULE *psPhsRule)
 }
 
 UINT GetServiceFlowEntry(IN S_SERVICEFLOW_TABLE *psServiceFlowTable,
-    IN B_UINT16 uiVcid,S_SERVICEFLOW_ENTRY **ppstServiceFlowEntry)
+			 IN B_UINT16 uiVcid,S_SERVICEFLOW_ENTRY **ppstServiceFlowEntry)
 {
 	int  i;
 	for(i=0;i<MAX_SERVICEFLOWS;i++)
@@ -972,8 +972,8 @@ UINT GetServiceFlowEntry(IN S_SERVICEFLOW_TABLE *psServiceFlowTable,
 
 
 UINT GetClassifierEntry(IN S_CLASSIFIER_TABLE *pstClassifierTable,
-        IN B_UINT32 uiClsid,E_CLASSIFIER_ENTRY_CONTEXT eClsContext,
-        OUT S_CLASSIFIER_ENTRY **ppstClassifierEntry)
+			IN B_UINT32 uiClsid,E_CLASSIFIER_ENTRY_CONTEXT eClsContext,
+			OUT S_CLASSIFIER_ENTRY **ppstClassifierEntry)
 {
 	int  i;
 	S_CLASSIFIER_ENTRY *psClassifierRules = NULL;
@@ -1036,11 +1036,11 @@ static UINT GetPhsRuleEntry(IN S_CLASSIFIER_TABLE *pstClassifierTable,
 }
 
 UINT CreateSFToClassifierRuleMapping(IN B_UINT16 uiVcid,IN B_UINT16  uiClsId,
-                      IN S_SERVICEFLOW_TABLE *psServiceFlowTable,S_PHS_RULE *psPhsRule,
-                      B_UINT8 u8AssociatedPHSI)
+				     IN S_SERVICEFLOW_TABLE *psServiceFlowTable,S_PHS_RULE *psPhsRule,
+				     B_UINT8 u8AssociatedPHSI)
 {
 
-    S_CLASSIFIER_TABLE *psaClassifiertable = NULL;
+	S_CLASSIFIER_TABLE *psaClassifiertable = NULL;
 	UINT uiStatus = 0;
 	int iSfIndex;
 	BOOLEAN bFreeEntryFound =FALSE;
@@ -1060,7 +1060,7 @@ UINT CreateSFToClassifierRuleMapping(IN B_UINT16 uiVcid,IN B_UINT16  uiClsId,
 
 	psaClassifiertable = psServiceFlowTable->stSFList[iSfIndex].pstClassifierTable;
 	uiStatus = CreateClassifierPHSRule(uiClsId,psaClassifiertable,psPhsRule,
-	                      eActiveClassifierRuleContext,u8AssociatedPHSI);
+					   eActiveClassifierRuleContext,u8AssociatedPHSI);
 	if(uiStatus == PHS_SUCCESS)
 	{
 		//Add entry at free index to the SF
@@ -1073,71 +1073,71 @@ UINT CreateSFToClassifierRuleMapping(IN B_UINT16 uiVcid,IN B_UINT16  uiClsId,
 }
 
 UINT CreateClassiferToPHSRuleMapping(IN B_UINT16 uiVcid,
-            IN B_UINT16  uiClsId,IN S_SERVICEFLOW_ENTRY *pstServiceFlowEntry,
-              S_PHS_RULE *psPhsRule,B_UINT8 u8AssociatedPHSI)
+				     IN B_UINT16  uiClsId,IN S_SERVICEFLOW_ENTRY *pstServiceFlowEntry,
+				     S_PHS_RULE *psPhsRule,B_UINT8 u8AssociatedPHSI)
 {
 	S_CLASSIFIER_ENTRY *pstClassifierEntry = NULL;
 	UINT uiStatus =PHS_SUCCESS;
 	UINT nClassifierIndex = 0;
 	S_CLASSIFIER_TABLE *psaClassifiertable = NULL;
-    PMINI_ADAPTER Adapter = GET_BCM_ADAPTER(gblpnetdev);
-    psaClassifiertable = pstServiceFlowEntry->pstClassifierTable;
+	PMINI_ADAPTER Adapter = GET_BCM_ADAPTER(gblpnetdev);
+	psaClassifiertable = pstServiceFlowEntry->pstClassifierTable;
 
 	bcm_dbg(Adapter, OTHERS, PHS_DISPATCH, ALL, "==>\n");
 
 	/* Check if the supplied Classifier already exists */
 	nClassifierIndex =GetClassifierEntry(
-	            pstServiceFlowEntry->pstClassifierTable,uiClsId,
-	            eActiveClassifierRuleContext,&pstClassifierEntry);
+		pstServiceFlowEntry->pstClassifierTable,uiClsId,
+		eActiveClassifierRuleContext,&pstClassifierEntry);
 	if(nClassifierIndex == PHS_INVALID_TABLE_INDEX)
 	{
 		/*
-		    The Classifier doesn't exist. So its a new classifier being added.
-		     Add new entry to associate PHS Rule to the Classifier
+		  The Classifier doesn't exist. So its a new classifier being added.
+		  Add new entry to associate PHS Rule to the Classifier
 		*/
 
 		uiStatus = CreateClassifierPHSRule(uiClsId,psaClassifiertable,
-		    psPhsRule,eActiveClassifierRuleContext,u8AssociatedPHSI);
+						   psPhsRule,eActiveClassifierRuleContext,u8AssociatedPHSI);
 		return uiStatus;
 	}
 
 	/*
 	  The Classifier exists.The PHS Rule for this classifier
 	  is being modified
-	  */
+	*/
 	if(pstClassifierEntry->u8PHSI == psPhsRule->u8PHSI)
 	{
 		if(pstClassifierEntry->pstPhsRule == NULL)
 			return ERR_PHS_INVALID_PHS_RULE;
 
 		/*
-		    This rule already exists if any fields are changed for this PHS
-		    rule update them.
-		 */
-		 /* If any part of PHSF is valid then we update PHSF */
+		  This rule already exists if any fields are changed for this PHS
+		  rule update them.
+		*/
+		/* If any part of PHSF is valid then we update PHSF */
 		if(psPhsRule->u8PHSFLength)
 		{
 			//update PHSF
 			memcpy(pstClassifierEntry->pstPhsRule->u8PHSF,
-			    psPhsRule->u8PHSF , MAX_PHS_LENGTHS);
+			       psPhsRule->u8PHSF , MAX_PHS_LENGTHS);
 		}
 		if(psPhsRule->u8PHSFLength)
 		{
 			//update PHSFLen
 			pstClassifierEntry->pstPhsRule->u8PHSFLength =
-			    psPhsRule->u8PHSFLength;
+				psPhsRule->u8PHSFLength;
 		}
 		if(psPhsRule->u8PHSMLength)
 		{
 			//update PHSM
 			memcpy(pstClassifierEntry->pstPhsRule->u8PHSM,
-			    psPhsRule->u8PHSM, MAX_PHS_LENGTHS);
+			       psPhsRule->u8PHSM, MAX_PHS_LENGTHS);
 		}
 		if(psPhsRule->u8PHSMLength)
 		{
 			//update PHSM Len
 			pstClassifierEntry->pstPhsRule->u8PHSMLength =
-			    psPhsRule->u8PHSMLength;
+				psPhsRule->u8PHSMLength;
 		}
 		if(psPhsRule->u8PHSS)
 		{
@@ -1155,7 +1155,7 @@ UINT CreateClassiferToPHSRuleMapping(IN B_UINT16 uiVcid,
 		  A new rule is being set for this classifier.
 		*/
 		uiStatus=UpdateClassifierPHSRule( uiClsId,  pstClassifierEntry,
-		      psaClassifiertable,  psPhsRule, u8AssociatedPHSI);
+						  psaClassifiertable,  psPhsRule, u8AssociatedPHSI);
 	}
 
 
@@ -1164,17 +1164,17 @@ UINT CreateClassiferToPHSRuleMapping(IN B_UINT16 uiVcid,
 }
 
 static UINT CreateClassifierPHSRule(IN B_UINT16  uiClsId,
-    S_CLASSIFIER_TABLE *psaClassifiertable ,S_PHS_RULE *psPhsRule,
-    E_CLASSIFIER_ENTRY_CONTEXT eClsContext,B_UINT8 u8AssociatedPHSI)
+				    S_CLASSIFIER_TABLE *psaClassifiertable ,S_PHS_RULE *psPhsRule,
+				    E_CLASSIFIER_ENTRY_CONTEXT eClsContext,B_UINT8 u8AssociatedPHSI)
 {
 	UINT iClassifierIndex = 0;
 	BOOLEAN bFreeEntryFound = FALSE;
 	S_CLASSIFIER_ENTRY *psClassifierRules = NULL;
 	UINT nStatus = PHS_SUCCESS;
-    PMINI_ADAPTER Adapter = GET_BCM_ADAPTER(gblpnetdev);
+	PMINI_ADAPTER Adapter = GET_BCM_ADAPTER(gblpnetdev);
 	bcm_dbg(Adapter, OTHERS, PHS_DISPATCH, ALL,
 		"Inside CreateClassifierPHSRule\n");
-    if(psaClassifiertable == NULL)
+	if(psaClassifiertable == NULL)
 	{
 		return ERR_INVALID_CLASSIFIERTABLE_FOR_SF;
 	}
@@ -1182,16 +1182,16 @@ static UINT CreateClassifierPHSRule(IN B_UINT16  uiClsId,
 	if(eClsContext == eOldClassifierRuleContext)
 	{
 		/* If An Old Entry for this classifier ID already exists in the
-		    old rules table replace it. */
+		   old rules table replace it. */
 
 		iClassifierIndex =
-		GetClassifierEntry(psaClassifiertable, uiClsId,
-		            eClsContext,&psClassifierRules);
+			GetClassifierEntry(psaClassifiertable, uiClsId,
+					   eClsContext,&psClassifierRules);
 		if(iClassifierIndex != PHS_INVALID_TABLE_INDEX)
 		{
 			/*
-			    The Classifier already exists in the old rules table
-		        Lets replace the old classifier with the new one.
+			  The Classifier already exists in the old rules table
+			  Lets replace the old classifier with the new one.
 			*/
 			bFreeEntryFound = TRUE;
 		}
@@ -1203,17 +1203,17 @@ static UINT CreateClassifierPHSRule(IN B_UINT16  uiClsId,
 		  Continue to search for a free location to add the rule
 		*/
 		for(iClassifierIndex = 0; iClassifierIndex <
-            MAX_PHSRULE_PER_SF; iClassifierIndex++)
+			    MAX_PHSRULE_PER_SF; iClassifierIndex++)
 		{
 			if(eClsContext == eActiveClassifierRuleContext)
 			{
 				psClassifierRules =
-              &psaClassifiertable->stActivePhsRulesList[iClassifierIndex];
+					&psaClassifiertable->stActivePhsRulesList[iClassifierIndex];
 			}
 			else
 			{
 				psClassifierRules =
-                &psaClassifiertable->stOldPhsRulesList[iClassifierIndex];
+					&psaClassifiertable->stOldPhsRulesList[iClassifierIndex];
 			}
 
 			if(!psClassifierRules->bUsed)
@@ -1234,16 +1234,16 @@ static UINT CreateClassifierPHSRule(IN B_UINT16  uiClsId,
 		{
 			//Lets replace the oldest rule if we are looking in old Rule table
 			if(psaClassifiertable->uiOldestPhsRuleIndex >=
-                MAX_PHSRULE_PER_SF)
+			   MAX_PHSRULE_PER_SF)
 			{
 				psaClassifiertable->uiOldestPhsRuleIndex =0;
 			}
 
 			iClassifierIndex = psaClassifiertable->uiOldestPhsRuleIndex;
 			psClassifierRules =
-              &psaClassifiertable->stOldPhsRulesList[iClassifierIndex];
+				&psaClassifiertable->stOldPhsRulesList[iClassifierIndex];
 
-          (psaClassifiertable->uiOldestPhsRuleIndex)++;
+			(psaClassifiertable->uiOldestPhsRuleIndex)++;
 		}
 	}
 
@@ -1253,7 +1253,7 @@ static UINT CreateClassifierPHSRule(IN B_UINT16  uiClsId,
 		{
 			psClassifierRules->pstPhsRule = kmalloc(sizeof(S_PHS_RULE),GFP_KERNEL);
 
-          if(NULL == psClassifierRules->pstPhsRule)
+			if(NULL == psClassifierRules->pstPhsRule)
 				return ERR_PHSRULE_MEMALLOC_FAIL;
 		}
 
@@ -1262,37 +1262,37 @@ static UINT CreateClassifierPHSRule(IN B_UINT16  uiClsId,
 		psClassifierRules->u8PHSI = psPhsRule->u8PHSI;
 		psClassifierRules->bUnclassifiedPHSRule = psPhsRule->bUnclassifiedPHSRule;
 
-        /* Update The PHS rule */
+		/* Update The PHS rule */
 		memcpy(psClassifierRules->pstPhsRule,
-		    psPhsRule, sizeof(S_PHS_RULE));
+		       psPhsRule, sizeof(S_PHS_RULE));
 	}
 	else
 	{
 		nStatus = UpdateClassifierPHSRule(uiClsId,psClassifierRules,
-            psaClassifiertable,psPhsRule,u8AssociatedPHSI);
+						  psaClassifiertable,psPhsRule,u8AssociatedPHSI);
 	}
 	return nStatus;
 }
 
 
 static UINT UpdateClassifierPHSRule(IN B_UINT16  uiClsId,
-      IN S_CLASSIFIER_ENTRY *pstClassifierEntry,
-      S_CLASSIFIER_TABLE *psaClassifiertable ,S_PHS_RULE *psPhsRule,
-      B_UINT8 u8AssociatedPHSI)
+				    IN S_CLASSIFIER_ENTRY *pstClassifierEntry,
+				    S_CLASSIFIER_TABLE *psaClassifiertable ,S_PHS_RULE *psPhsRule,
+				    B_UINT8 u8AssociatedPHSI)
 {
 	S_PHS_RULE *pstAddPhsRule = NULL;
 	UINT              nPhsRuleIndex = 0;
 	BOOLEAN       bPHSRuleOrphaned = FALSE;
-    PMINI_ADAPTER Adapter = GET_BCM_ADAPTER(gblpnetdev);
+	PMINI_ADAPTER Adapter = GET_BCM_ADAPTER(gblpnetdev);
 	psPhsRule->u8RefCnt =0;
 
 	/* Step 1 Deref Any Exisiting PHS Rule in this classifier Entry*/
 	bPHSRuleOrphaned = DerefPhsRule( uiClsId, psaClassifiertable,
-	    pstClassifierEntry->pstPhsRule);
+					 pstClassifierEntry->pstPhsRule);
 
 	//Step 2 Search if there is a PHS Rule with u8AssociatedPHSI in Classifier table for this SF
 	nPhsRuleIndex =GetPhsRuleEntry(psaClassifiertable,u8AssociatedPHSI,
-	    eActiveClassifierRuleContext, &pstAddPhsRule);
+				       eActiveClassifierRuleContext, &pstAddPhsRule);
 	if(PHS_INVALID_TABLE_INDEX == nPhsRuleIndex)
 	{
 		bcm_dbg(Adapter, OTHERS, PHS_DISPATCH, ALL,
@@ -1361,12 +1361,12 @@ static BOOLEAN DerefPhsRule(IN B_UINT16  uiClsId,S_CLASSIFIER_TABLE *psaClassifi
 void DumpPhsRules(PPHS_DEVICE_EXTENSION pDeviceExtension)
 {
 	int i,j,k,l;
-    PMINI_ADAPTER Adapter = GET_BCM_ADAPTER(gblpnetdev);
+	PMINI_ADAPTER Adapter = GET_BCM_ADAPTER(gblpnetdev);
 	bcm_dbg(Adapter, OTHERS, DUMP_INFO, ALL, "Dumping PHS Rules :\n");
 	for(i=0;i<MAX_SERVICEFLOWS;i++)
 	{
 		S_SERVICEFLOW_ENTRY stServFlowEntry =
-				pDeviceExtension->pstServiceFlowPhsRulesTable->stSFList[i];
+			pDeviceExtension->pstServiceFlowPhsRulesTable->stSFList[i];
 		if(stServFlowEntry.bUsed)
 		{
 			for(j=0;j<MAX_PHSRULE_PER_SF;j++)
@@ -1461,14 +1461,14 @@ void DumpPhsRules(PPHS_DEVICE_EXTENSION pDeviceExtension)
 //-----------------------------------------------------------------------------
 
 int phs_decompress(unsigned char *in_buf,unsigned char *out_buf,
- S_PHS_RULE   *decomp_phs_rules,UINT *header_size)
+		   S_PHS_RULE   *decomp_phs_rules,UINT *header_size)
 {
 	int phss,size=0;
-	 S_PHS_RULE   *tmp_memb;
+	S_PHS_RULE   *tmp_memb;
 	int bit,i=0;
 	unsigned char *phsf,*phsm;
 	int in_buf_len = *header_size-1;
-    PMINI_ADAPTER Adapter = GET_BCM_ADAPTER(gblpnetdev);
+	PMINI_ADAPTER Adapter = GET_BCM_ADAPTER(gblpnetdev);
 	in_buf++;
 	bcm_dbg(Adapter, OTHERS, PHS_RECEIVE, ALL, "====>\n");
 	*header_size = 0;
@@ -1552,8 +1552,8 @@ static int phs_compress(S_PHS_RULE  *phs_rule,unsigned char *in_buf
 {
 	unsigned char *old_addr = out_buf;
 	int supress = 0;
-    PMINI_ADAPTER Adapter = GET_BCM_ADAPTER(gblpnetdev);
-    if(phs_rule == NULL)
+	PMINI_ADAPTER Adapter = GET_BCM_ADAPTER(gblpnetdev);
+	if(phs_rule == NULL)
 	{
 		bcm_dbg(Adapter, OTHERS, PHS_SEND, ALL,
 			"phs_compress(): phs_rule null!\n");
@@ -1573,7 +1573,7 @@ static int phs_compress(S_PHS_RULE  *phs_rule,unsigned char *in_buf
 	//To copy PHSI
 	out_buf++;
 	supress = verify_suppress_phsf(in_buf,out_buf,phs_rule->u8PHSF,
-        phs_rule->u8PHSM, phs_rule->u8PHSS, phs_rule->u8PHSV,new_header_size);
+				       phs_rule->u8PHSM, phs_rule->u8PHSS, phs_rule->u8PHSV,new_header_size);
 
 	if(supress == STATUS_PHS_COMPRESSED)
 	{
@@ -1617,7 +1617,7 @@ static int verify_suppress_phsf(unsigned char *in_buffer,unsigned char *out_buff
 {
 	unsigned int size=0;
 	int bit,i=0;
-    PMINI_ADAPTER Adapter = GET_BCM_ADAPTER(gblpnetdev);
+	PMINI_ADAPTER Adapter = GET_BCM_ADAPTER(gblpnetdev);
 	bcm_dbg(Adapter, OTHERS, PHS_SEND, ALL,
 		"COMP:In verify_phsf PHSM - 0x%X\n", *phsm);
 
diff --git a/drivers/staging/bcm/PHSModule.h b/drivers/staging/bcm/PHSModule.h
index c629585..652f444 100644
--- a/drivers/staging/bcm/PHSModule.h
+++ b/drivers/staging/bcm/PHSModule.h
@@ -2,20 +2,20 @@
 #define BCM_MINIPORT_PHSMODULE_H
 
 int PHSTransmit(PMINI_ADAPTER Adapter,
-					struct sk_buff **pPacket,
-					 USHORT Vcid,
-					 B_UINT16 uiClassifierRuleID,
-					 BOOLEAN bHeaderSuppressionEnabled,
-					 PUINT PacketLen,
-					 UCHAR bEthCSSupport);
+		struct sk_buff **pPacket,
+		USHORT Vcid,
+		B_UINT16 uiClassifierRuleID,
+		BOOLEAN bHeaderSuppressionEnabled,
+		PUINT PacketLen,
+		UCHAR bEthCSSupport);
 
 int PHSReceive(PMINI_ADAPTER Adapter,
-					USHORT usVcid,
-					struct sk_buff *packet,
-					UINT *punPacketLen,
-					UCHAR *pucEthernetHdr,
-					UINT
-					);
+	       USHORT usVcid,
+	       struct sk_buff *packet,
+	       UINT *punPacketLen,
+	       UCHAR *pucEthernetHdr,
+	       UINT
+	);
 
 
 void DumpDataPacketHeader(PUCHAR pPkt);
diff --git a/drivers/staging/bcm/Protocol.h b/drivers/staging/bcm/Protocol.h
index b8a4009..d56e462 100644
--- a/drivers/staging/bcm/Protocol.h
+++ b/drivers/staging/bcm/Protocol.h
@@ -1,6 +1,6 @@
 /************************************
-* 	Protocol.h
-*************************************/
+ * 	Protocol.h
+ *************************************/
 #ifndef	__PROTOCOL_H__
 #define	__PROTOCOL_H__
 
@@ -10,11 +10,11 @@
 
 
 struct ArpHeader {
-    struct arphdr       arp;
-    unsigned char       ar_sha[ETH_ALEN];   /* sender hardware address  */
-    unsigned char       ar_sip[4];      /* sender IP address        */
-    unsigned char       ar_tha[ETH_ALEN];   /* target hardware address  */
-    unsigned char       ar_tip[4];      /* target IP address        */
+	struct arphdr       arp;
+	unsigned char       ar_sha[ETH_ALEN];   /* sender hardware address  */
+	unsigned char       ar_sip[4];      /* sender IP address        */
+	unsigned char       ar_tha[ETH_ALEN];   /* target hardware address  */
+	unsigned char       ar_tip[4];      /* target IP address        */
 }/*__attribute__((packed))*/;
 
 
@@ -138,7 +138,7 @@ typedef struct _TCP_HEADER
 	ULONG  ulSeqNumber;
 	ULONG  ulAckNumber;
 	UCHAR  HeaderLength;
-    UCHAR  ucFlags;
+	UCHAR  ucFlags;
 	USHORT usWindowsSize;
 	USHORT usChkSum;
 	USHORT usUrgetPtr;
diff --git a/drivers/staging/bcm/Prototypes.h b/drivers/staging/bcm/Prototypes.h
index b80b806..ad325c6 100644
--- a/drivers/staging/bcm/Prototypes.h
+++ b/drivers/staging/bcm/Prototypes.h
@@ -18,8 +18,8 @@ int register_control_device_interface(PMINI_ADAPTER ps_adapter);
 void unregister_control_device_interface(PMINI_ADAPTER Adapter);
 
 INT CopyBufferToControlPacket(PMINI_ADAPTER Adapter,/**<Logical Adapter*/
-									  PVOID ioBuffer/**<Control Packet Buffer*/
-									  );
+			      PVOID ioBuffer/**<Control Packet Buffer*/
+	);
 
 VOID SortPackInfo(PMINI_ADAPTER Adapter);
 
@@ -39,16 +39,16 @@ BOOLEAN MatchProtocol(S_CLASSIFIER_RULE *pstClassifierRule,UCHAR ucProtocol);
 
 
 INT SetupNextSend(PMINI_ADAPTER Adapter, /**<Logical Adapter*/
-					struct sk_buff *Packet, /**<data buffer*/
-					USHORT Vcid)	;
+		  struct sk_buff *Packet, /**<data buffer*/
+		  USHORT Vcid)	;
 
 VOID LinkMessage(PMINI_ADAPTER Adapter);
 
 VOID transmit_packets(PMINI_ADAPTER Adapter);
 
 INT SendControlPacket(PMINI_ADAPTER Adapter, /**<Logical Adapter*/
-							char *pControlPacket/**<Control Packet*/
-							);
+		      char *pControlPacket/**<Control Packet*/
+	);
 
 
 int register_networkdev(PMINI_ADAPTER Adapter);
@@ -95,7 +95,7 @@ void beceem_parse_target_struct(PMINI_ADAPTER Adapter);
 int bcm_ioctl_fw_download(PMINI_ADAPTER Adapter, FIRMWARE_INFO *psFwInfo);
 
 void CopyMIBSExtendedSFParameters(PMINI_ADAPTER Adapter,
-		CServiceFlowParamSI *psfLocalSet, UINT uiSearchRuleIndex);
+				  CServiceFlowParamSI *psfLocalSet, UINT uiSearchRuleIndex);
 
 VOID ResetCounters(PMINI_ADAPTER Adapter);
 
@@ -192,10 +192,10 @@ INT BcmFlash2xWriteSig(PMINI_ADAPTER Adapter, FLASH2X_SECTION_VAL eFlashSectionV
 INT	validateFlash2xReadWrite(PMINI_ADAPTER Adapter, PFLASH2X_READWRITE psFlash2xReadWrite);
 INT IsFlash2x(PMINI_ADAPTER Adapter);
 INT	BcmCopySection(PMINI_ADAPTER Adapter,
-						FLASH2X_SECTION_VAL SrcSection,
-						FLASH2X_SECTION_VAL DstSection,
-						UINT offset,
-						UINT numOfBytes);
+		       FLASH2X_SECTION_VAL SrcSection,
+		       FLASH2X_SECTION_VAL DstSection,
+		       UINT offset,
+		       UINT numOfBytes);
 
 
 BOOLEAN IsNonCDLessDevice(PMINI_ADAPTER Adapter);
@@ -208,7 +208,7 @@ int rdmaltWithLock (PMINI_ADAPTER Adapter, UINT uiAddress, PUINT pucBuff, size_t
 
 int wrmWithLock(PMINI_ADAPTER Adapter, UINT uiAddress, PCHAR pucBuff, size_t size);
 INT buffDnldVerify(PMINI_ADAPTER Adapter, unsigned char *mappedbuffer, unsigned int u32FirmwareLength,
-		unsigned long u32StartingAddress);
+		   unsigned long u32StartingAddress);
 
 
 VOID putUsbSuspend(struct work_struct *work);
diff --git a/drivers/staging/bcm/Qos.c b/drivers/staging/bcm/Qos.c
index 6766f4d..66ed077 100644
--- a/drivers/staging/bcm/Qos.c
+++ b/drivers/staging/bcm/Qos.c
@@ -1,6 +1,6 @@
 /**
-@file Qos.C
-This file contains the routines related to Quality of Service.
+   @file Qos.C
+   This file contains the routines related to Quality of Service.
 */
 #include "headers.h"
 
@@ -14,154 +14,154 @@ static VOID PruneQueue(PMINI_ADAPTER Adapter, INT iIndex);
 
 
 /*******************************************************************
-* Function    - MatchSrcIpAddress()
-*
-* Description - Checks whether the Source IP address from the packet
-*				matches with that of Queue.
-*
-* Parameters  - pstClassifierRule: Pointer to the packet info structure.
-* 			  - ulSrcIP	    : Source IP address from the packet.
-*
-* Returns     - TRUE(If address matches) else FAIL .
-*********************************************************************/
+ * Function    - MatchSrcIpAddress()
+ *
+ * Description - Checks whether the Source IP address from the packet
+ *				matches with that of Queue.
+ *
+ * Parameters  - pstClassifierRule: Pointer to the packet info structure.
+ * 			  - ulSrcIP	    : Source IP address from the packet.
+ *
+ * Returns     - TRUE(If address matches) else FAIL .
+ *********************************************************************/
 BOOLEAN MatchSrcIpAddress(S_CLASSIFIER_RULE *pstClassifierRule,ULONG ulSrcIP)
 {
-    UCHAR 	ucLoopIndex=0;
+	UCHAR 	ucLoopIndex=0;
 
-    PMINI_ADAPTER Adapter = GET_BCM_ADAPTER(gblpnetdev);
+	PMINI_ADAPTER Adapter = GET_BCM_ADAPTER(gblpnetdev);
 
-    ulSrcIP=ntohl(ulSrcIP);
-    if(0 == pstClassifierRule->ucIPSourceAddressLength)
-       	return TRUE;
-    for(ucLoopIndex=0; ucLoopIndex < (pstClassifierRule->ucIPSourceAddressLength);ucLoopIndex++)
-    {
+	ulSrcIP=ntohl(ulSrcIP);
+	if(0 == pstClassifierRule->ucIPSourceAddressLength)
+		return TRUE;
+	for(ucLoopIndex=0; ucLoopIndex < (pstClassifierRule->ucIPSourceAddressLength);ucLoopIndex++)
+	{
 		bcm_dbg(Adapter, TX, IPV4_DBG, ALL,
 			"Src Ip Address Mask:0x%x PacketIp:0x%x and Classification:0x%x\n",
 			(UINT)pstClassifierRule->stSrcIpAddress.ulIpv4Mask[ucLoopIndex],
 			(UINT)ulSrcIP,
 			(UINT)pstClassifierRule->stSrcIpAddress.ulIpv6Addr[ucLoopIndex]);
 		if((pstClassifierRule->stSrcIpAddress.ulIpv4Mask[ucLoopIndex] & ulSrcIP)==
-				(pstClassifierRule->stSrcIpAddress.ulIpv4Addr[ucLoopIndex] & pstClassifierRule->stSrcIpAddress.ulIpv4Mask[ucLoopIndex] ))
-       	{
-       		return TRUE;
-       	}
-    }
+		   (pstClassifierRule->stSrcIpAddress.ulIpv4Addr[ucLoopIndex] & pstClassifierRule->stSrcIpAddress.ulIpv4Mask[ucLoopIndex] ))
+		{
+			return TRUE;
+		}
+	}
 	bcm_dbg(Adapter, TX, IPV4_DBG, ALL, "Src Ip Address Not Matched\n");
    	return FALSE;
 }
 
 
 /*******************************************************************
-* Function    - MatchDestIpAddress()
-*
-* Description - Checks whether the Destination IP address from the packet
-*				matches with that of Queue.
-*
-* Parameters  - pstClassifierRule: Pointer to the packet info structure.
-* 			  - ulDestIP    : Destination IP address from the packet.
-*
-* Returns     - TRUE(If address matches) else FAIL .
-*********************************************************************/
+ * Function    - MatchDestIpAddress()
+ *
+ * Description - Checks whether the Destination IP address from the packet
+ *				matches with that of Queue.
+ *
+ * Parameters  - pstClassifierRule: Pointer to the packet info structure.
+ * 			  - ulDestIP    : Destination IP address from the packet.
+ *
+ * Returns     - TRUE(If address matches) else FAIL .
+ *********************************************************************/
 BOOLEAN MatchDestIpAddress(S_CLASSIFIER_RULE *pstClassifierRule,ULONG ulDestIP)
 {
 	UCHAR 	ucLoopIndex=0;
-    PMINI_ADAPTER	Adapter = GET_BCM_ADAPTER(gblpnetdev);
+	PMINI_ADAPTER	Adapter = GET_BCM_ADAPTER(gblpnetdev);
 
 	ulDestIP=ntohl(ulDestIP);
-    if(0 == pstClassifierRule->ucIPDestinationAddressLength)
-       	return TRUE;
+	if(0 == pstClassifierRule->ucIPDestinationAddressLength)
+		return TRUE;
 	bcm_dbg(Adapter, TX, IPV4_DBG, ALL,
 		"Destination Ip Address 0x%x 0x%x 0x%x\n",
 		(UINT)ulDestIP,
 		(UINT)pstClassifierRule->stDestIpAddress.ulIpv4Mask[ucLoopIndex],
 		(UINT)pstClassifierRule->stDestIpAddress.ulIpv4Addr[ucLoopIndex]);
 
-    for(ucLoopIndex=0;ucLoopIndex<(pstClassifierRule->ucIPDestinationAddressLength);ucLoopIndex++)
-    {
+	for(ucLoopIndex=0;ucLoopIndex<(pstClassifierRule->ucIPDestinationAddressLength);ucLoopIndex++)
+	{
 		if((pstClassifierRule->stDestIpAddress.ulIpv4Mask[ucLoopIndex] & ulDestIP)==
-					(pstClassifierRule->stDestIpAddress.ulIpv4Addr[ucLoopIndex] & pstClassifierRule->stDestIpAddress.ulIpv4Mask[ucLoopIndex]))
-       	{
-       		return TRUE;
-       	}
-    }
+		   (pstClassifierRule->stDestIpAddress.ulIpv4Addr[ucLoopIndex] & pstClassifierRule->stDestIpAddress.ulIpv4Mask[ucLoopIndex]))
+		{
+			return TRUE;
+		}
+	}
 	bcm_dbg(Adapter, TX, IPV4_DBG, ALL,
 		"Destination Ip Address Not Matched\n");
-    return FALSE;
+	return FALSE;
 }
 
 
 /************************************************************************
-* Function    - MatchTos()
-*
-* Description - Checks the TOS from the packet matches with that of queue.
-*
-* Parameters  - pstClassifierRule   : Pointer to the packet info structure.
-* 			  - ucTypeOfService: TOS from the packet.
-*
-* Returns     - TRUE(If address matches) else FAIL.
-**************************************************************************/
+ * Function    - MatchTos()
+ *
+ * Description - Checks the TOS from the packet matches with that of queue.
+ *
+ * Parameters  - pstClassifierRule   : Pointer to the packet info structure.
+ * 			  - ucTypeOfService: TOS from the packet.
+ *
+ * Returns     - TRUE(If address matches) else FAIL.
+ **************************************************************************/
 BOOLEAN MatchTos(S_CLASSIFIER_RULE *pstClassifierRule,UCHAR ucTypeOfService)
 {
 
 	PMINI_ADAPTER Adapter = GET_BCM_ADAPTER(gblpnetdev);
-    if( 3 != pstClassifierRule->ucIPTypeOfServiceLength )
-       	return TRUE;
+	if( 3 != pstClassifierRule->ucIPTypeOfServiceLength )
+		return TRUE;
 
-    if(((pstClassifierRule->ucTosMask & ucTypeOfService)<=pstClassifierRule->ucTosHigh) && ((pstClassifierRule->ucTosMask & ucTypeOfService)>=pstClassifierRule->ucTosLow))
-    {
-       	return TRUE;
-    }
+	if(((pstClassifierRule->ucTosMask & ucTypeOfService)<=pstClassifierRule->ucTosHigh) && ((pstClassifierRule->ucTosMask & ucTypeOfService)>=pstClassifierRule->ucTosLow))
+	{
+		return TRUE;
+	}
 	bcm_dbg(Adapter, TX, IPV4_DBG, ALL, "Type Of Service Not Matched\n");
-    return FALSE;
+	return FALSE;
 }
 
 
 /***************************************************************************
-* Function    - MatchProtocol()
-*
-* Description - Checks the protocol from the packet matches with that of queue.
-*
-* Parameters  - pstClassifierRule: Pointer to the packet info structure.
-* 			  - ucProtocol	: Protocol from the packet.
-*
-* Returns     - TRUE(If address matches) else FAIL.
-****************************************************************************/
+ * Function    - MatchProtocol()
+ *
+ * Description - Checks the protocol from the packet matches with that of queue.
+ *
+ * Parameters  - pstClassifierRule: Pointer to the packet info structure.
+ * 			  - ucProtocol	: Protocol from the packet.
+ *
+ * Returns     - TRUE(If address matches) else FAIL.
+ ****************************************************************************/
 BOOLEAN MatchProtocol(S_CLASSIFIER_RULE *pstClassifierRule,UCHAR ucProtocol)
 {
    	UCHAR 	ucLoopIndex=0;
 	PMINI_ADAPTER Adapter = GET_BCM_ADAPTER(gblpnetdev);
 	if(0 == pstClassifierRule->ucProtocolLength)
-      	return TRUE;
+		return TRUE;
 	for(ucLoopIndex=0;ucLoopIndex<pstClassifierRule->ucProtocolLength;ucLoopIndex++)
-    {
+	{
 		bcm_dbg(Adapter, TX, IPV4_DBG, ALL,
 			"Protocol:0x%X Classification Protocol:0x%X\n",
 			ucProtocol, pstClassifierRule->ucProtocol[ucLoopIndex]);
-       	if(pstClassifierRule->ucProtocol[ucLoopIndex]==ucProtocol)
-       	{
-       		return TRUE;
-       	}
-    }
+		if(pstClassifierRule->ucProtocol[ucLoopIndex]==ucProtocol)
+		{
+			return TRUE;
+		}
+	}
 	bcm_dbg(Adapter, TX, IPV4_DBG, ALL, "Protocol Not Matched\n");
    	return FALSE;
 }
 
 
 /***********************************************************************
-* Function    - MatchSrcPort()
-*
-* Description - Checks, Source port from the packet matches with that of queue.
-*
-* Parameters  - pstClassifierRule: Pointer to the packet info structure.
-* 			  - ushSrcPort	: Source port from the packet.
-*
-* Returns     - TRUE(If address matches) else FAIL.
-***************************************************************************/
+ * Function    - MatchSrcPort()
+ *
+ * Description - Checks, Source port from the packet matches with that of queue.
+ *
+ * Parameters  - pstClassifierRule: Pointer to the packet info structure.
+ * 			  - ushSrcPort	: Source port from the packet.
+ *
+ * Returns     - TRUE(If address matches) else FAIL.
+ ***************************************************************************/
 BOOLEAN MatchSrcPort(S_CLASSIFIER_RULE *pstClassifierRule,USHORT ushSrcPort)
 {
     	UCHAR 	ucLoopIndex=0;
 
-		PMINI_ADAPTER Adapter = GET_BCM_ADAPTER(gblpnetdev);
+	PMINI_ADAPTER Adapter = GET_BCM_ADAPTER(gblpnetdev);
 
 
     	if(0 == pstClassifierRule->ucSrcPortRangeLength)
@@ -169,7 +169,7 @@ BOOLEAN MatchSrcPort(S_CLASSIFIER_RULE *pstClassifierRule,USHORT ushSrcPort)
     	for(ucLoopIndex=0;ucLoopIndex<pstClassifierRule->ucSrcPortRangeLength;ucLoopIndex++)
     	{
         	if(ushSrcPort <= pstClassifierRule->usSrcPortRangeHi[ucLoopIndex] &&
-		    ushSrcPort >= pstClassifierRule->usSrcPortRangeLo[ucLoopIndex])
+		   ushSrcPort >= pstClassifierRule->usSrcPortRangeLo[ucLoopIndex])
 	    	{
 		    	return TRUE;
 	    	}
@@ -181,19 +181,19 @@ BOOLEAN MatchSrcPort(S_CLASSIFIER_RULE *pstClassifierRule,USHORT ushSrcPort)
 
 
 /***********************************************************************
-* Function    - MatchDestPort()
-*
-* Description - Checks, Destination port from packet matches with that of queue.
-*
-* Parameters  - pstClassifierRule: Pointer to the packet info structure.
-* 			  - ushDestPort	: Destination port from the packet.
-*
-* Returns     - TRUE(If address matches) else FAIL.
-***************************************************************************/
+ * Function    - MatchDestPort()
+ *
+ * Description - Checks, Destination port from packet matches with that of queue.
+ *
+ * Parameters  - pstClassifierRule: Pointer to the packet info structure.
+ * 			  - ushDestPort	: Destination port from the packet.
+ *
+ * Returns     - TRUE(If address matches) else FAIL.
+ ***************************************************************************/
 BOOLEAN MatchDestPort(S_CLASSIFIER_RULE *pstClassifierRule,USHORT ushDestPort)
 {
     	UCHAR 	ucLoopIndex=0;
-		PMINI_ADAPTER Adapter = GET_BCM_ADAPTER(gblpnetdev);
+	PMINI_ADAPTER Adapter = GET_BCM_ADAPTER(gblpnetdev);
 
     	if(0 == pstClassifierRule->ucDestPortRangeLength)
         	return TRUE;
@@ -207,9 +207,9 @@ BOOLEAN MatchDestPort(S_CLASSIFIER_RULE *pstClassifierRule,USHORT ushDestPort)
 			pstClassifierRule->usDestPortRangeHi[ucLoopIndex]);
 
  		if(ushDestPort <= pstClassifierRule->usDestPortRangeHi[ucLoopIndex] &&
-		    ushDestPort >= pstClassifierRule->usDestPortRangeLo[ucLoopIndex])
+		   ushDestPort >= pstClassifierRule->usDestPortRangeLo[ucLoopIndex])
 	    	{
-		    return TRUE;
+			return TRUE;
 	    	}
     	}
 	bcm_dbg(Adapter, TX, IPV4_DBG, ALL,
@@ -217,9 +217,9 @@ BOOLEAN MatchDestPort(S_CLASSIFIER_RULE *pstClassifierRule,USHORT ushDestPort)
     	return FALSE;
 }
 /**
-@ingroup tx_functions
-Compares IPV4 Ip address and port number
-@return Queue Index.
+   @ingroup tx_functions
+   Compares IPV4 Ip address and port number
+   @return Queue Index.
 */
 static USHORT	IpVersion4(PMINI_ADAPTER Adapter,
 			   struct iphdr *iphd,
@@ -253,19 +253,19 @@ static USHORT	IpVersion4(PMINI_ADAPTER Adapter,
 		bcm_dbg(Adapter, TX, IPV4_DBG, ALL,
 			"Trying to match Source IP Address\n");
 		if(FALSE == (bClassificationSucceed =
-			MatchSrcIpAddress(pstClassifierRule, iphd->saddr)))
+			     MatchSrcIpAddress(pstClassifierRule, iphd->saddr)))
 			break;
 		bcm_dbg(Adapter, TX, IPV4_DBG, ALL,
 			"Source IP Address Matched\n");
 
 		if(FALSE == (bClassificationSucceed =
-			MatchDestIpAddress(pstClassifierRule, iphd->daddr)))
+			     MatchDestIpAddress(pstClassifierRule, iphd->daddr)))
 			break;
 		bcm_dbg(Adapter, TX, IPV4_DBG, ALL,
 			"Destination IP Address Matched\n");
 
 		if(FALSE == (bClassificationSucceed =
-			MatchTos(pstClassifierRule, iphd->tos)))
+			     MatchTos(pstClassifierRule, iphd->tos)))
 		{
 			bcm_dbg(Adapter, TX, IPV4_DBG, ALL,
 				"TOS Match failed\n");
@@ -274,7 +274,7 @@ static USHORT	IpVersion4(PMINI_ADAPTER Adapter,
 		bcm_dbg(Adapter, TX, IPV4_DBG, ALL, "TOS Matched\n");
 
 		if(FALSE == (bClassificationSucceed =
-			MatchProtocol(pstClassifierRule,iphd->protocol)))
+			     MatchProtocol(pstClassifierRule,iphd->protocol)))
 			break;
 		bcm_dbg(Adapter, TX, IPV4_DBG, ALL, "Protocol Matched\n");
 
@@ -286,9 +286,9 @@ static USHORT	IpVersion4(PMINI_ADAPTER Adapter,
 			(iphd->protocol==UDP)?xprt_hdr->uhdr.source:xprt_hdr->thdr.source);
 
 		if(FALSE == (bClassificationSucceed =
-			MatchSrcPort(pstClassifierRule,
-				ntohs((iphd->protocol == UDP)?
-				xprt_hdr->uhdr.source:xprt_hdr->thdr.source))))
+			     MatchSrcPort(pstClassifierRule,
+					  ntohs((iphd->protocol == UDP)?
+						xprt_hdr->uhdr.source:xprt_hdr->thdr.source))))
 			break;
 		bcm_dbg(Adapter, TX, IPV4_DBG, ALL, "Src Port Matched\n");
 
@@ -296,9 +296,9 @@ static USHORT	IpVersion4(PMINI_ADAPTER Adapter,
 			(iphd->protocol==UDP)?xprt_hdr->uhdr.dest:
 			xprt_hdr->thdr.dest);
 		if(FALSE == (bClassificationSucceed =
-			MatchDestPort(pstClassifierRule,
-			ntohs((iphd->protocol == UDP)?
-			xprt_hdr->uhdr.dest:xprt_hdr->thdr.dest))))
+			     MatchDestPort(pstClassifierRule,
+					   ntohs((iphd->protocol == UDP)?
+						 xprt_hdr->uhdr.dest:xprt_hdr->thdr.dest))))
 			break;
 	} while(0);
 
@@ -339,11 +339,11 @@ VOID PruneQueueAllSF(PMINI_ADAPTER Adapter)
 
 
 /**
-@ingroup tx_functions
-This function checks if the max queue size for a queue
-is less than number of bytes in the queue. If so -
-drops packets from the Head till the number of bytes is
-less than or equal to max queue size for the queue.
+   @ingroup tx_functions
+   This function checks if the max queue size for a queue
+   is less than number of bytes in the queue. If so -
+   drops packets from the Head till the number of bytes is
+   less than or equal to max queue size for the queue.
 */
 static VOID PruneQueue(PMINI_ADAPTER Adapter, INT iIndex)
 {
@@ -377,7 +377,7 @@ static VOID PruneQueue(PMINI_ADAPTER Adapter, INT iIndex)
 		if(PacketToDrop == NULL)
 			break;
 		if((Adapter->PackInfo[iIndex].uiCurrentPacketsOnHost < SF_MAX_ALLOWED_PACKETS_TO_BACKUP) &&
-			((1000*(jiffies - *((B_UINT32 *)(PacketToDrop->cb)+SKB_CB_LATENCY_OFFSET))/HZ) <= Adapter->PackInfo[iIndex].uiMaxLatency))
+		   ((1000*(jiffies - *((B_UINT32 *)(PacketToDrop->cb)+SKB_CB_LATENCY_OFFSET))/HZ) <= Adapter->PackInfo[iIndex].uiMaxLatency))
 			break;
 
 		if(PacketToDrop)
@@ -389,7 +389,7 @@ static VOID PruneQueue(PMINI_ADAPTER Adapter, INT iIndex)
 			netstats->tx_dropped++;
 
 			DEQUEUEPACKET(Adapter->PackInfo[iIndex].FirstTxQueue,
-						Adapter->PackInfo[iIndex].LastTxQueue);
+				      Adapter->PackInfo[iIndex].LastTxQueue);
 			/// update current bytes and packets count
 			Adapter->PackInfo[iIndex].uiCurrentBytesOnHost -=
 				PacketToDrop->len;
@@ -442,7 +442,7 @@ VOID flush_all_queues(PMINI_ADAPTER Adapter)
 				uiTotalPacketLength = 0;
 
 			DEQUEUEPACKET(Adapter->PackInfo[iQIndex].FirstTxQueue,
-						Adapter->PackInfo[iQIndex].LastTxQueue);
+				      Adapter->PackInfo[iQIndex].LastTxQueue);
 
 			/* Free the skb */
 			dev_kfree_skb(PacketToDrop);
@@ -489,42 +489,42 @@ USHORT ClassifyPacket(PMINI_ADAPTER Adapter,struct sk_buff* skb)
 
 	switch(stEthCsPktInfo.eNwpktEthFrameType)
 	{
-		case eEth802LLCFrame:
-		{
-			bcm_dbg(Adapter, TX, IPV4_DBG, ALL,
-				"ClassifyPacket : 802LLCFrame\n");
-            pIpHeader = pvEThPayload + sizeof(ETH_CS_802_LLC_FRAME);
-			break;
-		}
+	case eEth802LLCFrame:
+	{
+		bcm_dbg(Adapter, TX, IPV4_DBG, ALL,
+			"ClassifyPacket : 802LLCFrame\n");
+		pIpHeader = pvEThPayload + sizeof(ETH_CS_802_LLC_FRAME);
+		break;
+	}
 
-		case eEth802LLCSNAPFrame:
-		{
-			bcm_dbg(Adapter, TX, IPV4_DBG, ALL,
-				"ClassifyPacket : 802LLC SNAP Frame\n");
-			pIpHeader = pvEThPayload + sizeof(ETH_CS_802_LLC_SNAP_FRAME);
-			break;
-		}
-		case eEth802QVLANFrame:
-		{
-			bcm_dbg(Adapter, TX, IPV4_DBG, ALL,
-				"ClassifyPacket : 802.1Q VLANFrame\n");
-			pIpHeader = pvEThPayload + sizeof(ETH_CS_802_Q_FRAME);
-			break;
-		}
-		case eEthOtherFrame:
-		{
-			bcm_dbg(Adapter, TX, IPV4_DBG, ALL,
-				"ClassifyPacket : ETH Other Frame\n");
-			pIpHeader = pvEThPayload + sizeof(ETH_CS_ETH2_FRAME);
-			break;
-		}
-		default:
-		{
-			bcm_dbg(Adapter, TX, IPV4_DBG, ALL,
-				"ClassifyPacket : Unrecognized ETH Frame\n");
-			pIpHeader = pvEThPayload + sizeof(ETH_CS_ETH2_FRAME);
-			break;
-		}
+	case eEth802LLCSNAPFrame:
+	{
+		bcm_dbg(Adapter, TX, IPV4_DBG, ALL,
+			"ClassifyPacket : 802LLC SNAP Frame\n");
+		pIpHeader = pvEThPayload + sizeof(ETH_CS_802_LLC_SNAP_FRAME);
+		break;
+	}
+	case eEth802QVLANFrame:
+	{
+		bcm_dbg(Adapter, TX, IPV4_DBG, ALL,
+			"ClassifyPacket : 802.1Q VLANFrame\n");
+		pIpHeader = pvEThPayload + sizeof(ETH_CS_802_Q_FRAME);
+		break;
+	}
+	case eEthOtherFrame:
+	{
+		bcm_dbg(Adapter, TX, IPV4_DBG, ALL,
+			"ClassifyPacket : ETH Other Frame\n");
+		pIpHeader = pvEThPayload + sizeof(ETH_CS_ETH2_FRAME);
+		break;
+	}
+	default:
+	{
+		bcm_dbg(Adapter, TX, IPV4_DBG, ALL,
+			"ClassifyPacket : Unrecognized ETH Frame\n");
+		pIpHeader = pvEThPayload + sizeof(ETH_CS_ETH2_FRAME);
+		break;
+	}
 	}
 
 	if(stEthCsPktInfo.eNwpktIPFrameType == eIPv4Packet)
@@ -535,13 +535,13 @@ USHORT ClassifyPacket(PMINI_ADAPTER Adapter,struct sk_buff* skb)
 
 		if(bFragmentedPkt)
 		{
-				//Fragmented  Packet. Get Frag Classifier Entry.
+			//Fragmented  Packet. Get Frag Classifier Entry.
 			pstClassifierRule = GetFragIPClsEntry(Adapter,pIpHeader->id, pIpHeader->saddr);
 			if(pstClassifierRule)
 			{
 				bcm_dbg(Adapter, TX, IPV4_DBG, ALL,
 					"It is next Fragmented pkt\n");
-					bClassificationSucceed=TRUE;
+				bClassificationSucceed=TRUE;
 			}
 			if(!(ntohs(pIpHeader->frag_off) & IP_MF))
 			{
@@ -660,14 +660,14 @@ USHORT ClassifyPacket(PMINI_ADAPTER Adapter,struct sk_buff* skb)
 		*((UINT32*)(skb->cb)+SKB_CB_CLASSIFICATION_OFFSET) = pstClassifierRule->uiClassifierRuleIndex;
 		if((TCP == pIpHeader->protocol ) && !bFragmentedPkt && (ETH_AND_IP_HEADER_LEN + TCP_HEADER_LEN <= skb->len) )
 		{
-			 IpHeaderLength   = pIpHeader->ihl;
-			 pTcpHeader = (PTCP_HEADER)(((PUCHAR)pIpHeader)+(IpHeaderLength*4));
-			 TcpHeaderLength  = GET_TCP_HEADER_LEN(pTcpHeader->HeaderLength);
+			IpHeaderLength   = pIpHeader->ihl;
+			pTcpHeader = (PTCP_HEADER)(((PUCHAR)pIpHeader)+(IpHeaderLength*4));
+			TcpHeaderLength  = GET_TCP_HEADER_LEN(pTcpHeader->HeaderLength);
 
 			if((pTcpHeader->ucFlags & TCP_ACK) &&
 			   (ntohs(pIpHeader->tot_len) == (IpHeaderLength*4)+(TcpHeaderLength*4)))
 			{
-    			*((UINT32*) (skb->cb) +SKB_CB_TCPACK_OFFSET ) = TCP_ACK;
+				*((UINT32*) (skb->cb) +SKB_CB_TCPACK_OFFSET ) = TCP_ACK;
 			}
 		}
 
@@ -700,7 +700,7 @@ USHORT ClassifyPacket(PMINI_ADAPTER Adapter,struct sk_buff* skb)
 static BOOLEAN EthCSMatchSrcMACAddress(S_CLASSIFIER_RULE *pstClassifierRule,PUCHAR Mac)
 {
 	UINT i=0;
-    PMINI_ADAPTER Adapter = GET_BCM_ADAPTER(gblpnetdev);
+	PMINI_ADAPTER Adapter = GET_BCM_ADAPTER(gblpnetdev);
 	if(pstClassifierRule->ucEthCSSrcMACLen==0)
 		return TRUE;
 	bcm_dbg(Adapter, TX, IPV4_DBG, ALL, "%s\n", __func__);
@@ -711,7 +711,7 @@ static BOOLEAN EthCSMatchSrcMACAddress(S_CLASSIFIER_RULE *pstClassifierRule,PUCH
 			i, Mac[i], pstClassifierRule->au8EThCSSrcMAC[i],
 			pstClassifierRule->au8EThCSSrcMACMask[i]);
 		if((pstClassifierRule->au8EThCSSrcMAC[i] & pstClassifierRule->au8EThCSSrcMACMask[i])!=
-			(Mac[i] & pstClassifierRule->au8EThCSSrcMACMask[i]))
+		   (Mac[i] & pstClassifierRule->au8EThCSSrcMACMask[i]))
 			return FALSE;
 	}
 	return TRUE;
@@ -720,7 +720,7 @@ static BOOLEAN EthCSMatchSrcMACAddress(S_CLASSIFIER_RULE *pstClassifierRule,PUCH
 static BOOLEAN EthCSMatchDestMACAddress(S_CLASSIFIER_RULE *pstClassifierRule,PUCHAR Mac)
 {
 	UINT i=0;
-    PMINI_ADAPTER Adapter = GET_BCM_ADAPTER(gblpnetdev);
+	PMINI_ADAPTER Adapter = GET_BCM_ADAPTER(gblpnetdev);
 	if(pstClassifierRule->ucEthCSDestMACLen==0)
 		return TRUE;
 	bcm_dbg(Adapter, TX, IPV4_DBG, ALL, "%s\n", __func__);
@@ -731,7 +731,7 @@ static BOOLEAN EthCSMatchDestMACAddress(S_CLASSIFIER_RULE *pstClassifierRule,PUC
 			i, Mac[i], pstClassifierRule->au8EThCSDestMAC[i],
 			pstClassifierRule->au8EThCSDestMACMask[i]);
 		if((pstClassifierRule->au8EThCSDestMAC[i] & pstClassifierRule->au8EThCSDestMACMask[i])!=
-			(Mac[i] & pstClassifierRule->au8EThCSDestMACMask[i]))
+		   (Mac[i] & pstClassifierRule->au8EThCSDestMACMask[i]))
 			return FALSE;
 	}
 	return TRUE;
@@ -739,9 +739,9 @@ static BOOLEAN EthCSMatchDestMACAddress(S_CLASSIFIER_RULE *pstClassifierRule,PUC
 
 static BOOLEAN EthCSMatchEThTypeSAP(S_CLASSIFIER_RULE *pstClassifierRule,struct sk_buff* skb,PS_ETHCS_PKT_INFO pstEthCsPktInfo)
 {
-    PMINI_ADAPTER Adapter = GET_BCM_ADAPTER(gblpnetdev);
+	PMINI_ADAPTER Adapter = GET_BCM_ADAPTER(gblpnetdev);
 	if((pstClassifierRule->ucEtherTypeLen==0)||
-		(pstClassifierRule->au8EthCSEtherType[0] == 0))
+	   (pstClassifierRule->au8EthCSEtherType[0] == 0))
 		return TRUE;
 
 	bcm_dbg(Adapter, TX, IPV4_DBG, ALL,
@@ -788,7 +788,7 @@ static BOOLEAN EthCSMatchVLANRules(S_CLASSIFIER_RULE *pstClassifierRule,struct s
 	BOOLEAN bClassificationSucceed = FALSE;
 	USHORT usVLANID;
 	B_UINT8 uPriority = 0;
-    PMINI_ADAPTER Adapter = GET_BCM_ADAPTER(gblpnetdev);
+	PMINI_ADAPTER Adapter = GET_BCM_ADAPTER(gblpnetdev);
 
 	bcm_dbg(Adapter, TX, IPV4_DBG, ALL,
 		"%s  CLS UserPrio:%x CLS VLANID:%x\n",
@@ -800,12 +800,12 @@ static BOOLEAN EthCSMatchVLANRules(S_CLASSIFIER_RULE *pstClassifierRule,struct s
 	if(pstClassifierRule->usValidityBitMap & (1<<PKT_CLASSIFICATION_USER_PRIORITY_VALID))
 	{
 		if(pstEthCsPktInfo->eNwpktEthFrameType!=eEth802QVLANFrame)
-				return FALSE;
+			return FALSE;
 
 		uPriority = (ntohs(*(USHORT *)(skb->data + sizeof(ETH_HEADER_STRUC))) & 0xF000) >> 13;
 
 		if((uPriority >= pstClassifierRule->usUserPriority[0]) && (uPriority <= pstClassifierRule->usUserPriority[1]))
-				bClassificationSucceed = TRUE;
+			bClassificationSucceed = TRUE;
 
 		if(!bClassificationSucceed)
 			return FALSE;
@@ -819,7 +819,7 @@ static BOOLEAN EthCSMatchVLANRules(S_CLASSIFIER_RULE *pstClassifierRule,struct s
 	if(pstClassifierRule->usValidityBitMap & (1<<PKT_CLASSIFICATION_VLANID_VALID))
 	{
 		if(pstEthCsPktInfo->eNwpktEthFrameType!=eEth802QVLANFrame)
-				return FALSE;
+			return FALSE;
 
 		usVLANID = ntohs(*(USHORT *)(skb->data + sizeof(ETH_HEADER_STRUC))) & 0xFFF;
 
diff --git a/drivers/staging/bcm/Queue.h b/drivers/staging/bcm/Queue.h
index e1f1da2..0721633 100644
--- a/drivers/staging/bcm/Queue.h
+++ b/drivers/staging/bcm/Queue.h
@@ -1,31 +1,31 @@
 /*************************************
-* 	Queue.h
-**************************************/
+ * 	Queue.h
+ **************************************/
 #ifndef	__QUEUE_H__
 #define	__QUEUE_H__
 
 
 
-#define ENQUEUEPACKET(_Head, _Tail,_Packet)	\
-do						\
-{                                               \
-    if (!_Head) {                           \
-        	_Head = _Packet;                \
-        } 					\
-	else {                                  \
-        	(_Tail)->next = _Packet; 	\
-        }                                       \
-   	(_Packet)->next = NULL;  		\
-    _Tail = _Packet;                        \
-}while(0)
+#define ENQUEUEPACKET(_Head, _Tail,_Packet)		\
+	do						\
+	{                                               \
+		if (!_Head) {                           \
+			_Head = _Packet;                \
+		} 					\
+		else {                                  \
+			(_Tail)->next = _Packet; 	\
+		}                                       \
+		(_Packet)->next = NULL;  		\
+		_Tail = _Packet;                        \
+	}while(0)
 #define DEQUEUEPACKET(Head, Tail )            	\
-do						\
-{   if(Head)			\
-	{                                            \
-        if (!Head->next) {                      \
-        	Tail = NULL;                    \
-        }                                       \
-        Head = Head->next;                      \
-	}		\
-}while(0)
+	do					\
+	{   if(Head)				\
+		{				\
+			if (!Head->next) {	\
+				Tail = NULL;	\
+			}			\
+			Head = Head->next;	\
+		}				\
+	}while(0)
 #endif	//__QUEUE_H__
diff --git a/drivers/staging/bcm/Transmit.c b/drivers/staging/bcm/Transmit.c
index 357e54f..edd776d 100644
--- a/drivers/staging/bcm/Transmit.c
+++ b/drivers/staging/bcm/Transmit.c
@@ -1,45 +1,45 @@
 /**
-@file Transmit.c
-@defgroup tx_functions Transmission
-@section Queueing
-@dot
-digraph transmit1 {
-node[shape=box]
-edge[weight=5;color=red]
-
-bcm_transmit->GetPacketQueueIndex[label="IP Packet"]
-GetPacketQueueIndex->IpVersion4[label="IPV4"]
-GetPacketQueueIndex->IpVersion6[label="IPV6"]
-}
-
-@enddot
-
-@section De-Queueing
-@dot
-digraph transmit2 {
-node[shape=box]
-edge[weight=5;color=red]
-interrupt_service_thread->transmit_packets
-tx_pkt_hdler->transmit_packets
-transmit_packets->CheckAndSendPacketFromIndex
-transmit_packets->UpdateTokenCount
-CheckAndSendPacketFromIndex->PruneQueue
-CheckAndSendPacketFromIndex->IsPacketAllowedForFlow
-CheckAndSendPacketFromIndex->SendControlPacket[label="control pkt"]
-SendControlPacket->bcm_cmd53
-CheckAndSendPacketFromIndex->SendPacketFromQueue[label="data pkt"]
-SendPacketFromQueue->SetupNextSend->bcm_cmd53
-}
-@enddot
+   @file Transmit.c
+   @defgroup tx_functions Transmission
+   @section Queueing
+   @dot
+   digraph transmit1 {
+   node[shape=box]
+   edge[weight=5;color=red]
+
+   bcm_transmit->GetPacketQueueIndex[label="IP Packet"]
+   GetPacketQueueIndex->IpVersion4[label="IPV4"]
+   GetPacketQueueIndex->IpVersion6[label="IPV6"]
+   }
+
+   @enddot
+
+   @section De-Queueing
+   @dot
+   digraph transmit2 {
+   node[shape=box]
+   edge[weight=5;color=red]
+   interrupt_service_thread->transmit_packets
+   tx_pkt_hdler->transmit_packets
+   transmit_packets->CheckAndSendPacketFromIndex
+   transmit_packets->UpdateTokenCount
+   CheckAndSendPacketFromIndex->PruneQueue
+   CheckAndSendPacketFromIndex->IsPacketAllowedForFlow
+   CheckAndSendPacketFromIndex->SendControlPacket[label="control pkt"]
+   SendControlPacket->bcm_cmd53
+   CheckAndSendPacketFromIndex->SendPacketFromQueue[label="data pkt"]
+   SendPacketFromQueue->SetupNextSend->bcm_cmd53
+   }
+   @enddot
 */
 
 #include "headers.h"
 
 
 /**
-@ingroup ctrl_pkt_functions
-This function dispatches control packet to the h/w interface
-@return zero(success) or -ve value(failure)
+   @ingroup ctrl_pkt_functions
+   This function dispatches control packet to the h/w interface
+   @return zero(success) or -ve value(failure)
 */
 INT SendControlPacket(PMINI_ADAPTER Adapter, char *pControlPacket)
 {
@@ -53,12 +53,12 @@ INT SendControlPacket(PMINI_ADAPTER Adapter, char *pControlPacket)
 		return STATUS_FAILURE;
 	}
 	if((atomic_read( &Adapter->CurrNumFreeTxDesc ) <
-		((PLeader->PLength-1)/MAX_DEVICE_DESC_SIZE)+1))
-    {
-	    bcm_dbg(Adapter, TX, TX_CONTROL, ALL,
-		    "NO FREE DESCRIPTORS TO SEND CONTROL PACKET\n");
-        return STATUS_FAILURE;
-    }
+	    ((PLeader->PLength-1)/MAX_DEVICE_DESC_SIZE)+1))
+	{
+		bcm_dbg(Adapter, TX, TX_CONTROL, ALL,
+			"NO FREE DESCRIPTORS TO SEND CONTROL PACKET\n");
+		return STATUS_FAILURE;
+	}
 
 	/* Update the netdevice statistics */
 	/* Dump Packet  */
@@ -76,7 +76,7 @@ INT SendControlPacket(PMINI_ADAPTER Adapter, char *pControlPacket)
 			       16, 1, pControlPacket, PLeader->PLength + LEADER_SIZE, 0);
 
 	Adapter->interface_transmit(Adapter->pvInterfaceAdapter,
-					pControlPacket, (PLeader->PLength + LEADER_SIZE));
+				    pControlPacket, (PLeader->PLength + LEADER_SIZE));
 
 	atomic_dec(&Adapter->CurrNumFreeTxDesc);
 	bcm_dbg(Adapter, TX, TX_CONTROL, ALL, "<=========\n");
@@ -84,10 +84,10 @@ INT SendControlPacket(PMINI_ADAPTER Adapter, char *pControlPacket)
 }
 
 /**
-@ingroup tx_functions
-This function despatches the IP packets with the given vcid
-to the target via the host h/w interface.
-@return  zero(success) or -ve value(failure)
+   @ingroup tx_functions
+   This function despatches the IP packets with the given vcid
+   to the target via the host h/w interface.
+   @return  zero(success) or -ve value(failure)
 */
 INT SetupNextSend(PMINI_ADAPTER Adapter,  struct sk_buff *Packet, USHORT Vcid)
 {
@@ -110,13 +110,13 @@ INT SetupNextSend(PMINI_ADAPTER Adapter,  struct sk_buff *Packet, USHORT Vcid)
 		& Adapter->bPHSEnabled;
 
 	if(Adapter->device_removed)
-		{
+	{
 		status = STATUS_FAILURE;
 		goto errExit;
-		}
+	}
 
 	status = PHSTransmit(Adapter, &Packet, Vcid, uiClassifierRuleID, bHeaderSupressionEnabled,
-							(UINT *)&Packet->len, Adapter->PackInfo[QueueIndex].bEthCSSupport);
+			     (UINT *)&Packet->len, Adapter->PackInfo[QueueIndex].bEthCSSupport);
 
 	if(status != STATUS_SUCCESS)
 	{
@@ -136,7 +136,7 @@ INT SetupNextSend(PMINI_ADAPTER Adapter,  struct sk_buff *Packet, USHORT Vcid)
 	{
 		Leader.PLength = Packet->len;
 		if(skb_headroom(Packet) < LEADER_SIZE)
-        {
+		{
 			if((status = skb_cow(Packet,LEADER_SIZE)))
 			{
 				bcm_dbg(Adapter, TX, NEXT_SEND, ALL,
@@ -154,7 +154,7 @@ INT SetupNextSend(PMINI_ADAPTER Adapter,  struct sk_buff *Packet, USHORT Vcid)
 	}
 
 	status = Adapter->interface_transmit(Adapter->pvInterfaceAdapter,
-			Packet->data, (Leader.PLength + LEADER_SIZE));
+					     Packet->data, (Leader.PLength + LEADER_SIZE));
 	if(status)
 	{
 		++Adapter->dev->stats.tx_errors;
@@ -195,11 +195,11 @@ static int tx_pending(PMINI_ADAPTER Adapter)
 }
 
 /**
-@ingroup tx_functions
-Transmit thread
+   @ingroup tx_functions
+   Transmit thread
 */
 int tx_pkt_handler(PMINI_ADAPTER Adapter  /**< pointer to adapter object*/
-				)
+	)
 {
 	int status = 0;
 
@@ -241,8 +241,8 @@ int tx_pkt_handler(PMINI_ADAPTER Adapter  /**< pointer to adapter object*/
 		}
 
 		if( atomic_read(&Adapter->CurrNumFreeTxDesc) &&
-			Adapter->LinkStatus == SYNC_UP_REQUEST &&
-			!Adapter->bSyncUpRequestSent)
+		    Adapter->LinkStatus == SYNC_UP_REQUEST &&
+		    !Adapter->bSyncUpRequestSent)
 		{
 			bcm_dbg(Adapter, TX, TX_PACKETS, ALL,
 				"Calling LinkMessage\n");
@@ -254,8 +254,8 @@ int tx_pkt_handler(PMINI_ADAPTER Adapter  /**< pointer to adapter object*/
 			bcm_dbg(Adapter, TX, TX_PACKETS, ALL,
 				"Device in Low Power mode...waking up\n");
     			Adapter->usIdleModePattern = ABORT_IDLE_MODE;
-				Adapter->bWakeUpDevice = TRUE;
-				wake_up(&Adapter->process_rx_cntrlpkt);
+			Adapter->bWakeUpDevice = TRUE;
+			wake_up(&Adapter->process_rx_cntrlpkt);
 		}
 
 		transmit_packets(Adapter);
diff --git a/drivers/staging/bcm/Typedefs.h b/drivers/staging/bcm/Typedefs.h
index a985abf..befbc14 100644
--- a/drivers/staging/bcm/Typedefs.h
+++ b/drivers/staging/bcm/Typedefs.h
@@ -1,6 +1,6 @@
 /****************************
-*	Typedefs.h
-****************************/
+ *	Typedefs.h
+ ****************************/
 #ifndef	__TYPEDEFS_H__
 #define	__TYPEDEFS_H__
 #define  STATUS_SUCCESS	0
diff --git a/drivers/staging/bcm/Version.h b/drivers/staging/bcm/Version.h
index a07b956..5f1e522 100644
--- a/drivers/staging/bcm/Version.h
+++ b/drivers/staging/bcm/Version.h
@@ -1,14 +1,14 @@
 
 /*Copyright (c) 2005 Beceem Communications Inc.
 
-Module Name:
+  Module Name:
 
   Version.h
 
-Abstract:
+  Abstract:
 
 
---*/
+  --*/
 
 #ifndef VERSION_H
 #define VERSION_H
diff --git a/drivers/staging/bcm/cntrl_SignalingInterface.h b/drivers/staging/bcm/cntrl_SignalingInterface.h
index ab13180..0d1628c 100644
--- a/drivers/staging/bcm/cntrl_SignalingInterface.h
+++ b/drivers/staging/bcm/cntrl_SignalingInterface.h
@@ -46,83 +46,83 @@
 struct _stCPacketClassificationRuleSI{
 
 	/**  16bit UserPriority Of The Service Flow*/
-    B_UINT16                        u16UserPriority;
+	B_UINT16                        u16UserPriority;
 	/**  16bit VLANID Of The Service Flow*/
-    B_UINT16                        u16VLANID;
+	B_UINT16                        u16VLANID;
 	/**  16bit Packet Classification RuleIndex Of The Service Flow*/
-    B_UINT16                        u16PacketClassificationRuleIndex;
+	B_UINT16                        u16PacketClassificationRuleIndex;
 	/**  8bit Classifier Rule Priority Of The Service Flow*/
-    B_UINT8                         u8ClassifierRulePriority;
+	B_UINT8                         u8ClassifierRulePriority;
 	/**  Length of IP TypeOfService field*/
 	B_UINT8                         u8IPTypeOfServiceLength;
 	/**  3bytes IP TypeOfService */
-    B_UINT8                         u8IPTypeOfService[TYPE_OF_SERVICE_LENGTH];
+	B_UINT8                         u8IPTypeOfService[TYPE_OF_SERVICE_LENGTH];
 	/** Protocol used in classification of Service Flow*/
-    B_UINT8                         u8Protocol;
+	B_UINT8                         u8Protocol;
 	/**  Length of IP Masked Source Address */
-    B_UINT8                         u8IPMaskedSourceAddressLength;
+	B_UINT8                         u8IPMaskedSourceAddressLength;
 	/**  IP Masked Source Address used in classification for the Service Flow*/
-    B_UINT8                         u8IPMaskedSourceAddress[IP_MASKED_SRC_ADDRESS_LENGTH];
+	B_UINT8                         u8IPMaskedSourceAddress[IP_MASKED_SRC_ADDRESS_LENGTH];
 	/**  Length of IP Destination Address */
-    B_UINT8                         u8IPDestinationAddressLength;
+	B_UINT8                         u8IPDestinationAddressLength;
 	/**  IP Destination Address used in classification for the Service Flow*/
-    B_UINT8                         u8IPDestinationAddress[IP_MASKED_DEST_ADDRESS_LENGTH];
+	B_UINT8                         u8IPDestinationAddress[IP_MASKED_DEST_ADDRESS_LENGTH];
 	/** Length of Protocol Source Port Range */
-    B_UINT8                         u8ProtocolSourcePortRangeLength;
+	B_UINT8                         u8ProtocolSourcePortRangeLength;
 	/**  Protocol Source Port Range used in the Service Flow*/
-    B_UINT8                         u8ProtocolSourcePortRange[PROTOCOL_SRC_PORT_RANGE_LENGTH];
+	B_UINT8                         u8ProtocolSourcePortRange[PROTOCOL_SRC_PORT_RANGE_LENGTH];
 	/** Length of Protocol Dest Port Range */
-    B_UINT8                         u8ProtocolDestPortRangeLength;
+	B_UINT8                         u8ProtocolDestPortRangeLength;
 	/**  Protocol Dest Port Range used in the Service Flow*/
-    B_UINT8                         u8ProtocolDestPortRange[PROTOCOL_DEST_PORT_RANGE_LENGTH];
+	B_UINT8                         u8ProtocolDestPortRange[PROTOCOL_DEST_PORT_RANGE_LENGTH];
 	/** Length of Ethernet Destination MAC Address  */
-    B_UINT8                         u8EthernetDestMacAddressLength;
+	B_UINT8                         u8EthernetDestMacAddressLength;
 	/**  Ethernet Destination MAC Address  used in classification of the Service Flow*/
-    B_UINT8                         u8EthernetDestMacAddress[ETHERNET_DEST_MAC_ADDR_LENGTH];
+	B_UINT8                         u8EthernetDestMacAddress[ETHERNET_DEST_MAC_ADDR_LENGTH];
 	/** Length of Ethernet Source MAC Address  */
-    B_UINT8                         u8EthernetSourceMACAddressLength;
+	B_UINT8                         u8EthernetSourceMACAddressLength;
 	/**  Ethernet Source MAC Address  used in classification of the Service Flow*/
-    B_UINT8                         u8EthernetSourceMACAddress[ETHERNET_SRC_MAC_ADDR_LENGTH];
+	B_UINT8                         u8EthernetSourceMACAddress[ETHERNET_SRC_MAC_ADDR_LENGTH];
 	/**  Length of Ethertype */
 	B_UINT8                         u8EthertypeLength;
 	/**  3bytes Ethertype Of The Service Flow*/
-    B_UINT8                         u8Ethertype[NUM_ETHERTYPE_BYTES];
+	B_UINT8                         u8Ethertype[NUM_ETHERTYPE_BYTES];
 	/**  8bit Associated PHSI Of The Service Flow*/
-    B_UINT8                         u8AssociatedPHSI;
+	B_UINT8                         u8AssociatedPHSI;
 	/** Length of Vendor Specific Classifier Param length Of The Service Flow*/
-    B_UINT8                         u8VendorSpecificClassifierParamLength;
+	B_UINT8                         u8VendorSpecificClassifierParamLength;
 	/**  Vendor Specific Classifier Param Of The Service Flow*/
-    B_UINT8                         u8VendorSpecificClassifierParam[VENDOR_CLASSIFIER_PARAM_LENGTH];
-    /** Length Of IPv6 Flow Lable of the Service Flow*/
-    B_UINT8                         u8IPv6FlowLableLength;
+	B_UINT8                         u8VendorSpecificClassifierParam[VENDOR_CLASSIFIER_PARAM_LENGTH];
+	/** Length Of IPv6 Flow Lable of the Service Flow*/
+	B_UINT8                         u8IPv6FlowLableLength;
 	/**  IPv6 Flow Lable Of The Service Flow*/
-    B_UINT8                         u8IPv6FlowLable[NUM_IPV6_FLOWLABLE_BYTES];
+	B_UINT8                         u8IPv6FlowLable[NUM_IPV6_FLOWLABLE_BYTES];
 	/**  Action associated with the classifier rule*/
-    B_UINT8							u8ClassifierActionRule;
-    B_UINT16							u16ValidityBitMap;
+	B_UINT8							u8ClassifierActionRule;
+	B_UINT16							u16ValidityBitMap;
 };
 typedef struct _stCPacketClassificationRuleSI CCPacketClassificationRuleSI,stCPacketClassificationRuleSI, *pstCPacketClassificationRuleSI;
 
 /// \brief class CPhsRuleSI
 typedef struct _stPhsRuleSI {
 	/**  8bit PHS Index Of The Service Flow*/
-    B_UINT8                         u8PHSI;
+	B_UINT8                         u8PHSI;
 	/**  PHSF Length Of The Service Flow*/
-    B_UINT8                         u8PHSFLength;
-    /** String of bytes containing header information to be suppressed by the sending CS and reconstructed by the receiving CS*/
-    B_UINT8                         u8PHSF[MAX_PHS_LENGTHS];
+	B_UINT8                         u8PHSFLength;
+	/** String of bytes containing header information to be suppressed by the sending CS and reconstructed by the receiving CS*/
+	B_UINT8                         u8PHSF[MAX_PHS_LENGTHS];
 	/**  PHSM Length Of The Service Flow*/
-    B_UINT8                         u8PHSMLength;
+	B_UINT8                         u8PHSMLength;
 	/**  PHS Mask for the SF*/
-    B_UINT8                         u8PHSM[MAX_PHS_LENGTHS];
+	B_UINT8                         u8PHSM[MAX_PHS_LENGTHS];
 	/**  8bit Total number of bytes to be suppressed for the Service Flow*/
-    B_UINT8                         u8PHSS;
+	B_UINT8                         u8PHSS;
 	/**  8bit Indicates whether or not Packet Header contents need to be verified prior to supression */
-    B_UINT8                         u8PHSV;
+	B_UINT8                         u8PHSV;
 	/**  Vendor Specific PHS param Length Of The Service Flow*/
-    B_UINT8                         u8VendorSpecificPHSParamsLength;
+	B_UINT8                         u8VendorSpecificPHSParamsLength;
 	/**  Vendor Specific PHS param Of The Service Flow*/
-    B_UINT8                         u8VendorSpecificPHSParams[VENDOR_PHS_PARAM_LENGTH];
+	B_UINT8                         u8VendorSpecificPHSParams[VENDOR_PHS_PARAM_LENGTH];
 
 	B_UINT8                         u8Padding[2];
 }stPhsRuleSI,*pstPhsRuleSI;
@@ -131,15 +131,15 @@ typedef stPhsRuleSI CPhsRuleSI;
 /// \brief structure cConvergenceSLTypes
 struct _stConvergenceSLTypes{
 	/**  8bit Phs Classfier Action Of The Service Flow*/
-    B_UINT8                         u8ClassfierDSCAction;
+	B_UINT8                         u8ClassfierDSCAction;
 	/**  8bit Phs DSC Action Of The Service Flow*/
-    B_UINT8                         u8PhsDSCAction;
+	B_UINT8                         u8PhsDSCAction;
 	/**   16bit Padding */
-    B_UINT8                         u8Padding[2];
-    /// \brief class cCPacketClassificationRule
-    stCPacketClassificationRuleSI     cCPacketClassificationRule;
-    /// \brief class CPhsRuleSI
-     struct _stPhsRuleSI		cPhsRule;
+	B_UINT8                         u8Padding[2];
+	/// \brief class cCPacketClassificationRule
+	stCPacketClassificationRuleSI     cCPacketClassificationRule;
+	/// \brief class CPhsRuleSI
+	struct _stPhsRuleSI		cPhsRule;
 };
 typedef struct _stConvergenceSLTypes stConvergenceSLTypes,CConvergenceSLTypes, *pstConvergenceSLTypes;
 
@@ -147,50 +147,50 @@ typedef struct _stConvergenceSLTypes stConvergenceSLTypes,CConvergenceSLTypes, *
 /// \brief structure CServiceFlowParamSI
 typedef struct _stServiceFlowParamSI{
 
-     /**  32bitSFID Of The Service Flow*/
-    B_UINT32                        u32SFID;
+	/**  32bitSFID Of The Service Flow*/
+	B_UINT32                        u32SFID;
 
-     /**  32bit Maximum Sustained Traffic Rate of the Service Flow*/
-    B_UINT32                        u32MaxSustainedTrafficRate;
+	/**  32bit Maximum Sustained Traffic Rate of the Service Flow*/
+	B_UINT32                        u32MaxSustainedTrafficRate;
 
-     /**  32bit Maximum Traffic Burst allowed for the Service Flow*/
-    B_UINT32                        u32MaxTrafficBurst;
+	/**  32bit Maximum Traffic Burst allowed for the Service Flow*/
+	B_UINT32                        u32MaxTrafficBurst;
 
-    /**  32bit Minimum Reserved Traffic Rate of the Service Flow*/
-    B_UINT32                        u32MinReservedTrafficRate;
+	/**  32bit Minimum Reserved Traffic Rate of the Service Flow*/
+	B_UINT32                        u32MinReservedTrafficRate;
 
 	/**  32bit Tolerated Jitter of the Service Flow*/
     	B_UINT32                        u32ToleratedJitter;
 
-   /**  32bit Maximum Latency of the Service Flow*/
-    B_UINT32                        u32MaximumLatency;
+	/**  32bit Maximum Latency of the Service Flow*/
+	B_UINT32                        u32MaximumLatency;
 
 	/**  16bitCID Of The Service Flow*/
-    B_UINT16                        u16CID;
+	B_UINT16                        u16CID;
 
-     /**  16bit SAID on which the service flow being set up shall be mapped*/
-    B_UINT16                        u16TargetSAID;
+	/**  16bit SAID on which the service flow being set up shall be mapped*/
+	B_UINT16                        u16TargetSAID;
 
 	/** 16bit  ARQ window size negotiated*/
-    B_UINT16                        u16ARQWindowSize;
+	B_UINT16                        u16ARQWindowSize;
 
-     /**  16bit Total Tx delay incl sending, receiving & processing delays 	*/
-    B_UINT16                        u16ARQRetryTxTimeOut;
+	/**  16bit Total Tx delay incl sending, receiving & processing delays 	*/
+	B_UINT16                        u16ARQRetryTxTimeOut;
 
 	/**  16bit Total Rx delay incl sending, receiving & processing delays 	*/
-    B_UINT16                        u16ARQRetryRxTimeOut;
+	B_UINT16                        u16ARQRetryRxTimeOut;
 
 	/**  16bit ARQ block lifetime	*/
-    B_UINT16                        u16ARQBlockLifeTime;
+	B_UINT16                        u16ARQBlockLifeTime;
 
 	/**  16bit ARQ Sync loss timeout*/
-    B_UINT16                        u16ARQSyncLossTimeOut;
+	B_UINT16                        u16ARQSyncLossTimeOut;
 
-	 /**  16bit ARQ Purge timeout */
-    B_UINT16                        u16ARQRxPurgeTimeOut;
+	/**  16bit ARQ Purge timeout */
+	B_UINT16                        u16ARQRxPurgeTimeOut;
 //TODO::Remove this once we move to a new CORR2 driver
-    /// \brief Size of an ARQ block
-    B_UINT16                        u16ARQBlockSize;
+	/// \brief Size of an ARQ block
+	B_UINT16                        u16ARQBlockSize;
 
 //#endif
 	/**  16bit Nominal interval b/w consecutive SDU arrivals at MAC SAP*/
@@ -199,82 +199,82 @@ typedef struct _stServiceFlowParamSI{
 	/**  16bit Specifies the time base for rate measurement 	*/
 	B_UINT16                        u16TimeBase;
 
-	 /** 16bit Interval b/w Successive Grant oppurtunities*/
+	/** 16bit Interval b/w Successive Grant oppurtunities*/
 	B_UINT16                        u16UnsolicitedGrantInterval;
 
 	/** 16bit Interval b/w Successive Polling grant oppurtunities*/
 	B_UINT16						u16UnsolicitedPollingInterval;
 
-	 /**   internal var to get the overhead */
+	/**   internal var to get the overhead */
 	B_UINT16						u16MacOverhead;
 
-	 /**  MBS contents Identifier*/
+	/**  MBS contents Identifier*/
 	B_UINT16						u16MBSContentsID[MBS_CONTENTS_ID_LENGTH];
 
 	/**  MBS contents Identifier length*/
 	B_UINT8							u8MBSContentsIDLength;
 
 	/**	 ServiceClassName Length Of The Service Flow*/
-    B_UINT8                         u8ServiceClassNameLength;
+	B_UINT8                         u8ServiceClassNameLength;
 
 	/**  32bytes ServiceClassName Of The Service Flow*/
-    B_UINT8                         u8ServiceClassName[32];
+	B_UINT8                         u8ServiceClassName[32];
 
 	/**  8bit Indicates whether or not MBS service is requested for this Serivce Flow*/
 	B_UINT8							u8MBSService;
 
-    /**  8bit QOS Parameter Set specifies proper application of QoS paramters to Provisioned, Admitted and Active sets*/
-    B_UINT8                         u8QosParamSet;
+	/**  8bit QOS Parameter Set specifies proper application of QoS paramters to Provisioned, Admitted and Active sets*/
+	B_UINT8                         u8QosParamSet;
 
-   /**  8bit Traffic Priority Of the Service Flow */
-    B_UINT8                         u8TrafficPriority;
+	/**  8bit Traffic Priority Of the Service Flow */
+	B_UINT8                         u8TrafficPriority;
 
-   /**  8bit Uplink Grant Scheduling Type of The Service Flow */
-    B_UINT8                         u8ServiceFlowSchedulingType;
+	/**  8bit Uplink Grant Scheduling Type of The Service Flow */
+	B_UINT8                         u8ServiceFlowSchedulingType;
 
-  /**  8bit Request transmission Policy of the Service Flow*/
-    B_UINT8							u8RequesttransmissionPolicy;
+	/**  8bit Request transmission Policy of the Service Flow*/
+	B_UINT8							u8RequesttransmissionPolicy;
 
 	/**  8bit Specifies whether SDUs for this Service flow are of FixedLength or Variable length */
-    B_UINT8                         u8FixedLengthVSVariableLengthSDUIndicator;
+	B_UINT8                         u8FixedLengthVSVariableLengthSDUIndicator;
 
 	/**  8bit Length of the SDU for a fixed length SDU service flow*/
 	B_UINT8                         u8SDUSize;
 
-	 /** 8bit Indicates whether or not ARQ is requested for this connection*/
-       B_UINT8                         u8ARQEnable;
+	/** 8bit Indicates whether or not ARQ is requested for this connection*/
+	B_UINT8                         u8ARQEnable;
 
 	/**<  8bit Indicates whether or not data has tobe delivered in order to higher layer*/
-       B_UINT8                         u8ARQDeliverInOrder;
+	B_UINT8                         u8ARQDeliverInOrder;
 
 	/**  8bit Receiver ARQ ACK processing time */
 	B_UINT8                         u8RxARQAckProcessingTime;
 
 	/**  8bit Convergence Sublayer Specification Of The Service Flow*/
-       B_UINT8                         u8CSSpecification;
+	B_UINT8                         u8CSSpecification;
 
-	 /**  8 bit Type of data delivery service*/
+	/**  8 bit Type of data delivery service*/
 	B_UINT8                         u8TypeOfDataDeliveryService;
 
 	/** 8bit Specifies whether a service flow may generate Paging	*/
 	B_UINT8                         u8PagingPreference;
 
 	/**  8bit Indicates the MBS Zone through which the connection or virtual connection is valid	*/
-       B_UINT8                         u8MBSZoneIdentifierassignment;
+	B_UINT8                         u8MBSZoneIdentifierassignment;
 
-       /**  8bit Specifies whether traffic on SF should generate MOB_TRF_IND to MS in sleep mode*/
+	/**  8bit Specifies whether traffic on SF should generate MOB_TRF_IND to MS in sleep mode*/
 	B_UINT8                         u8TrafficIndicationPreference;
 
 	/** 8bit Speciifes the length of predefined Global QoS parameter set encoding for this SF	*/
 	B_UINT8                         u8GlobalServicesClassNameLength;
 
-	 /**  6 byte Speciifes the predefined Global QoS parameter set encoding for this SF	*/
+	/**  6 byte Speciifes the predefined Global QoS parameter set encoding for this SF	*/
 	B_UINT8                         u8GlobalServicesClassName[GLOBAL_SF_CLASSNAME_LENGTH];
 
-	 /**  8bit Indicates whether or not SN feedback is enabled for the conn	*/
+	/**  8bit Indicates whether or not SN feedback is enabled for the conn	*/
 	B_UINT8                         u8SNFeedbackEnabled;
 
-	 /**  Indicates the size of the Fragment Sequence Number for the connection	*/
+	/**  Indicates the size of the Fragment Sequence Number for the connection	*/
 	B_UINT8                         u8FSNSize;
 
 	/** 8bit Number of CIDs in active BS list 	*/
@@ -283,10 +283,10 @@ typedef struct _stServiceFlowParamSI{
 	/**  CIDs of BS in the active list	*/
 	B_UINT8							u8CIDAllocation4activeBSs[MAX_NUM_ACTIVE_BS];
 
-	 /**  Specifies if PDU extended subheader should be applied on every PDU on this conn*/
+	/**  Specifies if PDU extended subheader should be applied on every PDU on this conn*/
 	B_UINT8                         u8PDUSNExtendedSubheader4HarqReordering;
 
-	 /**  8bit Specifies whether the connection uses HARQ or not	*/
+	/**  8bit Specifies whether the connection uses HARQ or not	*/
 	B_UINT8                         u8HARQServiceFlows;
 
 	/**  Specifies the length of Authorization token*/
@@ -298,14 +298,14 @@ typedef struct _stServiceFlowParamSI{
 	/**  specifes Number of HARQ channels used to carry data length*/
 	B_UINT8							u8HarqChannelMappingLength;
 
-	 /**  specifes HARQ channels used to carry data*/
+	/**  specifes HARQ channels used to carry data*/
 	B_UINT8							u8HARQChannelMapping[NUM_HARQ_CHANNELS];
 
 	/**  8bit Length of Vendor Specific QoS Params */
-    B_UINT8                         u8VendorSpecificQoSParamLength;
+	B_UINT8                         u8VendorSpecificQoSParamLength;
 
 	/** 1byte  Vendor Specific QoS Param Of The Service Flow*/
-    B_UINT8                          u8VendorSpecificQoSParam[VENDOR_SPECIF_QOS_PARAM];
+	B_UINT8                          u8VendorSpecificQoSParam[VENDOR_SPECIF_QOS_PARAM];
 
 	// indicates total classifiers in the SF
 	B_UINT8                         u8TotalClassifiers;  /**< Total number of valid classifiers*/
@@ -313,7 +313,7 @@ typedef struct _stServiceFlowParamSI{
 	B_UINT8				u8Padding;	 /**<  Padding byte*/
 
 /**
-Structure for Convergence SubLayer Types with a maximum of 4 classifiers
+   Structure for Convergence SubLayer Types with a maximum of 4 classifiers
 */
 	stConvergenceSLTypes		cConvergenceSLTypes[MAX_CLASSIFIERS_IN_SF];
 
@@ -321,7 +321,7 @@ Structure for Convergence SubLayer Types with a maximum of 4 classifiers
 typedef stServiceFlowParamSI CServiceFlowParamSI;
 
 /**
-structure stLocalSFAddRequest
+   structure stLocalSFAddRequest
 */
 typedef struct _stLocalSFAddRequest{
 
@@ -333,7 +333,7 @@ typedef struct _stLocalSFAddRequest{
     	B_UINT16                        u16CID;	/**<  16bit CID*/
 	/// \brief 16bitVCID
 	B_UINT16                        u16VCID;	/**<  16bit VCID*/
-    /// \brief structure ParameterSet
+	/// \brief structure ParameterSet
 
 	stServiceFlowParamSI	*psfParameterSet;	/**<  structure ParameterSet*/
 
@@ -341,7 +341,7 @@ typedef struct _stLocalSFAddRequest{
 
 
 /**
-structure stLocalSFAddIndication
+   structure stLocalSFAddIndication
 */
 typedef struct _stLocalSFAddIndication{
 
@@ -349,61 +349,61 @@ typedef struct _stLocalSFAddIndication{
 	B_UINT8      eConnectionDir;	/**<  Connection Direction*/
 	/// \brief 16 bit TID
 	B_UINT16                         u16TID;	/**<  TID*/
-    /// \brief 16bitCID
-    B_UINT16                        u16CID;		/**<  16bitCID*/
-    /// \brief 16bitVCID
-    B_UINT16                        u16VCID;	 /**<  16bitVCID*/
-
-
-    /// \brief structure AuthorizedSet
-    /// \brief structure AuthorizedSet
-    stServiceFlowParamSI              *psfAuthorizedSet;	/**<  AuthorizedSet of type stServiceFlowParamSI*/
-    /// \brief structure AdmittedSet
-    stServiceFlowParamSI              *psfAdmittedSet;	/**<  AdmittedSet of type stServiceFlowParamSI*/
-    /// \brief structure ActiveSet
-    stServiceFlowParamSI              *psfActiveSet;	/**<  sfActiveSet of type stServiceFlowParamSI*/
+	/// \brief 16bitCID
+	B_UINT16                        u16CID;		/**<  16bitCID*/
+	/// \brief 16bitVCID
+	B_UINT16                        u16VCID;	 /**<  16bitVCID*/
+
+
+	/// \brief structure AuthorizedSet
+	/// \brief structure AuthorizedSet
+	stServiceFlowParamSI              *psfAuthorizedSet;	/**<  AuthorizedSet of type stServiceFlowParamSI*/
+	/// \brief structure AdmittedSet
+	stServiceFlowParamSI              *psfAdmittedSet;	/**<  AdmittedSet of type stServiceFlowParamSI*/
+	/// \brief structure ActiveSet
+	stServiceFlowParamSI              *psfActiveSet;	/**<  sfActiveSet of type stServiceFlowParamSI*/
 	B_UINT8				   u8CC;	/**<  Confirmation Code*/
 	B_UINT8				   u8Padd;		/**<  8-bit Padding */
 
-    B_UINT16               u16Padd;	/**< 16 bit Padding */
+	B_UINT16               u16Padd;	/**< 16 bit Padding */
 
 }stLocalSFAddIndication;
 
 
 typedef struct _stLocalSFAddIndication *pstLocalSFAddIndication;
 /**
-structure stLocalSFChangeRequest is same as structure stLocalSFAddIndication
+   structure stLocalSFChangeRequest is same as structure stLocalSFAddIndication
 */
 typedef struct _stLocalSFAddIndication stLocalSFChangeRequest, *pstLocalSFChangeRequest;
 /**
-structure stLocalSFChangeIndication is same as structure stLocalSFAddIndication
+   structure stLocalSFChangeIndication is same as structure stLocalSFAddIndication
 */
 typedef struct _stLocalSFAddIndication stLocalSFChangeIndication, *pstLocalSFChangeIndication;
 
 /**
-structure stLocalSFDeleteRequest
+   structure stLocalSFDeleteRequest
 */
 typedef struct _stLocalSFDeleteRequest{
 	B_UINT8                         u8Type;	 /**< Type*/
 	B_UINT8                         u8Padding;	 /**<  Padding byte*/
 	B_UINT16			u16TID;		 /**<  TID*/
-    /// \brief 32bitSFID
-    B_UINT32                        u32SFID;	 /**<  SFID*/
+	/// \brief 32bitSFID
+	B_UINT32                        u32SFID;	 /**<  SFID*/
 }stLocalSFDeleteRequest, *pstLocalSFDeleteRequest;
 
 /**
-structure stLocalSFDeleteIndication
+   structure stLocalSFDeleteIndication
 */
 typedef struct stLocalSFDeleteIndication{
 	B_UINT8                         u8Type;	/**< Type */
 	B_UINT8                         u8Padding;	/**< Padding  */
 	B_UINT16			u16TID;			/**< TID */
-       /// \brief 16bitCID
-    B_UINT16                        u16CID;			/**< CID */
-    /// \brief 16bitVCID
-    B_UINT16                        u16VCID;		/**< VCID */
-    /// \brief 32bitSFID
-    B_UINT32                        u32SFID; 		/**< SFID */
+	/// \brief 16bitCID
+	B_UINT16                        u16CID;			/**< CID */
+	/// \brief 16bitVCID
+	B_UINT16                        u16VCID;		/**< VCID */
+	/// \brief 32bitSFID
+	B_UINT32                        u32SFID; 		/**< SFID */
 	/// \brief 8bit Confirmation code
 	B_UINT8                         u8ConfirmationCode;	/**< Confirmation code */
 	B_UINT8                         u8Padding1[3];		/**< 3 byte Padding  */
diff --git a/drivers/staging/bcm/headers.h b/drivers/staging/bcm/headers.h
index e8d3952..fdba67a 100644
--- a/drivers/staging/bcm/headers.h
+++ b/drivers/staging/bcm/headers.h
@@ -1,7 +1,7 @@
 
 /*******************************************************************
-* 		Headers.h
-*******************************************************************/
+ * 		Headers.h
+ *******************************************************************/
 #ifndef __HEADERS_H__
 #define __HEADERS_H__
 
diff --git a/drivers/staging/bcm/hostmibs.c b/drivers/staging/bcm/hostmibs.c
index f98b6ca..c4f3fb4 100644
--- a/drivers/staging/bcm/hostmibs.c
+++ b/drivers/staging/bcm/hostmibs.c
@@ -67,7 +67,7 @@ INT ProcessGetHostMibs(PMINI_ADAPTER Adapter, S_MIBS_HOST_STATS_MIBS *pstHostMib
 				pstPhsRule = pstClassifierRule->pstPhsRule;
 
 				pstHostMibs->astPhsRulesTable[nPhsTableIndex].
-				    ulSFID = Adapter->PackInfo[nSfIndex].ulSFID;
+					ulSFID = Adapter->PackInfo[nSfIndex].ulSFID;
 
 				memcpy(&pstHostMibs->
 				       astPhsRulesTable[nPhsTableIndex].u8PHSI,
diff --git a/drivers/staging/bcm/led_control.c b/drivers/staging/bcm/led_control.c
index 78f4069..929151f 100644
--- a/drivers/staging/bcm/led_control.c
+++ b/drivers/staging/bcm/led_control.c
@@ -24,7 +24,7 @@ BOOLEAN IsReqGpioIsLedInNVM(PMINI_ADAPTER Adapter, UINT gpios)
 }
 
 static INT LED_Blink(PMINI_ADAPTER Adapter, UINT GPIO_Num, UCHAR uiLedIndex,
-		ULONG timeout, INT num_of_time, LedEventInfo_t currdriverstate)
+		     ULONG timeout, INT num_of_time, LedEventInfo_t currdriverstate)
 {
 	int Status = STATUS_SUCCESS;
 	BOOLEAN bInfinite = FALSE;
@@ -40,16 +40,16 @@ static INT LED_Blink(PMINI_ADAPTER Adapter, UINT GPIO_Num, UCHAR uiLedIndex,
 
 		/* Wait for timeout after setting on the LED */
 		Status = wait_event_interruptible_timeout(
-				Adapter->LEDInfo.notify_led_event,
-				currdriverstate != Adapter->DriverState ||
-					kthread_should_stop(),
-				msecs_to_jiffies(timeout));
+			Adapter->LEDInfo.notify_led_event,
+			currdriverstate != Adapter->DriverState ||
+			kthread_should_stop(),
+			msecs_to_jiffies(timeout));
 
 		if (kthread_should_stop()) {
 			bcm_dbg(Adapter, OTHERS, LED_DUMP_INFO, ALL,
 				"Led thread got signal to exit..hence exiting\n");
 			Adapter->LEDInfo.led_thread_running =
-					BCM_LED_THREAD_DISABLED;
+				BCM_LED_THREAD_DISABLED;
 			TURN_OFF_LED(GPIO_Num, uiLedIndex);
 			Status = EVENT_SIGNALED;
 			break;
@@ -62,10 +62,10 @@ static INT LED_Blink(PMINI_ADAPTER Adapter, UINT GPIO_Num, UCHAR uiLedIndex,
 
 		TURN_OFF_LED(GPIO_Num, uiLedIndex);
 		Status = wait_event_interruptible_timeout(
-				Adapter->LEDInfo.notify_led_event,
-				currdriverstate != Adapter->DriverState ||
-					kthread_should_stop(),
-				msecs_to_jiffies(timeout));
+			Adapter->LEDInfo.notify_led_event,
+			currdriverstate != Adapter->DriverState ||
+			kthread_should_stop(),
+			msecs_to_jiffies(timeout));
 		if (bInfinite == FALSE)
 			num_of_time--;
 	}
@@ -95,8 +95,8 @@ static INT ScaleRateofTransfer(ULONG rate)
 
 
 static INT LED_Proportional_Blink(PMINI_ADAPTER Adapter, UCHAR GPIO_Num_tx,
-		UCHAR uiTxLedIndex, UCHAR GPIO_Num_rx, UCHAR uiRxLedIndex,
-		LedEventInfo_t currdriverstate)
+				  UCHAR uiTxLedIndex, UCHAR GPIO_Num_rx, UCHAR uiRxLedIndex,
+				  LedEventInfo_t currdriverstate)
 {
 	/* Initial values of TX and RX packets */
 	ULONG64 Initial_num_of_packts_tx = 0, Initial_num_of_packts_rx = 0;
@@ -137,15 +137,15 @@ static INT LED_Proportional_Blink(PMINI_ADAPTER Adapter, UCHAR GPIO_Num_tx,
 			if (num_of_time > 0) {
 				/* Blink both Tx and Rx LEDs */
 				if (LED_Blink(Adapter, 1 << GPIO_Num_tx,
-						uiTxLedIndex, timeout,
-						num_of_time, currdriverstate)
-							== EVENT_SIGNALED)
+					      uiTxLedIndex, timeout,
+					      num_of_time, currdriverstate)
+				    == EVENT_SIGNALED)
 					return EVENT_SIGNALED;
 
 				if (LED_Blink(Adapter, 1 << GPIO_Num_rx,
-						uiRxLedIndex, timeout,
-						num_of_time, currdriverstate)
-							== EVENT_SIGNALED)
+					      uiRxLedIndex, timeout,
+					      num_of_time, currdriverstate)
+				    == EVENT_SIGNALED)
 					return EVENT_SIGNALED;
 
 			}
@@ -153,20 +153,20 @@ static INT LED_Proportional_Blink(PMINI_ADAPTER Adapter, UCHAR GPIO_Num_tx,
 			if (num_of_time == num_of_time_tx) {
 				/* Blink pending rate of Rx */
 				if (LED_Blink(Adapter, (1 << GPIO_Num_rx),
-						uiRxLedIndex, timeout,
-						num_of_time_rx-num_of_time,
-						currdriverstate)
-							== EVENT_SIGNALED)
+					      uiRxLedIndex, timeout,
+					      num_of_time_rx-num_of_time,
+					      currdriverstate)
+				    == EVENT_SIGNALED)
 					return EVENT_SIGNALED;
 
 				num_of_time = num_of_time_rx;
 			} else {
 				/* Blink pending rate of Tx */
 				if (LED_Blink(Adapter, 1 << GPIO_Num_tx,
-						uiTxLedIndex, timeout,
-						num_of_time_tx-num_of_time,
-						currdriverstate)
-							== EVENT_SIGNALED)
+					      uiTxLedIndex, timeout,
+					      num_of_time_tx-num_of_time,
+					      currdriverstate)
+				    == EVENT_SIGNALED)
 					return EVENT_SIGNALED;
 
 				num_of_time = num_of_time_tx;
@@ -175,16 +175,16 @@ static INT LED_Proportional_Blink(PMINI_ADAPTER Adapter, UCHAR GPIO_Num_tx,
 			if (num_of_time == num_of_time_tx) {
 				/* Blink pending rate of Rx */
 				if (LED_Blink(Adapter, 1 << GPIO_Num_tx,
-						uiTxLedIndex, timeout,
-						num_of_time, currdriverstate)
-							== EVENT_SIGNALED)
+					      uiTxLedIndex, timeout,
+					      num_of_time, currdriverstate)
+				    == EVENT_SIGNALED)
 					return EVENT_SIGNALED;
 			} else {
 				/* Blink pending rate of Tx */
 				if (LED_Blink(Adapter, 1 << GPIO_Num_rx,
-						uiRxLedIndex, timeout,
-						num_of_time, currdriverstate)
-							== EVENT_SIGNALED)
+					      uiRxLedIndex, timeout,
+					      num_of_time, currdriverstate)
+				    == EVENT_SIGNALED)
 					return EVENT_SIGNALED;
 			}
 		}
@@ -197,16 +197,16 @@ static INT LED_Proportional_Blink(PMINI_ADAPTER Adapter, UCHAR GPIO_Num_tx,
 		if (remDelay > 0) {
 			timeout = 100 * remDelay;
 			Status = wait_event_interruptible_timeout(
-					Adapter->LEDInfo.notify_led_event,
-					currdriverstate != Adapter->DriverState
-						|| kthread_should_stop(),
-					msecs_to_jiffies(timeout));
+				Adapter->LEDInfo.notify_led_event,
+				currdriverstate != Adapter->DriverState
+				|| kthread_should_stop(),
+				msecs_to_jiffies(timeout));
 
 			if (kthread_should_stop()) {
 				bcm_dbg(Adapter, OTHERS, LED_DUMP_INFO, ALL,
 					"Led thread got signal to exit..hence exiting\n");
 				Adapter->LEDInfo.led_thread_running =
-						BCM_LED_THREAD_DISABLED;
+					BCM_LED_THREAD_DISABLED;
 				return EVENT_SIGNALED;
 			}
 			if (Status)
@@ -225,9 +225,9 @@ static INT LED_Proportional_Blink(PMINI_ADAPTER Adapter, UCHAR GPIO_Num_tx,
 		Final_num_of_packts_rx = Adapter->dev->stats.rx_packets;
 
 		rate_of_transfer_tx = Final_num_of_packts_tx -
-						Initial_num_of_packts_tx;
+			Initial_num_of_packts_tx;
 		rate_of_transfer_rx = Final_num_of_packts_rx -
-						Initial_num_of_packts_rx;
+			Initial_num_of_packts_rx;
 
 		/* Read initial value of packets sent/received */
 		Initial_num_of_packts_tx = Final_num_of_packts_tx;
@@ -260,7 +260,7 @@ static INT LED_Proportional_Blink(PMINI_ADAPTER Adapter, UCHAR GPIO_Num_tx,
  * -----------------------------------------------------------------------------
  */
 static INT ValidateDSDParamsChecksum(PMINI_ADAPTER Adapter, ULONG ulParamOffset,
-					USHORT usParamLen)
+				     USHORT usParamLen)
 {
 	INT Status = STATUS_SUCCESS;
 	PUCHAR puBuffer = NULL;
@@ -281,7 +281,7 @@ static INT ValidateDSDParamsChecksum(PMINI_ADAPTER Adapter, ULONG ulParamOffset,
 
 	/* Read the DSD data from the parameter offset. */
 	if (STATUS_SUCCESS != BeceemNVMRead(Adapter, (PUINT)puBuffer,
-			ulParamOffset, usParamLen)) {
+					    ulParamOffset, usParamLen)) {
 		bcm_dbg(Adapter, OTHERS, LED_DUMP_INFO, ALL,
 			"LED Thread: ValidateDSDParamsChecksum BeceemNVMRead failed\n");
 		Status = STATUS_IMAGE_CHECKSUM_MISMATCH;
@@ -299,7 +299,7 @@ static INT ValidateDSDParamsChecksum(PMINI_ADAPTER Adapter, ULONG ulParamOffset,
 	 * Read it and compare with the calculated Checksum.
 	 */
 	if (STATUS_SUCCESS != BeceemNVMRead(Adapter, (PUINT)&usChksmOrg,
-			ulParamOffset+usParamLen, 2)) {
+					    ulParamOffset+usParamLen, 2)) {
 		bcm_dbg(Adapter, OTHERS, LED_DUMP_INFO, ALL,
 			"LED Thread: ValidateDSDParamsChecksum BeceemNVMRead failed\n");
 		Status = STATUS_IMAGE_CHECKSUM_MISMATCH;
@@ -361,7 +361,7 @@ static INT ValidateHWParmStructure(PMINI_ADAPTER Adapter, ULONG ulHwParamOffset)
 	bcm_dbg(Adapter, OTHERS, LED_DUMP_INFO, ALL,
 		"LED Thread:HwParamLen = 0x%x\n", HwParamLen);
 	Status = ValidateDSDParamsChecksum(Adapter, ulHwParamOffset,
-						HwParamLen);
+					   HwParamLen);
 	return Status;
 } /* ValidateHWParmStructure() */
 
@@ -377,7 +377,7 @@ static int ReadLEDInformationFromEEPROM(PMINI_ADAPTER Adapter,
 	UCHAR  ucGPIOInfo[32]	= {0};
 
 	BeceemNVMRead(Adapter, (PUINT)&usEEPROMVersion,
-			EEPROM_VERSION_OFFSET, 2);
+		      EEPROM_VERSION_OFFSET, 2);
 
 	bcm_dbg(Adapter, OTHERS, LED_DUMP_INFO, ALL,
 		"usEEPROMVersion: Minor:0x%X Major:0x%x\n",
@@ -386,7 +386,7 @@ static int ReadLEDInformationFromEEPROM(PMINI_ADAPTER Adapter,
 
 	if (((usEEPROMVersion>>8)&0xFF) < EEPROM_MAP5_MAJORVERSION) {
 		BeceemNVMRead(Adapter, (PUINT)&usHwParamData,
-			EEPROM_HW_PARAM_POINTER_ADDRESS, 2);
+			      EEPROM_HW_PARAM_POINTER_ADDRESS, 2);
 		usHwParamData = ntohs(usHwParamData);
 		dwReadValue   = usHwParamData;
 	} else {
@@ -395,14 +395,14 @@ static int ReadLEDInformationFromEEPROM(PMINI_ADAPTER Adapter,
 		 * if compatibility section is valid.
 		 */
 		Status = ValidateDSDParamsChecksum(Adapter,
-				DSD_START_OFFSET,
-				COMPATIBILITY_SECTION_LENGTH_MAP5);
+						   DSD_START_OFFSET,
+						   COMPATIBILITY_SECTION_LENGTH_MAP5);
 
 		if (Status != STATUS_SUCCESS)
 			return Status;
 
 		BeceemNVMRead(Adapter, (PUINT)&dwReadValue,
-			EEPROM_HW_PARAM_POINTER_ADDRRES_MAP5, 4);
+			      EEPROM_HW_PARAM_POINTER_ADDRRES_MAP5, 4);
 		dwReadValue = ntohl(dwReadValue);
 	}
 
@@ -418,7 +418,7 @@ static int ReadLEDInformationFromEEPROM(PMINI_ADAPTER Adapter,
 	 * upper limit should be below (Adapter->uiNVMDSDSize-DSD_START_OFFSET)
 	 */
 	if (dwReadValue < DSD_START_OFFSET ||
-			dwReadValue > (Adapter->uiNVMDSDSize-DSD_START_OFFSET))
+	    dwReadValue > (Adapter->uiNVMDSDSize-DSD_START_OFFSET))
 		return STATUS_IMAGE_CHECKSUM_MISMATCH;
 
 	Status = ValidateHWParmStructure(Adapter, dwReadValue);
@@ -434,7 +434,7 @@ static int ReadLEDInformationFromEEPROM(PMINI_ADAPTER Adapter,
 	dwReadValue +=
 		DSD_START_OFFSET; /* = start address of hw param section. */
 	dwReadValue += GPIO_SECTION_START_OFFSET;
-			/* = GPIO start offset within HW Param section. */
+	/* = GPIO start offset within HW Param section. */
 
 	/*
 	 * Read the GPIO values for 32 GPIOs from EEPROM and map the function
@@ -473,7 +473,7 @@ static int ReadLEDInformationFromEEPROM(PMINI_ADAPTER Adapter,
 
 
 static int ReadConfigFileStructure(PMINI_ADAPTER Adapter,
-					BOOLEAN *bEnableThread)
+				   BOOLEAN *bEnableThread)
 {
 	int Status = STATUS_SUCCESS;
 	/* Array to store GPIO numbers from EEPROM */
@@ -531,10 +531,10 @@ static int ReadConfigFileStructure(PMINI_ADAPTER Adapter,
 		Adapter->LEDInfo.LEDState[uiIndex].LED_Type = bData;
 		if (bData <= NUM_OF_LEDS)
 			Adapter->LEDInfo.LEDState[uiIndex].GPIO_Num =
-							GPIO_Array[bData];
+				GPIO_Array[bData];
 		else
 			Adapter->LEDInfo.LEDState[uiIndex].GPIO_Num =
-							DISABLE_GPIO_NUM;
+				DISABLE_GPIO_NUM;
 
 		puCFGData++;
 		bData = *puCFGData;
@@ -551,8 +551,8 @@ static int ReadConfigFileStructure(PMINI_ADAPTER Adapter,
 	 */
 	for (uiIndex = 0; uiIndex < NUM_OF_LEDS; uiIndex++) {
 		if ((Adapter->LEDInfo.LEDState[uiIndex].LED_Type == DISABLE_GPIO_NUM) ||
-			(Adapter->LEDInfo.LEDState[uiIndex].LED_Type == 0x7f) ||
-			(Adapter->LEDInfo.LEDState[uiIndex].LED_Type == 0))
+		    (Adapter->LEDInfo.LEDState[uiIndex].LED_Type == 0x7f) ||
+		    (Adapter->LEDInfo.LEDState[uiIndex].LED_Type == 0))
 			uiNum_of_LED_Type++;
 	}
 	if (uiNum_of_LED_Type >= NUM_OF_LEDS)
@@ -582,18 +582,18 @@ static VOID LedGpioInit(PMINI_ADAPTER Adapter)
 
 	/* Set all LED GPIO Mode to output mode */
 	if (rdmalt(Adapter, GPIO_MODE_REGISTER, &uiResetValue,
-			sizeof(uiResetValue)) < 0)
+		   sizeof(uiResetValue)) < 0)
 		bcm_dbg(Adapter, OTHERS, LED_DUMP_INFO, ALL,
 			"LED Thread: RDM Failed\n");
 	for (uiIndex = 0; uiIndex < NUM_OF_LEDS; uiIndex++) {
 		if (Adapter->LEDInfo.LEDState[uiIndex].GPIO_Num !=
-				DISABLE_GPIO_NUM)
+		    DISABLE_GPIO_NUM)
 			uiResetValue |= (1 << Adapter->LEDInfo.LEDState[uiIndex].GPIO_Num);
 		TURN_OFF_LED(1 << Adapter->LEDInfo.LEDState[uiIndex].GPIO_Num,
-				uiIndex);
+			     uiIndex);
 	}
 	if (wrmalt(Adapter, GPIO_MODE_REGISTER, &uiResetValue,
-			sizeof(uiResetValue)) < 0)
+		   sizeof(uiResetValue)) < 0)
 		bcm_dbg(Adapter, OTHERS, LED_DUMP_INFO, ALL,
 			"LED Thread: WRM Failed\n");
 
@@ -601,8 +601,8 @@ static VOID LedGpioInit(PMINI_ADAPTER Adapter)
 }
 
 static INT BcmGetGPIOPinInfo(PMINI_ADAPTER Adapter, UCHAR *GPIO_num_tx,
-		UCHAR *GPIO_num_rx, UCHAR *uiLedTxIndex, UCHAR *uiLedRxIndex,
-		LedEventInfo_t currdriverstate)
+			     UCHAR *GPIO_num_rx, UCHAR *uiLedTxIndex, UCHAR *uiLedRxIndex,
+			     LedEventInfo_t currdriverstate)
 {
 	UINT uiIndex = 0;
 
@@ -612,12 +612,12 @@ static INT BcmGetGPIOPinInfo(PMINI_ADAPTER Adapter, UCHAR *GPIO_num_tx,
 	for (uiIndex = 0; uiIndex < NUM_OF_LEDS; uiIndex++) {
 
 		if ((currdriverstate == NORMAL_OPERATION) ||
-				(currdriverstate == IDLEMODE_EXIT) ||
-				(currdriverstate == FW_DOWNLOAD)) {
+		    (currdriverstate == IDLEMODE_EXIT) ||
+		    (currdriverstate == FW_DOWNLOAD)) {
 			if (Adapter->LEDInfo.LEDState[uiIndex].LED_Blink_State &
-					currdriverstate) {
+			    currdriverstate) {
 				if (Adapter->LEDInfo.LEDState[uiIndex].GPIO_Num
-						!= DISABLE_GPIO_NUM) {
+				    != DISABLE_GPIO_NUM) {
 					if (*GPIO_num_tx == DISABLE_GPIO_NUM) {
 						*GPIO_num_tx = Adapter->LEDInfo.LEDState[uiIndex].GPIO_Num;
 						*uiLedTxIndex = uiIndex;
@@ -629,9 +629,9 @@ static INT BcmGetGPIOPinInfo(PMINI_ADAPTER Adapter, UCHAR *GPIO_num_tx,
 			}
 		} else {
 			if (Adapter->LEDInfo.LEDState[uiIndex].LED_On_State
-					& currdriverstate) {
+			    & currdriverstate) {
 				if (Adapter->LEDInfo.LEDState[uiIndex].GPIO_Num
-						!= DISABLE_GPIO_NUM) {
+				    != DISABLE_GPIO_NUM) {
 					*GPIO_num_tx = Adapter->LEDInfo.LEDState[uiIndex].GPIO_Num;
 					*uiLedTxIndex = uiIndex;
 				}
@@ -669,22 +669,22 @@ static VOID LEDControlThread(PMINI_ADAPTER Adapter)
 	while (TRUE) {
 		/* Wait till event is triggered */
 		if ((GPIO_num == DISABLE_GPIO_NUM)
-						||
-				((currdriverstate != FW_DOWNLOAD) &&
-				 (currdriverstate != NORMAL_OPERATION) &&
-				 (currdriverstate != LOWPOWER_MODE_ENTER))
-						||
-				(currdriverstate == LED_THREAD_INACTIVE))
+		    ||
+		    ((currdriverstate != FW_DOWNLOAD) &&
+		     (currdriverstate != NORMAL_OPERATION) &&
+		     (currdriverstate != LOWPOWER_MODE_ENTER))
+		    ||
+		    (currdriverstate == LED_THREAD_INACTIVE))
 			Status = wait_event_interruptible(
-					Adapter->LEDInfo.notify_led_event,
-					currdriverstate != Adapter->DriverState
-						|| kthread_should_stop());
+				Adapter->LEDInfo.notify_led_event,
+				currdriverstate != Adapter->DriverState
+				|| kthread_should_stop());
 
 		if (kthread_should_stop() || Adapter->device_removed) {
 			bcm_dbg(Adapter, OTHERS, LED_DUMP_INFO, ALL,
 				"Led thread got signal to exit..hence exiting\n");
 			Adapter->LEDInfo.led_thread_running =
-						BCM_LED_THREAD_DISABLED;
+				BCM_LED_THREAD_DISABLED;
 			TURN_OFF_LED(1 << GPIO_num, uiLedIndex);
 			return; /* STATUS_FAILURE; */
 		}
@@ -700,9 +700,9 @@ static VOID LEDControlThread(PMINI_ADAPTER Adapter)
 		switch (Adapter->DriverState) {
 		case DRIVER_INIT:
 			currdriverstate = DRIVER_INIT;
-					/* Adapter->DriverState; */
+			/* Adapter->DriverState; */
 			BcmGetGPIOPinInfo(Adapter, &GPIO_num, &dummyGPIONum,
-				&uiLedIndex, &dummyIndex, currdriverstate);
+					  &uiLedIndex, &dummyIndex, currdriverstate);
 
 			if (GPIO_num != DISABLE_GPIO_NUM)
 				TURN_ON_LED(1 << GPIO_num, uiLedIndex);
@@ -715,18 +715,18 @@ static VOID LEDControlThread(PMINI_ADAPTER Adapter)
 			 */
 			currdriverstate = FW_DOWNLOAD;
 			BcmGetGPIOPinInfo(Adapter, &GPIO_num, &dummyGPIONum,
-				&uiLedIndex, &dummyIndex, currdriverstate);
+					  &uiLedIndex, &dummyIndex, currdriverstate);
 
 			if (GPIO_num != DISABLE_GPIO_NUM) {
 				timeout = 50;
 				LED_Blink(Adapter, 1 << GPIO_num, uiLedIndex,
-					timeout, -1, currdriverstate);
+					  timeout, -1, currdriverstate);
 			}
 			break;
 		case FW_DOWNLOAD_DONE:
 			currdriverstate = FW_DOWNLOAD_DONE;
 			BcmGetGPIOPinInfo(Adapter, &GPIO_num, &dummyGPIONum,
-				&uiLedIndex, &dummyIndex, currdriverstate);
+					  &uiLedIndex, &dummyIndex, currdriverstate);
 			if (GPIO_num != DISABLE_GPIO_NUM)
 				TURN_ON_LED(1 << GPIO_num, uiLedIndex);
 			break;
@@ -739,54 +739,54 @@ static VOID LEDControlThread(PMINI_ADAPTER Adapter)
 		case NO_NETWORK_ENTRY:
 			currdriverstate = NO_NETWORK_ENTRY;
 			BcmGetGPIOPinInfo(Adapter, &GPIO_num, &dummyGPIONum,
-				&uiLedIndex, &dummyGPIONum, currdriverstate);
+					  &uiLedIndex, &dummyGPIONum, currdriverstate);
 			if (GPIO_num != DISABLE_GPIO_NUM)
 				TURN_ON_LED(1 << GPIO_num, uiLedIndex);
 			break;
 		case NORMAL_OPERATION:
-			{
-				UCHAR GPIO_num_tx = DISABLE_GPIO_NUM;
-				UCHAR GPIO_num_rx = DISABLE_GPIO_NUM;
-				UCHAR uiLEDTx = 0;
-				UCHAR uiLEDRx = 0;
-				currdriverstate = NORMAL_OPERATION;
-				Adapter->LEDInfo.bIdle_led_off = FALSE;
-
-				BcmGetGPIOPinInfo(Adapter, &GPIO_num_tx,
-					&GPIO_num_rx, &uiLEDTx, &uiLEDRx,
-					currdriverstate);
-				if ((GPIO_num_tx == DISABLE_GPIO_NUM) &&
-						(GPIO_num_rx ==
-						 DISABLE_GPIO_NUM)) {
-					GPIO_num = DISABLE_GPIO_NUM;
-				} else {
-					/*
-					 * If single LED is selected, use same
-					 * for both Tx and Rx
-					 */
-					if (GPIO_num_tx == DISABLE_GPIO_NUM) {
-						GPIO_num_tx = GPIO_num_rx;
-						uiLEDTx = uiLEDRx;
-					} else if (GPIO_num_rx ==
-							DISABLE_GPIO_NUM) {
-						GPIO_num_rx = GPIO_num_tx;
-						uiLEDRx = uiLEDTx;
-					}
-					/*
-					 * Blink the LED in proportionate
-					 * to Tx and Rx transmissions.
-					 */
-					LED_Proportional_Blink(Adapter,
-						GPIO_num_tx, uiLEDTx,
-						GPIO_num_rx, uiLEDRx,
-						currdriverstate);
+		{
+			UCHAR GPIO_num_tx = DISABLE_GPIO_NUM;
+			UCHAR GPIO_num_rx = DISABLE_GPIO_NUM;
+			UCHAR uiLEDTx = 0;
+			UCHAR uiLEDRx = 0;
+			currdriverstate = NORMAL_OPERATION;
+			Adapter->LEDInfo.bIdle_led_off = FALSE;
+
+			BcmGetGPIOPinInfo(Adapter, &GPIO_num_tx,
+					  &GPIO_num_rx, &uiLEDTx, &uiLEDRx,
+					  currdriverstate);
+			if ((GPIO_num_tx == DISABLE_GPIO_NUM) &&
+			    (GPIO_num_rx ==
+			     DISABLE_GPIO_NUM)) {
+				GPIO_num = DISABLE_GPIO_NUM;
+			} else {
+				/*
+				 * If single LED is selected, use same
+				 * for both Tx and Rx
+				 */
+				if (GPIO_num_tx == DISABLE_GPIO_NUM) {
+					GPIO_num_tx = GPIO_num_rx;
+					uiLEDTx = uiLEDRx;
+				} else if (GPIO_num_rx ==
+					   DISABLE_GPIO_NUM) {
+					GPIO_num_rx = GPIO_num_tx;
+					uiLEDRx = uiLEDTx;
 				}
+				/*
+				 * Blink the LED in proportionate
+				 * to Tx and Rx transmissions.
+				 */
+				LED_Proportional_Blink(Adapter,
+						       GPIO_num_tx, uiLEDTx,
+						       GPIO_num_rx, uiLEDRx,
+						       currdriverstate);
 			}
-			break;
+		}
+		break;
 		case LOWPOWER_MODE_ENTER:
 			currdriverstate = LOWPOWER_MODE_ENTER;
 			if (DEVICE_POWERSAVE_MODE_AS_MANUAL_CLOCK_GATING ==
-					Adapter->ulPowerSaveMode) {
+			    Adapter->ulPowerSaveMode) {
 				/* Turn OFF all the LED */
 				uiResetValue = 0;
 				for (uiIndex = 0; uiIndex < NUM_OF_LEDS; uiIndex++) {
@@ -812,7 +812,7 @@ static VOID LEDControlThread(PMINI_ADAPTER Adapter)
 			GPIO_num = DISABLE_GPIO_NUM;
 			for (uiIndex = 0; uiIndex < NUM_OF_LEDS; uiIndex++) {
 				if (Adapter->LEDInfo.LEDState[uiIndex].GPIO_Num
-						!= DISABLE_GPIO_NUM)
+				    != DISABLE_GPIO_NUM)
 					TURN_OFF_LED((1 << Adapter->LEDInfo.LEDState[uiIndex].GPIO_Num), uiIndex);
 			}
 			/* Adapter->DriverState = DRIVER_INIT; */
@@ -822,12 +822,12 @@ static VOID LEDControlThread(PMINI_ADAPTER Adapter)
 				"InActivating LED thread...\n");
 			currdriverstate = LED_THREAD_INACTIVE;
 			Adapter->LEDInfo.led_thread_running =
-					BCM_LED_THREAD_RUNNING_INACTIVELY;
+				BCM_LED_THREAD_RUNNING_INACTIVELY;
 			Adapter->LEDInfo.bLedInitDone = FALSE;
 			/* disable ALL LED */
 			for (uiIndex = 0; uiIndex < NUM_OF_LEDS; uiIndex++) {
 				if (Adapter->LEDInfo.LEDState[uiIndex].GPIO_Num
-						!= DISABLE_GPIO_NUM)
+				    != DISABLE_GPIO_NUM)
 					TURN_OFF_LED((1 << Adapter->LEDInfo.LEDState[uiIndex].GPIO_Num), uiIndex);
 			}
 			break;
@@ -840,7 +840,7 @@ static VOID LEDControlThread(PMINI_ADAPTER Adapter)
 				Adapter->DriverState = NORMAL_OPERATION;
 
 			Adapter->LEDInfo.led_thread_running =
-					BCM_LED_THREAD_RUNNING_ACTIVELY;
+				BCM_LED_THREAD_RUNNING_ACTIVELY;
 			break;
 			/* return; */
 		default:
@@ -882,7 +882,7 @@ int InitLedSettings(PMINI_ADAPTER Adapter)
 			Adapter->DriverState = DRIVER_HALT;
 			wake_up(&Adapter->LEDInfo.notify_led_event);
 			Adapter->LEDInfo.led_thread_running =
-						BCM_LED_THREAD_DISABLED;
+				BCM_LED_THREAD_DISABLED;
 		}
 
 	} else if (bEnableThread) {
@@ -890,11 +890,11 @@ int InitLedSettings(PMINI_ADAPTER Adapter)
 		init_waitqueue_head(&Adapter->LEDInfo.notify_led_event);
 		init_waitqueue_head(&Adapter->LEDInfo.idleModeSyncEvent);
 		Adapter->LEDInfo.led_thread_running =
-					BCM_LED_THREAD_RUNNING_ACTIVELY;
+			BCM_LED_THREAD_RUNNING_ACTIVELY;
 		Adapter->LEDInfo.bIdle_led_off = FALSE;
 		Adapter->LEDInfo.led_cntrl_threadid =
 			kthread_run((int (*)(void *)) LEDControlThread,
-			Adapter, "led_control_thread");
+				    Adapter, "led_control_thread");
 		if (IS_ERR(Adapter->LEDInfo.led_cntrl_threadid)) {
 			bcm_dbg(Adapter, OTHERS, LED_DUMP_INFO, ALL,
 				"Not able to spawn Kernel Thread\n");
diff --git a/drivers/staging/bcm/led_control.h b/drivers/staging/bcm/led_control.h
index 0711ac2..63ca9fa 100644
--- a/drivers/staging/bcm/led_control.h
+++ b/drivers/staging/bcm/led_control.h
@@ -26,19 +26,19 @@
 
 #define MAX_FILE_NAME_BUFFER_SIZE 			100
 
-#define TURN_ON_LED(GPIO, index) do{ \
-							UINT gpio_val = GPIO; \
-							(Adapter->LEDInfo.LEDState[index].BitPolarity == 1) ? \
-							wrmaltWithLock(Adapter,BCM_GPIO_OUTPUT_SET_REG, &gpio_val ,sizeof(gpio_val)) : \
-							wrmaltWithLock(Adapter,BCM_GPIO_OUTPUT_CLR_REG, &gpio_val, sizeof(gpio_val)); \
-						}while(0);
-
-#define TURN_OFF_LED(GPIO, index)  do { \
-							UINT gpio_val = GPIO; \
-							(Adapter->LEDInfo.LEDState[index].BitPolarity == 1) ? \
-							wrmaltWithLock(Adapter,BCM_GPIO_OUTPUT_CLR_REG,&gpio_val ,sizeof(gpio_val)) : \
-							wrmaltWithLock(Adapter,BCM_GPIO_OUTPUT_SET_REG,&gpio_val ,sizeof(gpio_val));  \
-						}while(0);
+#define TURN_ON_LED(GPIO, index) do{					\
+		UINT gpio_val = GPIO;					\
+		(Adapter->LEDInfo.LEDState[index].BitPolarity == 1) ?	\
+			wrmaltWithLock(Adapter,BCM_GPIO_OUTPUT_SET_REG, &gpio_val ,sizeof(gpio_val)) : \
+			wrmaltWithLock(Adapter,BCM_GPIO_OUTPUT_CLR_REG, &gpio_val, sizeof(gpio_val)); \
+	}while(0);
+
+#define TURN_OFF_LED(GPIO, index)  do {					\
+		UINT gpio_val = GPIO;					\
+		(Adapter->LEDInfo.LEDState[index].BitPolarity == 1) ?	\
+			wrmaltWithLock(Adapter,BCM_GPIO_OUTPUT_CLR_REG,&gpio_val ,sizeof(gpio_val)) : \
+			wrmaltWithLock(Adapter,BCM_GPIO_OUTPUT_SET_REG,&gpio_val ,sizeof(gpio_val)); \
+	}while(0);
 
 #define B_ULONG32 unsigned long
 
@@ -78,7 +78,7 @@ typedef struct LedStateInfo_t
 	UCHAR LED_Blink_State; /* Bits set or reset for blinking LEDs for different states */
 	UCHAR GPIO_Num;
 	UCHAR 			BitPolarity;				/*To represent whether H/W is normal polarity or reverse
-											  polarity*/
+									  polarity*/
 }LEDStateInfo, *pLEDStateInfo;
 
 
@@ -86,12 +86,12 @@ typedef struct _LED_INFO_STRUCT
 {
 	LEDStateInfo	LEDState[NUM_OF_LEDS];
 	BOOLEAN 		bIdleMode_tx_from_host; /*Variable to notify whether driver came out
-											from idlemode due to Host or target*/
+							  from idlemode due to Host or target*/
 	BOOLEAN			bIdle_led_off;
 	wait_queue_head_t   notify_led_event;
 	wait_queue_head_t	idleModeSyncEvent;
  	struct task_struct  *led_cntrl_threadid;
-    int                 led_thread_running;
+	int                 led_thread_running;
 	BOOLEAN			bLedInitDone;
 
 } LED_INFO_STRUCT, *PLED_INFO_STRUCT;
diff --git a/drivers/staging/bcm/nvm.c b/drivers/staging/bcm/nvm.c
index 7e708e3..d32ae75 100644
--- a/drivers/staging/bcm/nvm.c
+++ b/drivers/staging/bcm/nvm.c
@@ -102,11 +102,11 @@ static UCHAR ReadEEPROMStatusRegister( PMINI_ADAPTER Adapter )
 		dwRetries-- ;
 		if ( dwRetries == 0 )
 		{
-			 rdmalt(Adapter, EEPROM_SPI_Q_STATUS1_REG, &value, sizeof(value));
-			 rdmalt(Adapter, EEPROM_SPI_Q_STATUS_REG, &value1, sizeof(value1));
-			 pr_info("0x3004 = %x 0x3008 = %x, retries = %d failed\n",
-				 value, value1,
-				 MAX_EEPROM_RETRIES * RETRIES_PER_DELAY);
+			rdmalt(Adapter, EEPROM_SPI_Q_STATUS1_REG, &value, sizeof(value));
+			rdmalt(Adapter, EEPROM_SPI_Q_STATUS_REG, &value1, sizeof(value1));
+			pr_info("0x3004 = %x 0x3008 = %x, retries = %d failed\n",
+				value, value1,
+				MAX_EEPROM_RETRIES * RETRIES_PER_DELAY);
 			return uiData;
 		}
 		if( !(dwRetries%RETRIES_PER_DELAY) )
@@ -131,10 +131,10 @@ static UCHAR ReadEEPROMStatusRegister( PMINI_ADAPTER Adapter )
 //-----------------------------------------------------------------------------
 
 INT ReadBeceemEEPROMBulk( PMINI_ADAPTER Adapter,
-									   DWORD dwAddress,
-									   DWORD *pdwData,
-									   DWORD dwNumWords
-									 )
+			  DWORD dwAddress,
+			  DWORD *pdwData,
+			  DWORD dwNumWords
+	)
 {
 	DWORD dwIndex = 0;
 	DWORD dwRetries = MAX_EEPROM_RETRIES*RETRIES_PER_DELAY;
@@ -157,7 +157,7 @@ INT ReadBeceemEEPROMBulk( PMINI_ADAPTER Adapter,
 	wrmalt( Adapter, EEPROM_CMDQ_SPI_REG, &value, sizeof(value));
 
 	while ( dwRetries != 0 )
-		{
+	{
 
 		uiStatus = 0;
 		rdmalt(Adapter, EEPROM_SPI_Q_STATUS1_REG, &uiStatus, sizeof(uiStatus));
@@ -188,7 +188,7 @@ INT ReadBeceemEEPROMBulk( PMINI_ADAPTER Adapter,
 				/* We just got Avail and we have to read 32bits so we
 				 * need this sleep for Cardbus kind of devices. */
 				if (Adapter->chip_id == 0xBECE0210 )
-	  					udelay(800);
+					udelay(800);
 
 				/* Clear the Avail/Full bits - which ever is set. */
 				value=( uiStatus & (EEPROM_READ_DATA_AVAIL | EEPROM_READ_DATA_FULL) );
@@ -260,9 +260,9 @@ INT ReadBeceemEEPROMBulk( PMINI_ADAPTER Adapter,
 //-----------------------------------------------------------------------------
 
 INT ReadBeceemEEPROM( PMINI_ADAPTER Adapter,
-								   DWORD uiOffset,
-								   DWORD *pBuffer
-								 )
+		      DWORD uiOffset,
+		      DWORD *pBuffer
+	)
 {
 	UINT uiData[8]	 	= {0};
 	UINT uiByteOffset	= 0;
@@ -295,9 +295,9 @@ INT ReadMacAddressFromNVM(PMINI_ADAPTER Adapter)
 	unsigned char puMacAddr[6];
 
 	Status = BeceemNVMRead(Adapter,
-			(PUINT)&puMacAddr[0],
-			INIT_PARAMS_1_MACADDRESS_ADDRESS,
-			MAC_ADDRESS_SIZE);
+			       (PUINT)&puMacAddr[0],
+			       INIT_PARAMS_1_MACADDRESS_ADDRESS,
+			       MAC_ADDRESS_SIZE);
 
 	if(Status == STATUS_SUCCESS)
 		memcpy(Adapter->dev->dev_addr, puMacAddr, MAC_ADDRESS_SIZE);
@@ -460,8 +460,8 @@ static INT BeceemFlashBulkRead(
 	//Adding flash Base address
 //	uiOffset = uiOffset + GetFlashBaseAddr(Adapter);
 #if defined(BCM_SHM_INTERFACE) && !defined(FLASH_DIRECT_ACCESS)
-  Status = bcmflash_raw_read((uiOffset/FLASH_PART_SIZE),(uiOffset % FLASH_PART_SIZE),( unsigned char *)pBuffer,uiNumBytes);
-  return Status;
+	Status = bcmflash_raw_read((uiOffset/FLASH_PART_SIZE),(uiOffset % FLASH_PART_SIZE),( unsigned char *)pBuffer,uiNumBytes);
+	return Status;
 #endif
 
 	Adapter->SelectedChip = RESET_CHIP_SELECT;
@@ -576,7 +576,7 @@ static UINT BcmGetEEPROMSize(PMINI_ADAPTER Adapter)
 // EEPROM may not be present or not programmed
 //
 
-        uiData = 0xBABEFACE;
+		uiData = 0xBABEFACE;
 		if(0 == BeceemEEPROMBulkWrite(Adapter,(PUCHAR)&uiData,0,4,TRUE))
 		{
 			uiData = 0;
@@ -612,8 +612,8 @@ static UINT BcmGetEEPROMSize(PMINI_ADAPTER Adapter)
 
 
 static INT FlashSectorErase(PMINI_ADAPTER Adapter,
-	UINT addr,
-	UINT numOfSectors)
+			    UINT addr,
+			    UINT numOfSectors)
 {
 	UINT iIndex = 0, iRetries = 0;
 	UINT uiStatus = 0;
@@ -736,7 +736,7 @@ static INT flashByteWrite(
 		}
 	  	iRetries--;
 		if( iRetries && ((iRetries % FLASH_PER_RETRIES_DELAY) == 0))
-			 msleep(1);
+			msleep(1);
 
 	}while((uiStatus & 0x1) && (iRetries  >0) );
 
@@ -826,7 +826,7 @@ static INT flashWrite(
 		//Hence  125 *2 * FLASH_PER_RETRIES_DELAY > 3 ms(worst case delay)
 		//Hence current implementation cycle will intoduce no delay in current path
 		if(iRetries && ((iRetries % FLASH_PER_RETRIES_DELAY) == 0))
-				msleep(1);
+			msleep(1);
 	}while((uiStatus & 0x1) && (iRetries > 0));
 
 	if(uiStatus & 0x1)
@@ -892,7 +892,7 @@ static INT flashByteWriteStatus(
 		return STATUS_FAILURE;
 	}
 
-    //msleep(1);
+	//msleep(1);
 
 	do
 	{
@@ -912,7 +912,7 @@ static INT flashByteWriteStatus(
 
 		iRetries--;
 		if( iRetries && ((iRetries % FLASH_PER_RETRIES_DELAY) == 0))
-				msleep(1);
+			msleep(1);
 	}while((uiStatus & 0x1) && (iRetries > 0));
 
 	if(uiStatus & 0x1)
@@ -970,7 +970,7 @@ static INT flashWriteStatus(
 		pr_info("Data write fails...\n");
 		return STATUS_FAILURE;
 	}
-   // __udelay(1);
+	// __udelay(1);
 
 	do
 	{
@@ -993,7 +993,7 @@ static INT flashWriteStatus(
 		//Hence  125 *2  * FLASH_PER_RETRIES_DELAY  >3 ms(worst case delay)
 		//Hence current implementation cycle will intoduce no delay in current path
 		if(iRetries && ((iRetries % FLASH_PER_RETRIES_DELAY) == 0))
-				msleep(1);
+			msleep(1);
 	}while((uiStatus & 0x1) && (iRetries >0));
 
 	if(uiStatus & 0x1)
@@ -1053,73 +1053,73 @@ static ULONG BcmFlashUnProtectBlock(PMINI_ADAPTER Adapter,UINT uiOffset, UINT ui
 //
 	if(FLASH_PART_SST25VF080B == Adapter->ulFlashID)
 	{
-	//
-	// Get Current BP status.
-	//
+		//
+		// Get Current BP status.
+		//
 		value = (FLASH_CMD_STATUS_REG_READ << 24);
 		wrmalt(Adapter, FLASH_SPI_CMDQ_REG, &value, sizeof(value));
 		udelay(10);
-	//
-	// Read status will be WWXXYYZZ. We have to take only WW.
-	//
+		//
+		// Read status will be WWXXYYZZ. We have to take only WW.
+		//
 		rdmalt(Adapter, FLASH_SPI_READQ_REG, (PUINT)&ulStatus, sizeof(ulStatus));
 		ulStatus >>= 24;
 		ulWriteStatus = ulStatus;
 
-	//
-	// Bits [5-2] give current block level protection status.
-	// Bit5: BP3 - DONT CARE
-	// BP2-BP0: 0 - NO PROTECTION, 1 - UPPER 1/16, 2 - UPPER 1/8, 3 - UPPER 1/4
-	//                4 - UPPER 1/2. 5 to 7 - ALL BLOCKS
-	//
+		//
+		// Bits [5-2] give current block level protection status.
+		// Bit5: BP3 - DONT CARE
+		// BP2-BP0: 0 - NO PROTECTION, 1 - UPPER 1/16, 2 - UPPER 1/8, 3 - UPPER 1/4
+		//                4 - UPPER 1/2. 5 to 7 - ALL BLOCKS
+		//
 
 		if(ulStatus)
 		{
 			if((uiOffset+uiLength) <= 0x80000)
 			{
-			//
-			// Offset comes in lower half of 1MB. Protect the upper half.
-			// Clear BP1 and BP0 and set BP2.
-			//
+				//
+				// Offset comes in lower half of 1MB. Protect the upper half.
+				// Clear BP1 and BP0 and set BP2.
+				//
 				ulWriteStatus |= (0x4<<2);
 				ulWriteStatus &= ~(0x3<<2);
 			}
 			else if((uiOffset+uiLength) <= 0xC0000)
 			{
-			//
-			// Offset comes below Upper 1/4. Upper 1/4 can be protected.
-			//  Clear BP2 and set BP1 and BP0.
-			//
+				//
+				// Offset comes below Upper 1/4. Upper 1/4 can be protected.
+				//  Clear BP2 and set BP1 and BP0.
+				//
 				ulWriteStatus |= (0x3<<2);
 				ulWriteStatus &= ~(0x1<<4);
 			}
 			else if((uiOffset+uiLength) <= 0xE0000)
-		    {
-		    //
-		    // Offset comes below Upper 1/8. Upper 1/8 can be protected.
-		    // Clear BP2 and BP0  and set BP1
-		    //
-		    	ulWriteStatus |= (0x1<<3);
-		    	ulWriteStatus &= ~(0x5<<2);
-
-		    }
-		    else if((uiOffset+uiLength) <= 0xF0000)
-		    {
-		    //
-		    // Offset comes below Upper 1/16. Only upper 1/16 can be protected.
-		    // Set BP0 and Clear BP2,BP1.
-		    //
-		    	ulWriteStatus |= (0x1<<2);
-		    	ulWriteStatus &= ~(0x3<<3);
-		    }
-		    else
-		    {
-		    //
-		    // Unblock all.
-		    // Clear BP2,BP1 and BP0.
-		    //
-		    	ulWriteStatus &= ~(0x7<<2);
-		    }
+			{
+				//
+				// Offset comes below Upper 1/8. Upper 1/8 can be protected.
+				// Clear BP2 and BP0  and set BP1
+				//
+				ulWriteStatus |= (0x1<<3);
+				ulWriteStatus &= ~(0x5<<2);
+
+			}
+			else if((uiOffset+uiLength) <= 0xF0000)
+			{
+				//
+				// Offset comes below Upper 1/16. Only upper 1/16 can be protected.
+				// Set BP0 and Clear BP2,BP1.
+				//
+				ulWriteStatus |= (0x1<<2);
+				ulWriteStatus &= ~(0x3<<3);
+			}
+			else
+			{
+				//
+				// Unblock all.
+				// Clear BP2,BP1 and BP0.
+				//
+				ulWriteStatus &= ~(0x7<<2);
+			}
 
 			value = (FLASH_CMD_WRITE_ENABLE<< 24);
 			wrmalt(Adapter, FLASH_SPI_CMDQ_REG, &value, sizeof(value));
@@ -1172,8 +1172,8 @@ static INT BeceemFlashBulkWrite(
 	UINT uiPartOffset 			= 0;
 
 #if defined(BCM_SHM_INTERFACE) && !defined(FLASH_DIRECT_ACCESS)
-  Status = bcmflash_raw_write((uiOffset/FLASH_PART_SIZE),(uiOffset % FLASH_PART_SIZE),( unsigned char *)pBuffer,uiNumBytes);
-  return Status;
+	Status = bcmflash_raw_write((uiOffset/FLASH_PART_SIZE),(uiOffset % FLASH_PART_SIZE),( unsigned char *)pBuffer,uiNumBytes);
+	return Status;
 #endif
 
 	uiOffsetFromSectStart 	= uiOffset & ~(Adapter->uiSectorSize - 1);
@@ -1213,16 +1213,16 @@ static INT BeceemFlashBulkWrite(
 		uiTemp = uiNumSectTobeRead ;
 		while(uiTemp)
 		{
-			 if(IsOffsetWritable(Adapter, uiOffsetFromSectStart + index * Adapter->uiSectorSize ) == FALSE)
-			 {
+			if(IsOffsetWritable(Adapter, uiOffsetFromSectStart + index * Adapter->uiSectorSize ) == FALSE)
+			{
 				pr_info("Sector Starting at offset <0X%X> is not writable\n",
 					uiOffsetFromSectStart +
 					index * Adapter->uiSectorSize);
 				Status = SECTOR_IS_NOT_WRITABLE;
 				goto BeceemFlashBulkWrite_EXIT;
-			 }
-			 uiTemp = uiTemp - 1;
-			 index = index + 1 ;
+			}
+			uiTemp = uiTemp - 1;
+			index = index + 1 ;
 		}
 	}
 	Adapter->SelectedChip = RESET_CHIP_SELECT;
@@ -1230,17 +1230,17 @@ static INT BeceemFlashBulkWrite(
 	{
 		//do_gettimeofday(&tv1);
 		/*
-		pr_info("\nTime In start of write :%ld ms\n",
-			(tv1.tv_sec *1000 + tv1.tv_usec /1000));
+		  pr_info("\nTime In start of write :%ld ms\n",
+		  (tv1.tv_sec *1000 + tv1.tv_usec /1000));
 		*/
 		uiPartOffset = (uiSectAlignAddr & (FLASH_PART_SIZE - 1)) + GetFlashBaseAddr(Adapter);
 
 		BcmDoChipSelect(Adapter,uiSectAlignAddr);
 
 		if(0 != BeceemFlashBulkRead(Adapter,
-						(PUINT)pTempBuff,
-						uiOffsetFromSectStart,
-						Adapter->uiSectorSize))
+					    (PUINT)pTempBuff,
+					    uiOffsetFromSectStart,
+					    Adapter->uiSectorSize))
 		{
 			Status = -1;
 			goto BeceemFlashBulkWrite_EXIT;
@@ -1248,9 +1248,9 @@ static INT BeceemFlashBulkWrite(
 
 		//do_gettimeofday(&tr);
 		/*
-		pr_info("Total time taken by Read :%ld ms\n",
-			(tr.tv_sec *1000 + tr.tv_usec/1000) -
-			(tv1.tv_sec *1000 + tv1.tv_usec/1000));
+		  pr_info("Total time taken by Read :%ld ms\n",
+		  (tr.tv_sec *1000 + tr.tv_usec/1000) -
+		  (tv1.tv_sec *1000 + tv1.tv_usec/1000));
 		*/
 
 		ulStatus = BcmFlashUnProtectBlock(Adapter,uiSectAlignAddr,Adapter->uiSectorSize);
@@ -1265,7 +1265,7 @@ static INT BeceemFlashBulkWrite(
 		}
 		else
 		{
-				memcpy(&pTempBuff[uiCurrSectOffsetAddr],pcBuffer,uiNumBytes);
+			memcpy(&pTempBuff[uiCurrSectOffsetAddr],pcBuffer,uiNumBytes);
 		}
 
 		if(IsFlash2x(Adapter))
@@ -1276,9 +1276,9 @@ static INT BeceemFlashBulkWrite(
 		FlashSectorErase(Adapter,uiPartOffset,1);
 		//do_gettimeofday(&te);
 		/*
-		pr_info("Total time taken by Erase :%ld ms\n",
-			(te.tv_sec *1000 + te.tv_usec/1000) -
-			(tr.tv_sec *1000 + tr.tv_usec/1000));
+		  pr_info("Total time taken by Erase :%ld ms\n",
+		  (te.tv_sec *1000 + te.tv_usec/1000) -
+		  (tr.tv_sec *1000 + tr.tv_usec/1000));
 		*/
 		for(uiIndex = 0; uiIndex < Adapter->uiSectorSize; uiIndex +=Adapter->ulFlashWriteSize)
 		{
@@ -1296,9 +1296,9 @@ static INT BeceemFlashBulkWrite(
 
 		//do_gettimeofday(&tw);
 		/*
-		pr_info("Total time taken in Write  to Flash :%ld ms\n",
-			(tw.tv_sec *1000 + tw.tv_usec/1000) -
-			(te.tv_sec *1000 + te.tv_usec/1000));
+		  pr_info("Total time taken in Write  to Flash :%ld ms\n",
+		  (tw.tv_sec *1000 + tw.tv_usec/1000) -
+		  (te.tv_sec *1000 + te.tv_usec/1000));
 		*/
 		for(uiIndex = 0;uiIndex < Adapter->uiSectorSize;uiIndex += MAX_RW_SIZE)
 		{
@@ -1334,9 +1334,9 @@ static INT BeceemFlashBulkWrite(
 		}
 		//do_gettimeofday(&twv);
 		/*
-		pr_info("Total time taken in Write  to Flash verification :%ld ms\n",
-			(twv.tv_sec *1000 + twv.tv_usec/1000) -
-			(tw.tv_sec *1000 + tw.tv_usec/1000));
+		  pr_info("Total time taken in Write  to Flash verification :%ld ms\n",
+		  (twv.tv_sec *1000 + twv.tv_usec/1000) -
+		  (tw.tv_sec *1000 + tw.tv_usec/1000));
 		*/
 
 		if(ulStatus)
@@ -1353,11 +1353,11 @@ static INT BeceemFlashBulkWrite(
 	}
 	//do_gettimeofday(&tv2);
 	/*
-	pr_info("Time after Write :%ld ms\n",
-		(tv2.tv_sec *1000 + tv2.tv_usec/1000));
-	pr_info("Total time taken by in Write is :%ld ms\n",
-		(tv2.tv_sec *1000 + tv2.tv_usec/1000) -
-		(tv1.tv_sec *1000 + tv1.tv_usec/1000));
+	  pr_info("Time after Write :%ld ms\n",
+	  (tv2.tv_sec *1000 + tv2.tv_usec/1000));
+	  pr_info("Total time taken by in Write is :%ld ms\n",
+	  (tv2.tv_sec *1000 + tv2.tv_usec/1000) -
+	  (tv1.tv_sec *1000 + tv1.tv_usec/1000));
 	*/
 //
 // Cleanup.
@@ -1450,16 +1450,16 @@ static INT BeceemFlashBulkWriteStatus(
 		uiTemp = uiNumSectTobeRead ;
 		while(uiTemp)
 		{
-			 if(IsOffsetWritable(Adapter,uiOffsetFromSectStart + index * Adapter->uiSectorSize ) == FALSE)
-			 {
+			if(IsOffsetWritable(Adapter,uiOffsetFromSectStart + index * Adapter->uiSectorSize ) == FALSE)
+			{
 				pr_info("Sector Starting at offset <0X%x> is not writable\n",
 					uiOffsetFromSectStart +
 					index * Adapter->uiSectorSize);
 				Status = SECTOR_IS_NOT_WRITABLE;
 				goto BeceemFlashBulkWriteStatus_EXIT;
-			 }
-			 uiTemp = uiTemp - 1;
-			 index = index + 1 ;
+			}
+			uiTemp = uiTemp - 1;
+			index = index + 1 ;
 		}
 	}
 
@@ -1470,9 +1470,9 @@ static INT BeceemFlashBulkWriteStatus(
 
 		BcmDoChipSelect(Adapter,uiSectAlignAddr);
 		if(0 != BeceemFlashBulkRead(Adapter,
-						(PUINT)pTempBuff,
-						uiOffsetFromSectStart,
-						Adapter->uiSectorSize))
+					    (PUINT)pTempBuff,
+					    uiOffsetFromSectStart,
+					    Adapter->uiSectorSize))
 		{
 			Status = -1;
 			goto BeceemFlashBulkWriteStatus_EXIT;
@@ -1893,7 +1893,7 @@ static INT BeceemEEPROMWritePage( PMINI_ADAPTER Adapter, UINT uiData[], UINT uiO
 		}
 
 		if( !(uiRetries%RETRIES_PER_DELAY) )
-					msleep(1);
+			msleep(1);
 
 		uiStatus = 0;
 		rdmalt(Adapter, EEPROM_SPI_Q_STATUS1_REG, &uiStatus, sizeof(uiStatus));
@@ -1945,7 +1945,7 @@ static INT BeceemEEPROMWritePage( PMINI_ADAPTER Adapter, UINT uiData[], UINT uiO
 		}
 		uiEpromStatus = 0;
 		if( !(uiRetries%RETRIES_PER_DELAY) )
-				msleep(1);
+			msleep(1);
 	}
 
 	return STATUS_SUCCESS ;
@@ -1997,7 +1997,7 @@ INT BeceemEEPROMBulkWrite(
 			memcpy((((PUCHAR)&uiData[0])+uiExtraBytes),pBuffer,MAX_RW_SIZE- uiExtraBytes);
 
 			if ( STATUS_FAILURE == BeceemEEPROMWritePage( Adapter, uiData, uiTempOffset ) )
-					return STATUS_FAILURE;
+				return STATUS_FAILURE;
 
 			uiBytesToCopy -= (MAX_RW_SIZE - uiExtraBytes);
 			uiIndex += (MAX_RW_SIZE - uiExtraBytes);
@@ -2008,7 +2008,7 @@ INT BeceemEEPROMBulkWrite(
 			memcpy((((PUCHAR)&uiData[0])+uiExtraBytes),pBuffer,uiBytesToCopy);
 
 			if ( STATUS_FAILURE == BeceemEEPROMWritePage( Adapter, uiData, uiTempOffset ) )
-					return STATUS_FAILURE;
+				return STATUS_FAILURE;
 
 			uiIndex += uiBytesToCopy;
 			uiOffset += uiBytesToCopy;
@@ -2029,7 +2029,7 @@ INT BeceemEEPROMBulkWrite(
 		{
 
 			if (STATUS_FAILURE == BeceemEEPROMWritePage( Adapter, (PUINT) &pBuffer[uiIndex], uiOffset ) )
-						return STATUS_FAILURE;
+				return STATUS_FAILURE;
 
 			uiIndex += MAX_RW_SIZE;
 			uiOffset += MAX_RW_SIZE;
@@ -2037,15 +2037,15 @@ INT BeceemEEPROMBulkWrite(
 		}
 		else
 		{
-	//
-	// To program non 16byte aligned data, read 16byte and then update.
-	//
+			//
+			// To program non 16byte aligned data, read 16byte and then update.
+			//
 			BeceemEEPROMBulkRead(Adapter,&uiData[0],uiOffset,16);
 			memcpy(&uiData[0],pBuffer+uiIndex,uiBytesToCopy);
 
 
 			if ( STATUS_FAILURE == BeceemEEPROMWritePage( Adapter, uiData, uiOffset ) )
-					return STATUS_FAILURE;
+				return STATUS_FAILURE;
 			uiBytesToCopy = 0;
 		}
 
@@ -2097,18 +2097,18 @@ INT BeceemNVMRead(
 		value = 0;
 		wrmalt(Adapter, 0x0f000C80,&value, sizeof(value));
 		Status = BeceemFlashBulkRead(Adapter,
-						pBuffer,
-						uiOffset,
-						uiNumBytes);
+					     pBuffer,
+					     uiOffset,
+					     uiNumBytes);
 		wrmalt(Adapter, 0x0f000C80, &uiTemp, sizeof(uiTemp));
 #endif
 	}
 	else if(Adapter->eNVMType == NVM_EEPROM)
 	{
 		Status = BeceemEEPROMBulkRead(Adapter,
-					pBuffer,
-					uiOffset,
-					uiNumBytes);
+					      pBuffer,
+					      uiOffset,
+					      uiNumBytes);
 	}
 	else
 	{
@@ -2167,19 +2167,19 @@ INT BeceemNVMWrite(
 			if(Adapter->bStatusWrite == TRUE)
 			{
 				Status = BeceemFlashBulkWriteStatus(Adapter,
-							pBuffer,
-							uiFlashOffset,
-							uiNumBytes ,
-							bVerify);
+								    pBuffer,
+								    uiFlashOffset,
+								    uiNumBytes ,
+								    bVerify);
 			}
 			else
 			{
 
 				Status = BeceemFlashBulkWrite(Adapter,
-							pBuffer,
-							uiFlashOffset,
-							uiNumBytes,
-							bVerify);
+							      pBuffer,
+							      uiFlashOffset,
+							      uiNumBytes,
+							      bVerify);
 			}
 #endif
 		}
@@ -2232,16 +2232,16 @@ INT BeceemNVMWrite(
 			}
 		}
 
-	// restore the values.
+		// restore the values.
 		wrmalt(Adapter,0x0f000C80,&uiTemp, sizeof(uiTemp));
 	}
 	else if(Adapter->eNVMType == NVM_EEPROM)
 	{
 		Status = BeceemEEPROMBulkWrite(Adapter,
-					(PUCHAR)pBuffer,
-					uiOffset,
-					uiNumBytes,
-					bVerify);
+					       (PUCHAR)pBuffer,
+					       uiOffset,
+					       uiNumBytes,
+					       bVerify);
 		if(bVerify)
 		{
 			Status = BeceemEEPROMReadBackandVerify(Adapter,(PUINT)pBuffer,uiOffset,uiNumBytes);
@@ -2314,15 +2314,15 @@ INT BcmUpdateSectorSize(PMINI_ADAPTER Adapter,UINT uiSectorSize)
 		sFlashCsInfo.FlashSectorSizeSig = htonl(FLASH_SECTOR_SIZE_SIG);
 
 		Status = BeceemFlashBulkWrite(Adapter,
-					(PUINT)&sFlashCsInfo,
-					Adapter->ulFlashControlSectionStart,
-					sizeof(sFlashCsInfo),
-					TRUE);
+					      (PUINT)&sFlashCsInfo,
+					      Adapter->ulFlashControlSectionStart,
+					      sizeof(sFlashCsInfo),
+					      TRUE);
 
 
 	}
 
-	Restore :
+Restore :
 	// restore the values.
 	wrmalt(Adapter, 0x0f000C80,&uiTemp, sizeof(uiTemp));
 
@@ -2350,8 +2350,8 @@ static UINT BcmGetFlashSectorSize(PMINI_ADAPTER Adapter, UINT FlashSectorSizeSig
 	UINT uiSectorSig = 0;
 
 	if(Adapter->bSectorSizeOverride &&
-		(Adapter->uiSectorSizeInCFG <= MAX_SECTOR_SIZE &&
-		Adapter->uiSectorSizeInCFG >= MIN_SECTOR_SIZE))
+	   (Adapter->uiSectorSizeInCFG <= MAX_SECTOR_SIZE &&
+	    Adapter->uiSectorSizeInCFG >= MIN_SECTOR_SIZE))
 	{
 		Adapter->uiSectorSize = Adapter->uiSectorSizeInCFG;
 	}
@@ -2363,20 +2363,20 @@ static UINT BcmGetFlashSectorSize(PMINI_ADAPTER Adapter, UINT FlashSectorSizeSig
 		if(uiSectorSig == FLASH_SECTOR_SIZE_SIG)
 		{
 			uiSectorSize = FlashSectorSize;
-	//
-	// If the sector size stored in the FLASH makes sense then use it.
-	//
+			//
+			// If the sector size stored in the FLASH makes sense then use it.
+			//
 			if(uiSectorSize <= MAX_SECTOR_SIZE && uiSectorSize >= MIN_SECTOR_SIZE)
 			{
 				Adapter->uiSectorSize = uiSectorSize;
 			}
-	//No valid size in FLASH, check if Config file has it.
+			//No valid size in FLASH, check if Config file has it.
 			else if(Adapter->uiSectorSizeInCFG <= MAX_SECTOR_SIZE &&
-					Adapter->uiSectorSizeInCFG >= MIN_SECTOR_SIZE)
+				Adapter->uiSectorSizeInCFG >= MIN_SECTOR_SIZE)
 			{
 				Adapter->uiSectorSize = Adapter->uiSectorSizeInCFG;
 			}
-	// Init to Default, if none of the above works.
+			// Init to Default, if none of the above works.
 			else
 			{
 				Adapter->uiSectorSize = DEFAULT_SECTOR_SIZE;
@@ -2386,7 +2386,7 @@ static UINT BcmGetFlashSectorSize(PMINI_ADAPTER Adapter, UINT FlashSectorSizeSig
 		else
 		{
 			if(Adapter->uiSectorSizeInCFG <= MAX_SECTOR_SIZE &&
-					Adapter->uiSectorSizeInCFG >= MIN_SECTOR_SIZE)
+			   Adapter->uiSectorSizeInCFG >= MIN_SECTOR_SIZE)
 			{
 				Adapter->uiSectorSize = Adapter->uiSectorSizeInCFG;
 			}
@@ -2477,12 +2477,12 @@ INT BcmInitNVM(PMINI_ADAPTER ps_adapter)
 }
 /***************************************************************************/
 /*BcmGetNvmSize : set the EEPROM or flash size in Adapter.
-*
-*Input Parameter:
-*		Adapter data structure
-*Return Value :
-*		0. means success;
-*/
+ *
+ *Input Parameter:
+ *		Adapter data structure
+ *Return Value :
+ *		0. means success;
+ */
 /***************************************************************************/
 
 static INT BcmGetNvmSize(PMINI_ADAPTER Adapter)
@@ -2519,7 +2519,7 @@ static VOID BcmValidateNvmType(PMINI_ADAPTER Adapter)
 	//
 
 	if(Adapter->eNVMType == NVM_FLASH &&
-		Adapter->chip_id < 0xBECE3300)
+	   Adapter->chip_id < 0xBECE3300)
 	{
 		Adapter->eNVMType = NVM_AUTODETECT;
 	}
@@ -2797,7 +2797,7 @@ static INT	ConvertEndianOf2XCSStructure(PFLASH2X_CS_INFO psFlash2xCSInfo)
 	psFlash2xCSInfo->OffsetFromZeroForVSA2End = ntohl(psFlash2xCSInfo->OffsetFromZeroForVSA2End);
 	for(Index =0; Index <(FLASH2X_TOTAL_SIZE/(DEFAULT_SECTOR_SIZE *16)); Index++)
 	{
-			psFlash2xCSInfo->SectorAccessBitMap[Index] = ntohl(psFlash2xCSInfo->SectorAccessBitMap[Index]);
+		psFlash2xCSInfo->SectorAccessBitMap[Index] = ntohl(psFlash2xCSInfo->SectorAccessBitMap[Index]);
 	}
 	return STATUS_SUCCESS;
 }
@@ -2838,8 +2838,8 @@ static INT	ConvertEndianOfCSStructure(PFLASH_CS_INFO psFlashCSInfo)
 static INT IsSectionExistInVendorInfo(PMINI_ADAPTER Adapter, FLASH2X_SECTION_VAL section)
 {
  	return ( Adapter->uiVendorExtnFlag &&
- 		(Adapter->psFlash2xVendorInfo->VendorSection[section].AccessFlags & FLASH2X_SECTION_PRESENT) &&
- 		(Adapter->psFlash2xVendorInfo->VendorSection[section].OffsetFromZeroForSectionStart != UNINIT_PTR_IN_CS) );
+		 (Adapter->psFlash2xVendorInfo->VendorSection[section].AccessFlags & FLASH2X_SECTION_PRESENT) &&
+		 (Adapter->psFlash2xVendorInfo->VendorSection[section].OffsetFromZeroForSectionStart != UNINIT_PTR_IN_CS) );
 }
 
 static VOID UpdateVendorInfo(PMINI_ADAPTER Adapter)
@@ -2866,13 +2866,13 @@ static VOID UpdateVendorInfo(PMINI_ADAPTER Adapter)
 
 		Adapter->uiVendorExtnFlag = TRUE;
 		uiSizeSection = (Adapter->psFlash2xVendorInfo->VendorSection[i].OffsetFromZeroForSectionEnd -
-						Adapter->psFlash2xVendorInfo->VendorSection[i].OffsetFromZeroForSectionStart);
+				 Adapter->psFlash2xVendorInfo->VendorSection[i].OffsetFromZeroForSectionStart);
 
 		switch(i)
 		{
 		case DSD0:
 			if(( uiSizeSection >= (Adapter->psFlash2xCSInfo->OffsetFromDSDStartForDSDHeader + sizeof(DSD_HEADER))) &&
-			(UNINIT_PTR_IN_CS != Adapter->psFlash2xVendorInfo->VendorSection[i].OffsetFromZeroForSectionStart))
+			   (UNINIT_PTR_IN_CS != Adapter->psFlash2xVendorInfo->VendorSection[i].OffsetFromZeroForSectionStart))
 				Adapter->psFlash2xCSInfo->OffsetFromZeroForDSDStart = Adapter->psFlash2xCSInfo->OffsetFromZeroForDSDEnd = VENDOR_PTR_IN_CS;
 			else
 				Adapter->psFlash2xCSInfo->OffsetFromZeroForDSDStart = Adapter->psFlash2xCSInfo->OffsetFromZeroForDSDEnd = UNINIT_PTR_IN_CS;
@@ -2880,7 +2880,7 @@ static VOID UpdateVendorInfo(PMINI_ADAPTER Adapter)
 
 		case DSD1:
 			if(( uiSizeSection >= (Adapter->psFlash2xCSInfo->OffsetFromDSDStartForDSDHeader + sizeof(DSD_HEADER))) &&
-			(UNINIT_PTR_IN_CS != Adapter->psFlash2xVendorInfo->VendorSection[i].OffsetFromZeroForSectionStart))
+			   (UNINIT_PTR_IN_CS != Adapter->psFlash2xVendorInfo->VendorSection[i].OffsetFromZeroForSectionStart))
 				Adapter->psFlash2xCSInfo->OffsetFromZeroForDSD1Start = Adapter->psFlash2xCSInfo->OffsetFromZeroForDSD1End = VENDOR_PTR_IN_CS;
 			else
 				Adapter->psFlash2xCSInfo->OffsetFromZeroForDSD1Start = Adapter->psFlash2xCSInfo->OffsetFromZeroForDSD1End = UNINIT_PTR_IN_CS;
@@ -2888,7 +2888,7 @@ static VOID UpdateVendorInfo(PMINI_ADAPTER Adapter)
 
 		case DSD2:
 			if(( uiSizeSection >= (Adapter->psFlash2xCSInfo->OffsetFromDSDStartForDSDHeader + sizeof(DSD_HEADER))) &&
-			(UNINIT_PTR_IN_CS != Adapter->psFlash2xVendorInfo->VendorSection[i].OffsetFromZeroForSectionStart))
+			   (UNINIT_PTR_IN_CS != Adapter->psFlash2xVendorInfo->VendorSection[i].OffsetFromZeroForSectionStart))
 				Adapter->psFlash2xCSInfo->OffsetFromZeroForDSD2Start = Adapter->psFlash2xCSInfo->OffsetFromZeroForDSD2End = VENDOR_PTR_IN_CS;
 			else
 				Adapter->psFlash2xCSInfo->OffsetFromZeroForDSD2Start = Adapter->psFlash2xCSInfo->OffsetFromZeroForDSD2End = UNINIT_PTR_IN_CS;
@@ -2982,8 +2982,8 @@ static INT BcmGetFlashCSInfo(PMINI_ADAPTER Adapter)
 		uiFlashLayoutMajorVersion = 0;
 	}
 
-bcm_dbg(Adapter, OTHERS, NVM_RW, ALL,
-	"FLASH LAYOUT MAJOR VERSION :%X\n", uiFlashLayoutMajorVersion);
+	bcm_dbg(Adapter, OTHERS, NVM_RW, ALL,
+		"FLASH LAYOUT MAJOR VERSION :%X\n", uiFlashLayoutMajorVersion);
 
 	if(uiFlashLayoutMajorVersion < FLASH_2X_MAJOR_NUMBER)
 	{
@@ -3013,7 +3013,7 @@ bcm_dbg(Adapter, OTHERS, NVM_RW, ALL,
 		}
 
 		BcmGetFlashSectorSize(Adapter, (Adapter->psFlashCSInfo->FlashSectorSizeSig),
-					 (Adapter->psFlashCSInfo->FlashSectorSize));
+				      (Adapter->psFlashCSInfo->FlashSectorSize));
 
 
 		Adapter->uiFlashBaseAdd = Adapter->psFlashCSInfo->FlashBaseAddr & 0xFCFFFFFF;
@@ -3023,7 +3023,7 @@ bcm_dbg(Adapter, OTHERS, NVM_RW, ALL,
 	else
 	{
 		if(BcmFlash2xBulkRead(Adapter,(PUINT)Adapter->psFlash2xCSInfo,NO_SECTION_VAL,
-				Adapter->ulFlashControlSectionStart,sizeof(FLASH2X_CS_INFO)))
+				      Adapter->ulFlashControlSectionStart,sizeof(FLASH2X_CS_INFO)))
 		{
 			pr_info("Unable to read CS structure\n");
 			return STATUS_FAILURE;
@@ -3047,7 +3047,7 @@ bcm_dbg(Adapter, OTHERS, NVM_RW, ALL,
 		}
 
 		BcmGetFlashSectorSize(Adapter, Adapter->psFlash2xCSInfo->FlashSectorSizeSig,
-					Adapter->psFlash2xCSInfo->FlashSectorSize);
+				      Adapter->psFlash2xCSInfo->FlashSectorSize);
 
 		UpdateVendorInfo(Adapter);
 
@@ -3058,8 +3058,8 @@ bcm_dbg(Adapter, OTHERS, NVM_RW, ALL,
 
 	}
 	/*
-	Concerns: what if CS sector size does not match with this sector size ???
-	what is the indication of AccessBitMap  in CS in flash 2.x ????
+	  Concerns: what if CS sector size does not match with this sector size ???
+	  what is the indication of AccessBitMap  in CS in flash 2.x ????
 	*/
 	Adapter->ulFlashID = BcmReadFlashRDID(Adapter);
 
@@ -3118,22 +3118,22 @@ static NVM_TYPE BcmGetNvmType(PMINI_ADAPTER Adapter)
 }
 
 /**
-*	BcmGetSectionValStartOffset - this will calculate the section's starting offset if section val is given
-*	@Adapter : Drivers Private Data structure
-*	@eFlashSectionVal : Flash secion value defined in enum FLASH2X_SECTION_VAL
-*
-*	Return value:-
-*	On success it return the start offset of the provided section val
-*	On Failure -returns STATUS_FAILURE
-**/
+ *	BcmGetSectionValStartOffset - this will calculate the section's starting offset if section val is given
+ *	@Adapter : Drivers Private Data structure
+ *	@eFlashSectionVal : Flash secion value defined in enum FLASH2X_SECTION_VAL
+ *
+ *	Return value:-
+ *	On success it return the start offset of the provided section val
+ *	On Failure -returns STATUS_FAILURE
+ **/
 
 INT BcmGetSectionValStartOffset(PMINI_ADAPTER Adapter, FLASH2X_SECTION_VAL eFlashSectionVal)
 {
 	/*
-	*	Considering all the section for which end offset can be calculated or directly given
-	*	in CS Structure. if matching case does not exist, return STATUS_FAILURE indicating section
-	*	endoffset can't be calculated or given in CS Structure.
-	*/
+	 *	Considering all the section for which end offset can be calculated or directly given
+	 *	in CS Structure. if matching case does not exist, return STATUS_FAILURE indicating section
+	 *	endoffset can't be calculated or given in CS Structure.
+	 */
 
 	INT SectStartOffset = 0 ;
 
@@ -3146,80 +3146,80 @@ INT BcmGetSectionValStartOffset(PMINI_ADAPTER Adapter, FLASH2X_SECTION_VAL eFlas
 
 	switch(eFlashSectionVal)
 	{
-		case ISO_IMAGE1 :
-			  if((Adapter->psFlash2xCSInfo->OffsetISOImage1Part1Start != UNINIT_PTR_IN_CS) &&
-			  	(IsNonCDLessDevice(Adapter) == FALSE))
-				  SectStartOffset = (Adapter->psFlash2xCSInfo->OffsetISOImage1Part1Start);
-			   break;
-		case ISO_IMAGE2 :
-				if((Adapter->psFlash2xCSInfo->OffsetISOImage2Part1Start != UNINIT_PTR_IN_CS) &&
-					(IsNonCDLessDevice(Adapter) == FALSE))
-			  		SectStartOffset = (Adapter->psFlash2xCSInfo->OffsetISOImage2Part1Start);
-			  break;
-		case DSD0 :
-				if(Adapter->psFlash2xCSInfo->OffsetFromZeroForDSDStart != UNINIT_PTR_IN_CS)
-					SectStartOffset = (Adapter->psFlash2xCSInfo->OffsetFromZeroForDSDStart);
-				break;
-		case DSD1 :
-				if(Adapter->psFlash2xCSInfo->OffsetFromZeroForDSD1Start != UNINIT_PTR_IN_CS)
-					SectStartOffset =  (Adapter->psFlash2xCSInfo->OffsetFromZeroForDSD1Start);
-				break;
-		case DSD2 :
-				if(Adapter->psFlash2xCSInfo->OffsetFromZeroForDSD2Start != UNINIT_PTR_IN_CS)
-					SectStartOffset =  (Adapter->psFlash2xCSInfo->OffsetFromZeroForDSD2Start);
-				break;
-		case VSA0 :
-				if(Adapter->psFlash2xCSInfo->OffsetFromZeroForVSAStart != UNINIT_PTR_IN_CS)
-					SectStartOffset =  (Adapter->psFlash2xCSInfo->OffsetFromZeroForVSAStart);
-				break;
-		case VSA1 :
-				if(Adapter->psFlash2xCSInfo->OffsetFromZeroForVSA1Start != UNINIT_PTR_IN_CS)
-					SectStartOffset =  (Adapter->psFlash2xCSInfo->OffsetFromZeroForVSA1Start);
-				break;
-		case VSA2 :
-				if(Adapter->psFlash2xCSInfo->OffsetFromZeroForVSA2Start != UNINIT_PTR_IN_CS)
-					SectStartOffset =  (Adapter->psFlash2xCSInfo->OffsetFromZeroForVSA2Start);
-				break;
-		case SCSI :
-				if(Adapter->psFlash2xCSInfo->OffsetFromZeroForScsiFirmware != UNINIT_PTR_IN_CS)
-					SectStartOffset =  (Adapter->psFlash2xCSInfo->OffsetFromZeroForScsiFirmware);
-				break;
-		case CONTROL_SECTION :
-				if(Adapter->psFlash2xCSInfo->OffsetFromZeroForControlSectionStart != UNINIT_PTR_IN_CS)
-					SectStartOffset =  (Adapter->psFlash2xCSInfo->OffsetFromZeroForControlSectionStart);
-				break;
-		case ISO_IMAGE1_PART2 :
-				if(Adapter->psFlash2xCSInfo->OffsetISOImage1Part2Start != UNINIT_PTR_IN_CS)
-				 	 SectStartOffset =  (Adapter->psFlash2xCSInfo->OffsetISOImage1Part2Start);
-				 break;
-		case ISO_IMAGE1_PART3 :
-				if(Adapter->psFlash2xCSInfo->OffsetISOImage1Part3Start != UNINIT_PTR_IN_CS)
-				  SectStartOffset =  (Adapter->psFlash2xCSInfo->OffsetISOImage1Part3Start);
-			  	break;
-		case ISO_IMAGE2_PART2 :
-				if(Adapter->psFlash2xCSInfo->OffsetISOImage2Part2Start != UNINIT_PTR_IN_CS)
-			 		 SectStartOffset =  (Adapter->psFlash2xCSInfo->OffsetISOImage2Part2Start);
-			    break;
-		case ISO_IMAGE2_PART3 :
-  			  if(Adapter->psFlash2xCSInfo->OffsetISOImage2Part3Start != UNINIT_PTR_IN_CS)
-  				  SectStartOffset =  (Adapter->psFlash2xCSInfo->OffsetISOImage2Part3Start);
-  			  break;
-		default :
-			pr_info("Section Does not exist in Flash 2.x\n");
-			SectStartOffset =  INVALID_OFFSET;
+	case ISO_IMAGE1 :
+		if((Adapter->psFlash2xCSInfo->OffsetISOImage1Part1Start != UNINIT_PTR_IN_CS) &&
+		   (IsNonCDLessDevice(Adapter) == FALSE))
+			SectStartOffset = (Adapter->psFlash2xCSInfo->OffsetISOImage1Part1Start);
+		break;
+	case ISO_IMAGE2 :
+		if((Adapter->psFlash2xCSInfo->OffsetISOImage2Part1Start != UNINIT_PTR_IN_CS) &&
+		   (IsNonCDLessDevice(Adapter) == FALSE))
+			SectStartOffset = (Adapter->psFlash2xCSInfo->OffsetISOImage2Part1Start);
+		break;
+	case DSD0 :
+		if(Adapter->psFlash2xCSInfo->OffsetFromZeroForDSDStart != UNINIT_PTR_IN_CS)
+			SectStartOffset = (Adapter->psFlash2xCSInfo->OffsetFromZeroForDSDStart);
+		break;
+	case DSD1 :
+		if(Adapter->psFlash2xCSInfo->OffsetFromZeroForDSD1Start != UNINIT_PTR_IN_CS)
+			SectStartOffset =  (Adapter->psFlash2xCSInfo->OffsetFromZeroForDSD1Start);
+		break;
+	case DSD2 :
+		if(Adapter->psFlash2xCSInfo->OffsetFromZeroForDSD2Start != UNINIT_PTR_IN_CS)
+			SectStartOffset =  (Adapter->psFlash2xCSInfo->OffsetFromZeroForDSD2Start);
+		break;
+	case VSA0 :
+		if(Adapter->psFlash2xCSInfo->OffsetFromZeroForVSAStart != UNINIT_PTR_IN_CS)
+			SectStartOffset =  (Adapter->psFlash2xCSInfo->OffsetFromZeroForVSAStart);
+		break;
+	case VSA1 :
+		if(Adapter->psFlash2xCSInfo->OffsetFromZeroForVSA1Start != UNINIT_PTR_IN_CS)
+			SectStartOffset =  (Adapter->psFlash2xCSInfo->OffsetFromZeroForVSA1Start);
+		break;
+	case VSA2 :
+		if(Adapter->psFlash2xCSInfo->OffsetFromZeroForVSA2Start != UNINIT_PTR_IN_CS)
+			SectStartOffset =  (Adapter->psFlash2xCSInfo->OffsetFromZeroForVSA2Start);
+		break;
+	case SCSI :
+		if(Adapter->psFlash2xCSInfo->OffsetFromZeroForScsiFirmware != UNINIT_PTR_IN_CS)
+			SectStartOffset =  (Adapter->psFlash2xCSInfo->OffsetFromZeroForScsiFirmware);
+		break;
+	case CONTROL_SECTION :
+		if(Adapter->psFlash2xCSInfo->OffsetFromZeroForControlSectionStart != UNINIT_PTR_IN_CS)
+			SectStartOffset =  (Adapter->psFlash2xCSInfo->OffsetFromZeroForControlSectionStart);
+		break;
+	case ISO_IMAGE1_PART2 :
+		if(Adapter->psFlash2xCSInfo->OffsetISOImage1Part2Start != UNINIT_PTR_IN_CS)
+			SectStartOffset =  (Adapter->psFlash2xCSInfo->OffsetISOImage1Part2Start);
+		break;
+	case ISO_IMAGE1_PART3 :
+		if(Adapter->psFlash2xCSInfo->OffsetISOImage1Part3Start != UNINIT_PTR_IN_CS)
+			SectStartOffset =  (Adapter->psFlash2xCSInfo->OffsetISOImage1Part3Start);
+		break;
+	case ISO_IMAGE2_PART2 :
+		if(Adapter->psFlash2xCSInfo->OffsetISOImage2Part2Start != UNINIT_PTR_IN_CS)
+			SectStartOffset =  (Adapter->psFlash2xCSInfo->OffsetISOImage2Part2Start);
+		break;
+	case ISO_IMAGE2_PART3 :
+		if(Adapter->psFlash2xCSInfo->OffsetISOImage2Part3Start != UNINIT_PTR_IN_CS)
+			SectStartOffset =  (Adapter->psFlash2xCSInfo->OffsetISOImage2Part3Start);
+		break;
+	default :
+		pr_info("Section Does not exist in Flash 2.x\n");
+		SectStartOffset =  INVALID_OFFSET;
 	}
 	return SectStartOffset;
 }
 
 /**
-*	BcmGetSectionValEndOffset - this will calculate the section's Ending offset if section val is given
-*	@Adapter : Drivers Private Data structure
-*	@eFlashSectionVal : Flash secion value defined in enum FLASH2X_SECTION_VAL
-*
-*	Return value:-
-*	On success it return the end offset of the provided section val
-*	On Failure -returns STATUS_FAILURE
-**/
+ *	BcmGetSectionValEndOffset - this will calculate the section's Ending offset if section val is given
+ *	@Adapter : Drivers Private Data structure
+ *	@eFlashSectionVal : Flash secion value defined in enum FLASH2X_SECTION_VAL
+ *
+ *	Return value:-
+ *	On success it return the end offset of the provided section val
+ *	On Failure -returns STATUS_FAILURE
+ **/
 
 INT BcmGetSectionValEndOffset(PMINI_ADAPTER Adapter, FLASH2X_SECTION_VAL eFlash2xSectionVal)
 {
@@ -3233,82 +3233,82 @@ INT BcmGetSectionValEndOffset(PMINI_ADAPTER Adapter, FLASH2X_SECTION_VAL eFlash2
 
 	switch(eFlash2xSectionVal)
 	{
-		case ISO_IMAGE1 :
-			 if((Adapter->psFlash2xCSInfo->OffsetISOImage1Part1End!= UNINIT_PTR_IN_CS) &&
-			 	 (IsNonCDLessDevice(Adapter) == FALSE))
-				  SectEndOffset = (Adapter->psFlash2xCSInfo->OffsetISOImage1Part1End);
-			   break;
-		case ISO_IMAGE2 :
-			if((Adapter->psFlash2xCSInfo->OffsetISOImage2Part1End!= UNINIT_PTR_IN_CS) &&
-				(IsNonCDLessDevice(Adapter) == FALSE))
-					SectEndOffset = (Adapter->psFlash2xCSInfo->OffsetISOImage2Part1End);
-			 break;
-		case DSD0 :
-			if(Adapter->psFlash2xCSInfo->OffsetFromZeroForDSDEnd != UNINIT_PTR_IN_CS)
-				SectEndOffset = (Adapter->psFlash2xCSInfo->OffsetFromZeroForDSDEnd);
-			break;
-		case DSD1 :
-			if(Adapter->psFlash2xCSInfo->OffsetFromZeroForDSD1End != UNINIT_PTR_IN_CS)
-				SectEndOffset = (Adapter->psFlash2xCSInfo->OffsetFromZeroForDSD1End);
-			break;
-		case DSD2 :
-			if(Adapter->psFlash2xCSInfo->OffsetFromZeroForDSD2End != UNINIT_PTR_IN_CS)
-				SectEndOffset = (Adapter->psFlash2xCSInfo->OffsetFromZeroForDSD2End);
-			break;
-		case VSA0 :
-			if(Adapter->psFlash2xCSInfo->OffsetFromZeroForVSAEnd != UNINIT_PTR_IN_CS)
-				SectEndOffset = (Adapter->psFlash2xCSInfo->OffsetFromZeroForVSAEnd);
-			break;
-		case VSA1 :
-			if(Adapter->psFlash2xCSInfo->OffsetFromZeroForVSA1End != UNINIT_PTR_IN_CS)
-				SectEndOffset = (Adapter->psFlash2xCSInfo->OffsetFromZeroForVSA1End);
-			break;
-		case VSA2 :
-			if(Adapter->psFlash2xCSInfo->OffsetFromZeroForVSA2End != UNINIT_PTR_IN_CS)
-				SectEndOffset = (Adapter->psFlash2xCSInfo->OffsetFromZeroForVSA2End);
-			break;
-		case SCSI :
-			if(Adapter->psFlash2xCSInfo->OffsetFromZeroForScsiFirmware != UNINIT_PTR_IN_CS)
-				SectEndOffset = ((Adapter->psFlash2xCSInfo->OffsetFromZeroForScsiFirmware) +
-					(Adapter->psFlash2xCSInfo->SizeOfScsiFirmware));
-			break;
-		case CONTROL_SECTION :
-				//Not Clear So Putting failure. confirm and fix it.
-				SectEndOffset = STATUS_FAILURE;
-		case ISO_IMAGE1_PART2 :
-				if(Adapter->psFlash2xCSInfo->OffsetISOImage1Part2End!= UNINIT_PTR_IN_CS)
-				 	 SectEndOffset =  (Adapter->psFlash2xCSInfo->OffsetISOImage1Part2End);
-				 break;
-		case ISO_IMAGE1_PART3 :
-				if(Adapter->psFlash2xCSInfo->OffsetISOImage1Part3End!= UNINIT_PTR_IN_CS)
-				  SectEndOffset =  (Adapter->psFlash2xCSInfo->OffsetISOImage1Part3End);
-			  	break;
-		case ISO_IMAGE2_PART2 :
-				if(Adapter->psFlash2xCSInfo->OffsetISOImage2Part2End != UNINIT_PTR_IN_CS)
-			 		 SectEndOffset =  (Adapter->psFlash2xCSInfo->OffsetISOImage2Part2End);
-			    break;
-		case ISO_IMAGE2_PART3 :
-  			  if(Adapter->psFlash2xCSInfo->OffsetISOImage2Part3End!= UNINIT_PTR_IN_CS)
-  				  SectEndOffset =  (Adapter->psFlash2xCSInfo->OffsetISOImage2Part3End);
-  			  break;
-
-		default :
-			SectEndOffset = INVALID_OFFSET;
+	case ISO_IMAGE1 :
+		if((Adapter->psFlash2xCSInfo->OffsetISOImage1Part1End!= UNINIT_PTR_IN_CS) &&
+		   (IsNonCDLessDevice(Adapter) == FALSE))
+			SectEndOffset = (Adapter->psFlash2xCSInfo->OffsetISOImage1Part1End);
+		break;
+	case ISO_IMAGE2 :
+		if((Adapter->psFlash2xCSInfo->OffsetISOImage2Part1End!= UNINIT_PTR_IN_CS) &&
+		   (IsNonCDLessDevice(Adapter) == FALSE))
+			SectEndOffset = (Adapter->psFlash2xCSInfo->OffsetISOImage2Part1End);
+		break;
+	case DSD0 :
+		if(Adapter->psFlash2xCSInfo->OffsetFromZeroForDSDEnd != UNINIT_PTR_IN_CS)
+			SectEndOffset = (Adapter->psFlash2xCSInfo->OffsetFromZeroForDSDEnd);
+		break;
+	case DSD1 :
+		if(Adapter->psFlash2xCSInfo->OffsetFromZeroForDSD1End != UNINIT_PTR_IN_CS)
+			SectEndOffset = (Adapter->psFlash2xCSInfo->OffsetFromZeroForDSD1End);
+		break;
+	case DSD2 :
+		if(Adapter->psFlash2xCSInfo->OffsetFromZeroForDSD2End != UNINIT_PTR_IN_CS)
+			SectEndOffset = (Adapter->psFlash2xCSInfo->OffsetFromZeroForDSD2End);
+		break;
+	case VSA0 :
+		if(Adapter->psFlash2xCSInfo->OffsetFromZeroForVSAEnd != UNINIT_PTR_IN_CS)
+			SectEndOffset = (Adapter->psFlash2xCSInfo->OffsetFromZeroForVSAEnd);
+		break;
+	case VSA1 :
+		if(Adapter->psFlash2xCSInfo->OffsetFromZeroForVSA1End != UNINIT_PTR_IN_CS)
+			SectEndOffset = (Adapter->psFlash2xCSInfo->OffsetFromZeroForVSA1End);
+		break;
+	case VSA2 :
+		if(Adapter->psFlash2xCSInfo->OffsetFromZeroForVSA2End != UNINIT_PTR_IN_CS)
+			SectEndOffset = (Adapter->psFlash2xCSInfo->OffsetFromZeroForVSA2End);
+		break;
+	case SCSI :
+		if(Adapter->psFlash2xCSInfo->OffsetFromZeroForScsiFirmware != UNINIT_PTR_IN_CS)
+			SectEndOffset = ((Adapter->psFlash2xCSInfo->OffsetFromZeroForScsiFirmware) +
+					 (Adapter->psFlash2xCSInfo->SizeOfScsiFirmware));
+		break;
+	case CONTROL_SECTION :
+		//Not Clear So Putting failure. confirm and fix it.
+		SectEndOffset = STATUS_FAILURE;
+	case ISO_IMAGE1_PART2 :
+		if(Adapter->psFlash2xCSInfo->OffsetISOImage1Part2End!= UNINIT_PTR_IN_CS)
+			SectEndOffset =  (Adapter->psFlash2xCSInfo->OffsetISOImage1Part2End);
+		break;
+	case ISO_IMAGE1_PART3 :
+		if(Adapter->psFlash2xCSInfo->OffsetISOImage1Part3End!= UNINIT_PTR_IN_CS)
+			SectEndOffset =  (Adapter->psFlash2xCSInfo->OffsetISOImage1Part3End);
+		break;
+	case ISO_IMAGE2_PART2 :
+		if(Adapter->psFlash2xCSInfo->OffsetISOImage2Part2End != UNINIT_PTR_IN_CS)
+			SectEndOffset =  (Adapter->psFlash2xCSInfo->OffsetISOImage2Part2End);
+		break;
+	case ISO_IMAGE2_PART3 :
+		if(Adapter->psFlash2xCSInfo->OffsetISOImage2Part3End!= UNINIT_PTR_IN_CS)
+			SectEndOffset =  (Adapter->psFlash2xCSInfo->OffsetISOImage2Part3End);
+		break;
+
+	default :
+		SectEndOffset = INVALID_OFFSET;
 	}
 	return SectEndOffset ;
 }
 
 /*
-*	BcmFlash2xBulkRead:- Read API for Flash Map 2.x .
-*	@Adapter :Driver Private Data Structure
-*	@pBuffer : Buffer where data has to be put after reading
-*	@eFlashSectionVal :Flash Section Val defined in FLASH2X_SECTION_VAL
-*	@uiOffsetWithinSectionVal :- Offset with in provided section
-*	@uiNumBytes : Number of Bytes for Read
-*
-*	Return value:-
-*		return true on success and STATUS_FAILURE on fail.
-*/
+ *	BcmFlash2xBulkRead:- Read API for Flash Map 2.x .
+ *	@Adapter :Driver Private Data Structure
+ *	@pBuffer : Buffer where data has to be put after reading
+ *	@eFlashSectionVal :Flash Section Val defined in FLASH2X_SECTION_VAL
+ *	@uiOffsetWithinSectionVal :- Offset with in provided section
+ *	@uiNumBytes : Number of Bytes for Read
+ *
+ *	Return value:-
+ *		return true on success and STATUS_FAILURE on fail.
+ */
 
 INT BcmFlash2xBulkRead(
 	PMINI_ADAPTER Adapter,
@@ -3368,17 +3368,17 @@ INT BcmFlash2xBulkRead(
 }
 
 /*
-*	BcmFlash2xBulkWrite :-API for Writing on the Flash Map 2.x.
-*	@Adapter :Driver Private Data Structure
-*	@pBuffer : Buffer From where data has to taken for writing
-*	@eFlashSectionVal :Flash Section Val defined in FLASH2X_SECTION_VAL
-*	@uiOffsetWithinSectionVal :- Offset with in provided section
-*	@uiNumBytes : Number of Bytes for Write
-*
-*	Return value:-
-*		return true on success and STATUS_FAILURE on fail.
-*
-*/
+ *	BcmFlash2xBulkWrite :-API for Writing on the Flash Map 2.x.
+ *	@Adapter :Driver Private Data Structure
+ *	@pBuffer : Buffer From where data has to taken for writing
+ *	@eFlashSectionVal :Flash Section Val defined in FLASH2X_SECTION_VAL
+ *	@uiOffsetWithinSectionVal :- Offset with in provided section
+ *	@uiNumBytes : Number of Bytes for Write
+ *
+ *	Return value:-
+ *		return true on success and STATUS_FAILURE on fail.
+ *
+ */
 
 INT BcmFlash2xBulkWrite(
 	PMINI_ADAPTER Adapter,
@@ -3440,13 +3440,13 @@ INT BcmFlash2xBulkWrite(
 }
 
 /**
-*	BcmGetActiveDSD : Set the Active DSD in Adapter Structure which has to be dumped in DDR
-*	@Adapter :-Drivers private Data Structure
-*
-*	Return Value:-
-*		Return STATUS_SUCESS if get success in setting the right DSD else negaive error code
-*
-**/
+ *	BcmGetActiveDSD : Set the Active DSD in Adapter Structure which has to be dumped in DDR
+ *	@Adapter :-Drivers private Data Structure
+ *
+ *	Return Value:-
+ *		Return STATUS_SUCESS if get success in setting the right DSD else negaive error code
+ *
+ **/
 static INT BcmGetActiveDSD(PMINI_ADAPTER Adapter)
 {
 	FLASH2X_SECTION_VAL uiHighestPriDSD = 0 ;
@@ -3488,14 +3488,14 @@ static INT BcmGetActiveDSD(PMINI_ADAPTER Adapter)
 
 
 /**
-*	BcmGetActiveISO :- Set the Active ISO in Adapter Data Structue
-*	@Adapter : Driver private Data Structure
-*
-*	Return Value:-
-*		Sucsess:- STATUS_SUCESS
-*		Failure- : negative erro code
-*
-**/
+ *	BcmGetActiveISO :- Set the Active ISO in Adapter Data Structue
+ *	@Adapter : Driver private Data Structure
+ *
+ *	Return Value:-
+ *		Sucsess:- STATUS_SUCESS
+ *		Failure- : negative erro code
+ *
+ **/
 
 static INT BcmGetActiveISO(PMINI_ADAPTER Adapter)
 {
@@ -3517,15 +3517,15 @@ static INT BcmGetActiveISO(PMINI_ADAPTER Adapter)
 }
 
 /**
-*	IsOffsetWritable :- it will tell the access permission of the sector having passed offset
-*	@Adapter : Drivers Private Data Structure
-*	@uiOffset : Offset provided in the Flash
-*
-*	Return Value:-
-*	Success:-TRUE ,  offset is writable
-*	Failure:-FALSE, offset is RO
-*
-**/
+ *	IsOffsetWritable :- it will tell the access permission of the sector having passed offset
+ *	@Adapter : Drivers Private Data Structure
+ *	@uiOffset : Offset provided in the Flash
+ *
+ *	Return Value:-
+ *	Success:-TRUE ,  offset is writable
+ *	Failure:-FALSE, offset is RO
+ *
+ **/
 B_UINT8 IsOffsetWritable(PMINI_ADAPTER Adapter, UINT uiOffset)
 {
 	UINT uiSectorNum = 0;
@@ -3579,20 +3579,20 @@ static INT BcmDumpFlash2xSectionBitMap(PFLASH2X_BITMAP psFlash2xBitMap)
 }
 
 /**
-*	BcmGetFlash2xSectionalBitMap :- It will provide the bit map of all the section present in Flash
-*	8bit has been assigned to every section.
-	bit[0] :Section present or not
-	bit[1] :section is valid or not
-	bit[2] : Secton is read only or has write permission too.
-	bit[3] : Active Section -
-	bit[7...4] = Reserved .
-
-	@Adapter:-Driver private Data Structure
-*
-*	Return value:-
-*	Success:- STATUS_SUCESS
-*	Failure:- negative error code
-**/
+ *	BcmGetFlash2xSectionalBitMap :- It will provide the bit map of all the section present in Flash
+ *	8bit has been assigned to every section.
+ bit[0] :Section present or not
+ bit[1] :section is valid or not
+ bit[2] : Secton is read only or has write permission too.
+ bit[3] : Active Section -
+ bit[7...4] = Reserved .
+
+ @Adapter:-Driver private Data Structure
+ *
+ *	Return value:-
+ *	Success:- STATUS_SUCESS
+ *	Failure:- negative error code
+ **/
 
 INT BcmGetFlash2xSectionalBitMap(PMINI_ADAPTER Adapter, PFLASH2X_BITMAP psFlash2xBitMap)
 {
@@ -3727,8 +3727,8 @@ INT BcmGetFlash2xSectionalBitMap(PMINI_ADAPTER Adapter, PFLASH2X_BITMAP psFlash2
 			//Means section is writable
 			if((SetActiveDSDDone == FALSE) && (uiHighestPriDSD == DSD1))
 			{
-					psFlash2xBitMap->DSD1 |= FLASH2X_SECTION_ACT ;
-					SetActiveDSDDone =TRUE ;
+				psFlash2xBitMap->DSD1 |= FLASH2X_SECTION_ACT ;
+				SetActiveDSDDone =TRUE ;
 			}
 		}
 
@@ -3755,8 +3755,8 @@ INT BcmGetFlash2xSectionalBitMap(PMINI_ADAPTER Adapter, PFLASH2X_BITMAP psFlash2
 			//Means section is writable
 			if((SetActiveDSDDone == FALSE) &&(uiHighestPriDSD == DSD0))
 			{
-					psFlash2xBitMap->DSD0 |= FLASH2X_SECTION_ACT ;
-					SetActiveDSDDone =TRUE ;
+				psFlash2xBitMap->DSD0 |= FLASH2X_SECTION_ACT ;
+				SetActiveDSDDone =TRUE ;
 			}
 		}
 	}
@@ -3881,13 +3881,13 @@ INT BcmGetFlash2xSectionalBitMap(PMINI_ADAPTER Adapter, PFLASH2X_BITMAP psFlash2
 
 }
 /**
-BcmSetActiveSection :- Set Active section is used to make priority field highest over other
-					section of same type.
+   BcmSetActiveSection :- Set Active section is used to make priority field highest over other
+   section of same type.
 
-@Adapater :- Bcm Driver Private Data Structure
-@eFlash2xSectionVal :- Flash section val whose priority has to be made highest.
+   @Adapater :- Bcm Driver Private Data Structure
+   @eFlash2xSectionVal :- Flash section val whose priority has to be made highest.
 
-Return Value:- Make the priorit highest else return erorr code
+   Return Value:- Make the priorit highest else return erorr code
 
 **/
 INT BcmSetActiveSection(PMINI_ADAPTER Adapter, FLASH2X_SECTION_VAL eFlash2xSectVal)
@@ -3913,10 +3913,46 @@ INT BcmSetActiveSection(PMINI_ADAPTER Adapter, FLASH2X_SECTION_VAL eFlash2xSectV
 	Adapter->bHeaderChangeAllowed = TRUE ;
 	switch(eFlash2xSectVal)
 	{
-		case ISO_IMAGE1 :
-		case ISO_IMAGE2	:
-			if(ReadISOSignature(Adapter,eFlash2xSectVal)== ISO_IMAGE_MAGIC_NUMBER )
+	case ISO_IMAGE1 :
+	case ISO_IMAGE2	:
+		if(ReadISOSignature(Adapter,eFlash2xSectVal)== ISO_IMAGE_MAGIC_NUMBER )
+		{
+			HighestPriISO = getHighestPriISO(Adapter);
+
+			if(HighestPriISO == eFlash2xSectVal	)
 			{
+				bcm_dbg(Adapter, OTHERS, NVM_RW, ALL,
+					"Given ISO<%x> already  has highest priority\n",
+					eFlash2xSectVal);
+				Status = STATUS_SUCCESS ;
+				break;
+			}
+
+			SectImagePriority = ReadISOPriority(Adapter, HighestPriISO) + 1;
+
+			if((SectImagePriority <= 0) && IsSectionWritable(Adapter,HighestPriISO))
+			{
+				// This is a SPECIAL Case which will only happen if the current highest priority ISO has priority value = 0x7FFFFFFF.
+				// We will write 1 to the current Highest priority ISO And then shall increase the priority of the requested ISO
+				// by user
+				bcm_dbg(Adapter, OTHERS, NVM_RW, ALL,
+					"SectImagePriority wraparound happened, eFlash2xSectVal: 0x%x\n",
+					eFlash2xSectVal);
+				SectImagePriority = htonl(0x1);
+				Status = BcmFlash2xBulkWrite(Adapter,
+							     &SectImagePriority,
+							     HighestPriISO,
+							     0 + FIELD_OFFSET_IN_HEADER(PISO_HEADER, ISOImagePriority),
+							     SIGNATURE_SIZE,
+							     TRUE);
+
+				if(Status)
+				{
+					pr_info("Priority has not been written properly\n");
+					Status = STATUS_FAILURE;
+					break ;
+				}
+
 				HighestPriISO = getHighestPriISO(Adapter);
 
 				if(HighestPriISO == eFlash2xSectVal	)
@@ -3928,170 +3964,134 @@ INT BcmSetActiveSection(PMINI_ADAPTER Adapter, FLASH2X_SECTION_VAL eFlash2xSectV
 					break;
 				}
 
-				SectImagePriority = ReadISOPriority(Adapter, HighestPriISO) + 1;
-
-				if((SectImagePriority <= 0) && IsSectionWritable(Adapter,HighestPriISO))
-				{
-					// This is a SPECIAL Case which will only happen if the current highest priority ISO has priority value = 0x7FFFFFFF.
-					// We will write 1 to the current Highest priority ISO And then shall increase the priority of the requested ISO
-					// by user
-					bcm_dbg(Adapter, OTHERS, NVM_RW, ALL,
-						"SectImagePriority wraparound happened, eFlash2xSectVal: 0x%x\n",
-						eFlash2xSectVal);
-					SectImagePriority = htonl(0x1);
-					Status = BcmFlash2xBulkWrite(Adapter,
-								&SectImagePriority,
-								HighestPriISO,
-								0 + FIELD_OFFSET_IN_HEADER(PISO_HEADER, ISOImagePriority),
-								SIGNATURE_SIZE,
-								TRUE);
-
-					if(Status)
-					{
-						pr_info("Priority has not been written properly\n");
-						Status = STATUS_FAILURE;
-						break ;
-					}
+				SectImagePriority = 2;
+			}
 
-					HighestPriISO = getHighestPriISO(Adapter);
 
-					if(HighestPriISO == eFlash2xSectVal	)
-					{
-						bcm_dbg(Adapter, OTHERS, NVM_RW, ALL,
-							"Given ISO<%x> already  has highest priority\n",
-							eFlash2xSectVal);
-						Status = STATUS_SUCCESS ;
-						break;
-					}
+			SectImagePriority = htonl(SectImagePriority);
 
-					SectImagePriority = 2;
-				 }
+			Status = BcmFlash2xBulkWrite(Adapter,
+						     &SectImagePriority,
+						     eFlash2xSectVal,
+						     0 + FIELD_OFFSET_IN_HEADER(PISO_HEADER, ISOImagePriority),
+						     SIGNATURE_SIZE,
+						     TRUE);
+			if(Status)
+			{
+				pr_info("Priority has not been written properly\n");
+				break ;
+			}
+		}
+		else
+		{
+			pr_info("Signature is corrupted. Hence can't increase the priority\n");
+			Status = STATUS_FAILURE ;
+			break;
+		}
+		break;
+	case DSD0 :
+	case DSD1 :
+	case DSD2 :
+		if(ReadDSDSignature(Adapter,eFlash2xSectVal)== DSD_IMAGE_MAGIC_NUMBER)
+		{
+			HighestPriDSD = getHighestPriDSD(Adapter);
 
+			if((HighestPriDSD == eFlash2xSectVal))
+			{
+				bcm_dbg(Adapter, OTHERS, NVM_RW, ALL,
+					"Given DSD<%x> already  has highest priority\n",
+					eFlash2xSectVal);
+				Status = STATUS_SUCCESS ;
+				break;
+			}
 
-				SectImagePriority = htonl(SectImagePriority);
+			SectImagePriority = ReadDSDPriority(Adapter, HighestPriDSD) + 1 ;
+			if(SectImagePriority <= 0)
+			{
+				// This is a SPECIAL Case which will only happen if the current highest priority DSD has priority value = 0x7FFFFFFF.
+				// We will write 1 to the current Highest priority DSD And then shall increase the priority of the requested DSD
+				// by user
+				pr_info("SectImagePriority wraparound happened, eFlash2xSectVal: 0x%x\n",
+					eFlash2xSectVal);
+				SectImagePriority = htonl(0x1);
 
 				Status = BcmFlash2xBulkWrite(Adapter,
-								&SectImagePriority,
-								eFlash2xSectVal,
-								0 + FIELD_OFFSET_IN_HEADER(PISO_HEADER, ISOImagePriority),
-								SIGNATURE_SIZE,
-								TRUE);
+							     &SectImagePriority,
+							     HighestPriDSD,
+							     Adapter->psFlash2xCSInfo->OffsetFromDSDStartForDSDHeader + FIELD_OFFSET_IN_HEADER(PDSD_HEADER, DSDImagePriority),
+							     SIGNATURE_SIZE,
+							     TRUE);
+
 				if(Status)
 				{
 					pr_info("Priority has not been written properly\n");
 					break ;
 				}
-			}
-			else
-			{
-				pr_info("Signature is corrupted. Hence can't increase the priority\n");
-				Status = STATUS_FAILURE ;
-				break;
-			}
-			break;
-		case DSD0 :
-		case DSD1 :
-		case DSD2 :
-			if(ReadDSDSignature(Adapter,eFlash2xSectVal)== DSD_IMAGE_MAGIC_NUMBER)
-			{
+
 				HighestPriDSD = getHighestPriDSD(Adapter);
 
 				if((HighestPriDSD == eFlash2xSectVal))
 				{
 					bcm_dbg(Adapter, OTHERS, NVM_RW, ALL,
-						"Given DSD<%x> already  has highest priority\n",
+						"Made the DSD: %x highest by reducing priority of other\n",
 						eFlash2xSectVal);
 					Status = STATUS_SUCCESS ;
 					break;
 				}
 
-				SectImagePriority = ReadDSDPriority(Adapter, HighestPriDSD) + 1 ;
-				if(SectImagePriority <= 0)
-				{
-					// This is a SPECIAL Case which will only happen if the current highest priority DSD has priority value = 0x7FFFFFFF.
-					// We will write 1 to the current Highest priority DSD And then shall increase the priority of the requested DSD
-					// by user
-					pr_info("SectImagePriority wraparound happened, eFlash2xSectVal: 0x%x\n",
-						eFlash2xSectVal);
-					SectImagePriority = htonl(0x1);
-
-					Status = BcmFlash2xBulkWrite(Adapter,
-									&SectImagePriority,
-									HighestPriDSD,
-									Adapter->psFlash2xCSInfo->OffsetFromDSDStartForDSDHeader + FIELD_OFFSET_IN_HEADER(PDSD_HEADER, DSDImagePriority),
-									SIGNATURE_SIZE,
-									TRUE);
-
-					if(Status)
-					{
-						pr_info("Priority has not been written properly\n");
-						break ;
-					}
-
-					HighestPriDSD = getHighestPriDSD(Adapter);
-
-					if((HighestPriDSD == eFlash2xSectVal))
-					{
-						bcm_dbg(Adapter, OTHERS, NVM_RW, ALL,
-							"Made the DSD: %x highest by reducing priority of other\n",
-							eFlash2xSectVal);
-						Status = STATUS_SUCCESS ;
-						break;
-					}
-
-					SectImagePriority = htonl(0x2);
-					Status = BcmFlash2xBulkWrite(Adapter,
-									&SectImagePriority,
-									HighestPriDSD,
-									Adapter->psFlash2xCSInfo->OffsetFromDSDStartForDSDHeader + FIELD_OFFSET_IN_HEADER(PDSD_HEADER, DSDImagePriority),
-									SIGNATURE_SIZE,
-									TRUE);
-
-					if(Status)
-					{
-						pr_info("Priority has not been written properly\n");
-						break ;
-					}
-
-					HighestPriDSD = getHighestPriDSD(Adapter);
-
-					if((HighestPriDSD == eFlash2xSectVal))
-					{
-						Status = STATUS_SUCCESS ;
-						break;
-					}
-					SectImagePriority = 3 ;
-
-				}
-				SectImagePriority = htonl(SectImagePriority);
+				SectImagePriority = htonl(0x2);
 				Status = BcmFlash2xBulkWrite(Adapter,
-								&SectImagePriority,
-								eFlash2xSectVal,
-								Adapter->psFlash2xCSInfo->OffsetFromDSDStartForDSDHeader + FIELD_OFFSET_IN_HEADER(PDSD_HEADER, DSDImagePriority),
-								SIGNATURE_SIZE ,
-								TRUE);
+							     &SectImagePriority,
+							     HighestPriDSD,
+							     Adapter->psFlash2xCSInfo->OffsetFromDSDStartForDSDHeader + FIELD_OFFSET_IN_HEADER(PDSD_HEADER, DSDImagePriority),
+							     SIGNATURE_SIZE,
+							     TRUE);
+
 				if(Status)
 				{
 					pr_info("Priority has not been written properly\n");
-					Status = STATUS_FAILURE ;
 					break ;
 				}
+
+				HighestPriDSD = getHighestPriDSD(Adapter);
+
+				if((HighestPriDSD == eFlash2xSectVal))
+				{
+					Status = STATUS_SUCCESS ;
+					break;
+				}
+				SectImagePriority = 3 ;
+
 			}
-			else
+			SectImagePriority = htonl(SectImagePriority);
+			Status = BcmFlash2xBulkWrite(Adapter,
+						     &SectImagePriority,
+						     eFlash2xSectVal,
+						     Adapter->psFlash2xCSInfo->OffsetFromDSDStartForDSDHeader + FIELD_OFFSET_IN_HEADER(PDSD_HEADER, DSDImagePriority),
+						     SIGNATURE_SIZE ,
+						     TRUE);
+			if(Status)
 			{
-				pr_info("Signature is corrupted. Hence can't increase the priority\n");
+				pr_info("Priority has not been written properly\n");
 				Status = STATUS_FAILURE ;
-				break;
+				break ;
 			}
+		}
+		else
+		{
+			pr_info("Signature is corrupted. Hence can't increase the priority\n");
+			Status = STATUS_FAILURE ;
 			break;
-		case VSA0 :
-		case VSA1 :
-		case VSA2 :
-			//Has to be decided
-			break ;
-		default :
-				Status = STATUS_FAILURE ;
-				break;
+		}
+		break;
+	case VSA0 :
+	case VSA1 :
+	case VSA2 :
+		//Has to be decided
+		break ;
+	default :
+		Status = STATUS_FAILURE ;
+		break;
 
 	}
 
@@ -4101,11 +4101,11 @@ INT BcmSetActiveSection(PMINI_ADAPTER Adapter, FLASH2X_SECTION_VAL eFlash2xSectV
 }
 
 /**
-BcmCopyISO - Used only for copying the ISO section
-@Adapater :- Bcm Driver Private Data Structure
-@sCopySectStrut :- Section copy structure
+   BcmCopyISO - Used only for copying the ISO section
+   @Adapater :- Bcm Driver Private Data Structure
+   @sCopySectStrut :- Section copy structure
 
-Return value:- SUCCESS if copies successfully else negative error code
+   Return value:- SUCCESS if copies successfully else negative error code
 
 **/
 INT BcmCopyISO(PMINI_ADAPTER Adapter, FLASH2X_COPY_SECTION sCopySectStrut)
@@ -4129,10 +4129,10 @@ INT BcmCopyISO(PMINI_ADAPTER Adapter, FLASH2X_COPY_SECTION sCopySectStrut)
 	}
 
 	Status = BcmFlash2xBulkRead(Adapter,
-					   &ISOLength,
-					   sCopySectStrut.SrcSection,
-					   0 + FIELD_OFFSET_IN_HEADER(PISO_HEADER,ISOImageSize),
-					   4);
+				    &ISOLength,
+				    sCopySectStrut.SrcSection,
+				    0 + FIELD_OFFSET_IN_HEADER(PISO_HEADER,ISOImageSize),
+				    4);
 
 	if(Status)
 	{
@@ -4153,8 +4153,8 @@ INT BcmCopyISO(PMINI_ADAPTER Adapter, FLASH2X_COPY_SECTION sCopySectStrut)
 
 	if(Buff == NULL)
 	{
-			pr_info("Memory allocation failed for section size\n");
-			return -ENOMEM;
+		pr_info("Memory allocation failed for section size\n");
+		return -ENOMEM;
 	}
 
 	if(sCopySectStrut.SrcSection ==ISO_IMAGE1 && sCopySectStrut.DstSection ==ISO_IMAGE2)
@@ -4165,11 +4165,11 @@ INT BcmCopyISO(PMINI_ADAPTER Adapter, FLASH2X_COPY_SECTION sCopySectStrut)
 		uiWriteOffsetWithinPart = 0 ;
 
 		uiTotalDataToCopy =(Adapter->psFlash2xCSInfo->OffsetISOImage1Part1End) -
-						   (Adapter->psFlash2xCSInfo->OffsetISOImage1Part1Start)+
-						   (Adapter->psFlash2xCSInfo->OffsetISOImage1Part2End) -
-						   (Adapter->psFlash2xCSInfo->OffsetISOImage1Part2Start)+
-						   (Adapter->psFlash2xCSInfo->OffsetISOImage1Part3End) -
-						   (Adapter->psFlash2xCSInfo->OffsetISOImage1Part3Start);
+			(Adapter->psFlash2xCSInfo->OffsetISOImage1Part1Start)+
+			(Adapter->psFlash2xCSInfo->OffsetISOImage1Part2End) -
+			(Adapter->psFlash2xCSInfo->OffsetISOImage1Part2Start)+
+			(Adapter->psFlash2xCSInfo->OffsetISOImage1Part3End) -
+			(Adapter->psFlash2xCSInfo->OffsetISOImage1Part3Start);
 
 		if(uiTotalDataToCopy < ISOLength)
 		{
@@ -4179,11 +4179,11 @@ INT BcmCopyISO(PMINI_ADAPTER Adapter, FLASH2X_COPY_SECTION sCopySectStrut)
 		}
 
 		uiTotalDataToCopy =(Adapter->psFlash2xCSInfo->OffsetISOImage2Part1End) -
-						   (Adapter->psFlash2xCSInfo->OffsetISOImage2Part1Start)+
-						   (Adapter->psFlash2xCSInfo->OffsetISOImage2Part2End) -
-						   (Adapter->psFlash2xCSInfo->OffsetISOImage2Part2Start)+
-						   (Adapter->psFlash2xCSInfo->OffsetISOImage2Part3End) -
-						   (Adapter->psFlash2xCSInfo->OffsetISOImage2Part3Start);
+			(Adapter->psFlash2xCSInfo->OffsetISOImage2Part1Start)+
+			(Adapter->psFlash2xCSInfo->OffsetISOImage2Part2End) -
+			(Adapter->psFlash2xCSInfo->OffsetISOImage2Part2Start)+
+			(Adapter->psFlash2xCSInfo->OffsetISOImage2Part3End) -
+			(Adapter->psFlash2xCSInfo->OffsetISOImage2Part3Start);
 
 		if(uiTotalDataToCopy < ISOLength)
 		{
@@ -4238,11 +4238,11 @@ INT BcmCopyISO(PMINI_ADAPTER Adapter, FLASH2X_COPY_SECTION sCopySectStrut)
 			}
 
 			Status = BcmFlash2xBulkRead(Adapter,
-								   (PUINT)Buff,
-								   eISOReadPart,
-								   uiReadOffsetWithinPart,
-								   Adapter->uiSectorSize
-								);
+						    (PUINT)Buff,
+						    eISOReadPart,
+						    uiReadOffsetWithinPart,
+						    Adapter->uiSectorSize
+				);
 
 			if(Status)
 			{
@@ -4262,11 +4262,11 @@ INT BcmCopyISO(PMINI_ADAPTER Adapter, FLASH2X_COPY_SECTION sCopySectStrut)
 			Adapter->bHeaderChangeAllowed = TRUE ;
 
 			Status = BcmFlash2xBulkWrite(Adapter,
-								 (PUINT)Buff,
-								 eISOWritePart,
-								 uiWriteOffsetWithinPart,
-								 Adapter->uiSectorSize,
-								 TRUE);
+						     (PUINT)Buff,
+						     eISOWritePart,
+						     uiWriteOffsetWithinPart,
+						     Adapter->uiSectorSize,
+						     TRUE);
 			if(Status)
 			{
 				pr_info("Write failed while copying ISO: Part: %x, OffsetWithinPart: %x\n",
@@ -4279,10 +4279,10 @@ INT BcmCopyISO(PMINI_ADAPTER Adapter, FLASH2X_COPY_SECTION sCopySectStrut)
 			if(IsThisHeaderSector == TRUE)
 			{
 				WriteToFlashWithoutSectorErase(Adapter,
-												SigBuff,
-												eISOWritePart,
-												sigOffset,
-												MAX_RW_SIZE);
+							       SigBuff,
+							       eISOWritePart,
+							       sigOffset,
+							       MAX_RW_SIZE);
 				IsThisHeaderSector = FALSE ;
 			}
 			//subtracting the written Data
@@ -4300,11 +4300,11 @@ INT BcmCopyISO(PMINI_ADAPTER Adapter, FLASH2X_COPY_SECTION sCopySectStrut)
 		uiWriteOffsetWithinPart = 0 ;
 
 		uiTotalDataToCopy =(Adapter->psFlash2xCSInfo->OffsetISOImage2Part1End) -
-						   (Adapter->psFlash2xCSInfo->OffsetISOImage2Part1Start)+
-						   (Adapter->psFlash2xCSInfo->OffsetISOImage2Part2End) -
-						   (Adapter->psFlash2xCSInfo->OffsetISOImage2Part2Start)+
-						   (Adapter->psFlash2xCSInfo->OffsetISOImage2Part3End) -
-						   (Adapter->psFlash2xCSInfo->OffsetISOImage2Part3Start);
+			(Adapter->psFlash2xCSInfo->OffsetISOImage2Part1Start)+
+			(Adapter->psFlash2xCSInfo->OffsetISOImage2Part2End) -
+			(Adapter->psFlash2xCSInfo->OffsetISOImage2Part2Start)+
+			(Adapter->psFlash2xCSInfo->OffsetISOImage2Part3End) -
+			(Adapter->psFlash2xCSInfo->OffsetISOImage2Part3Start);
 
 		if(uiTotalDataToCopy < ISOLength)
 		{
@@ -4314,11 +4314,11 @@ INT BcmCopyISO(PMINI_ADAPTER Adapter, FLASH2X_COPY_SECTION sCopySectStrut)
 		}
 
 		uiTotalDataToCopy =(Adapter->psFlash2xCSInfo->OffsetISOImage1Part1End) -
-						   (Adapter->psFlash2xCSInfo->OffsetISOImage1Part1Start)+
-						   (Adapter->psFlash2xCSInfo->OffsetISOImage1Part2End) -
-						   (Adapter->psFlash2xCSInfo->OffsetISOImage1Part2Start)+
-						   (Adapter->psFlash2xCSInfo->OffsetISOImage1Part3End) -
-						   (Adapter->psFlash2xCSInfo->OffsetISOImage1Part3Start);
+			(Adapter->psFlash2xCSInfo->OffsetISOImage1Part1Start)+
+			(Adapter->psFlash2xCSInfo->OffsetISOImage1Part2End) -
+			(Adapter->psFlash2xCSInfo->OffsetISOImage1Part2Start)+
+			(Adapter->psFlash2xCSInfo->OffsetISOImage1Part3End) -
+			(Adapter->psFlash2xCSInfo->OffsetISOImage1Part3Start);
 
 		if(uiTotalDataToCopy < ISOLength)
 		{
@@ -4373,11 +4373,11 @@ INT BcmCopyISO(PMINI_ADAPTER Adapter, FLASH2X_COPY_SECTION sCopySectStrut)
 			}
 
 			Status = BcmFlash2xBulkRead(Adapter,
-								   (PUINT)Buff,
-								   eISOReadPart,
-								   uiReadOffsetWithinPart,
-								   Adapter->uiSectorSize
-								);
+						    (PUINT)Buff,
+						    eISOReadPart,
+						    uiReadOffsetWithinPart,
+						    Adapter->uiSectorSize
+				);
 			if(Status)
 			{
 				pr_info("Read failed while copying ISO: Part: %x, OffsetWithinPart: %x\n",
@@ -4396,11 +4396,11 @@ INT BcmCopyISO(PMINI_ADAPTER Adapter, FLASH2X_COPY_SECTION sCopySectStrut)
 			}
 			Adapter->bHeaderChangeAllowed = TRUE ;
 			Status = BcmFlash2xBulkWrite(Adapter,
-								 (PUINT)Buff,
-								 eISOWritePart,
-								 uiWriteOffsetWithinPart,
-								 Adapter->uiSectorSize,
-								 TRUE);
+						     (PUINT)Buff,
+						     eISOWritePart,
+						     uiWriteOffsetWithinPart,
+						     Adapter->uiSectorSize,
+						     TRUE);
 
 			if(Status)
 			{
@@ -4414,10 +4414,10 @@ INT BcmCopyISO(PMINI_ADAPTER Adapter, FLASH2X_COPY_SECTION sCopySectStrut)
 			if(IsThisHeaderSector == TRUE)
 			{
 				WriteToFlashWithoutSectorErase(Adapter,
-												SigBuff,
-												eISOWritePart,
-												sigOffset,
-												MAX_RW_SIZE);
+							       SigBuff,
+							       eISOWritePart,
+							       sigOffset,
+							       MAX_RW_SIZE);
 				IsThisHeaderSector = FALSE ;
 			}
 
@@ -4434,14 +4434,14 @@ out:
 	return Status;
 }
 /**
-BcmFlash2xCorruptSig : this API is used to corrupt the written sig in Bcm Header present in flash section.
-					     It will corrupt the sig, if Section is writable, by making first bytes as zero.
-@Adapater :- Bcm Driver Private Data Structure
-@eFlash2xSectionVal :- Flash section val which has header
+   BcmFlash2xCorruptSig : this API is used to corrupt the written sig in Bcm Header present in flash section.
+   It will corrupt the sig, if Section is writable, by making first bytes as zero.
+   @Adapater :- Bcm Driver Private Data Structure
+   @eFlash2xSectionVal :- Flash section val which has header
 
-Return Value :-
-	Success :- If Section is present and writable, corrupt the sig and return STATUS_SUCCESS
-	Failure :-Return negative error code
+   Return Value :-
+   Success :- If Section is present and writable, corrupt the sig and return STATUS_SUCCESS
+   Failure :-Return negative error code
 
 
 **/
@@ -4469,14 +4469,14 @@ INT BcmFlash2xCorruptSig(PMINI_ADAPTER Adapter, FLASH2X_SECTION_VAL eFlash2xSect
 	return Status;
 }
 /**
-BcmFlash2xWriteSig :-this API is used to Write the sig if requested Section has
-					  header and  Write Permission.
-@Adapater :- Bcm Driver Private Data Structure
-@eFlashSectionVal :- Flash section val which has header
+   BcmFlash2xWriteSig :-this API is used to Write the sig if requested Section has
+   header and  Write Permission.
+   @Adapater :- Bcm Driver Private Data Structure
+   @eFlashSectionVal :- Flash section val which has header
 
-Return Value :-
-	Success :- If Section is present and writable write the sig and return STATUS_SUCCESS
-	Failure :-Return negative error code
+   Return Value :-
+   Success :- If Section is present and writable write the sig and return STATUS_SUCCESS
+   Failure :-Return negative error code
 
 **/
 INT BcmFlash2xWriteSig(PMINI_ADAPTER Adapter, FLASH2X_SECTION_VAL eFlashSectionVal)
@@ -4545,12 +4545,12 @@ INT BcmFlash2xWriteSig(PMINI_ADAPTER Adapter, FLASH2X_SECTION_VAL eFlashSectionV
 	return STATUS_SUCCESS;
 }
 /**
-validateFlash2xReadWrite :- This API is used to validate the user request for Read/Write.
-						      if requested Bytes goes beyond the Requested section, it reports error.
-@Adapater :- Bcm Driver Private Data Structure
-@psFlash2xReadWrite :-Flash2x Read/write structure pointer
+   validateFlash2xReadWrite :- This API is used to validate the user request for Read/Write.
+   if requested Bytes goes beyond the Requested section, it reports error.
+   @Adapater :- Bcm Driver Private Data Structure
+   @psFlash2xReadWrite :-Flash2x Read/write structure pointer
 
-Return values:-Return TRUE is request is valid else FALSE.
+   Return values:-Return TRUE is request is valid else FALSE.
 
 
 **/
@@ -4576,20 +4576,20 @@ INT	validateFlash2xReadWrite(PMINI_ADAPTER Adapter, PFLASH2X_READWRITE psFlash2x
 		if(psFlash2xReadWrite->Section == ISO_IMAGE1)
 		{
 			uiSectEndOffset = BcmGetSectionValEndOffset(Adapter,ISO_IMAGE1) -
-							  BcmGetSectionValStartOffset(Adapter,ISO_IMAGE1)+
-							  BcmGetSectionValEndOffset(Adapter,ISO_IMAGE1_PART2) -
-							  BcmGetSectionValStartOffset(Adapter,ISO_IMAGE1_PART2)+
-							  BcmGetSectionValEndOffset(Adapter,ISO_IMAGE1_PART3) -
-							  BcmGetSectionValStartOffset(Adapter,ISO_IMAGE1_PART3);
+				BcmGetSectionValStartOffset(Adapter,ISO_IMAGE1)+
+				BcmGetSectionValEndOffset(Adapter,ISO_IMAGE1_PART2) -
+				BcmGetSectionValStartOffset(Adapter,ISO_IMAGE1_PART2)+
+				BcmGetSectionValEndOffset(Adapter,ISO_IMAGE1_PART3) -
+				BcmGetSectionValStartOffset(Adapter,ISO_IMAGE1_PART3);
 		}
 		else if(psFlash2xReadWrite->Section == ISO_IMAGE2)
 		{
 			uiSectEndOffset = BcmGetSectionValEndOffset(Adapter,ISO_IMAGE2) -
-							  BcmGetSectionValStartOffset(Adapter,ISO_IMAGE2)+
-							  BcmGetSectionValEndOffset(Adapter,ISO_IMAGE2_PART2) -
-							  BcmGetSectionValStartOffset(Adapter,ISO_IMAGE2_PART2)+
-							  BcmGetSectionValEndOffset(Adapter,ISO_IMAGE2_PART3) -
-							  BcmGetSectionValStartOffset(Adapter,ISO_IMAGE2_PART3);
+				BcmGetSectionValStartOffset(Adapter,ISO_IMAGE2)+
+				BcmGetSectionValEndOffset(Adapter,ISO_IMAGE2_PART2) -
+				BcmGetSectionValStartOffset(Adapter,ISO_IMAGE2_PART2)+
+				BcmGetSectionValEndOffset(Adapter,ISO_IMAGE2_PART3) -
+				BcmGetSectionValStartOffset(Adapter,ISO_IMAGE2_PART3);
 
 		}
 
@@ -4617,11 +4617,11 @@ INT	validateFlash2xReadWrite(PMINI_ADAPTER Adapter, PFLASH2X_READWRITE psFlash2x
 }
 
 /**
-IsFlash2x :- check for Flash 2.x
-@Adapater :- Bcm Driver Private Data Structure
+   IsFlash2x :- check for Flash 2.x
+   @Adapater :- Bcm Driver Private Data Structure
 
-Return value:-
-	return TRUE if flah2.x of hgher version else return false.
+   Return value:-
+   return TRUE if flah2.x of hgher version else return false.
 **/
 
 INT IsFlash2x(PMINI_ADAPTER Adapter)
@@ -4632,11 +4632,11 @@ INT IsFlash2x(PMINI_ADAPTER Adapter)
 		return FALSE;
 }
 /**
-GetFlashBaseAddr :- Calculate the Flash Base address
-@Adapater :- Bcm Driver Private Data Structure
+   GetFlashBaseAddr :- Calculate the Flash Base address
+   @Adapater :- Bcm Driver Private Data Structure
 
-Return Value:-
-	Success :- Base Address of the Flash
+   Return Value:-
+   Success :- Base Address of the Flash
 **/
 
 static INT GetFlashBaseAddr(PMINI_ADAPTER Adapter)
@@ -4647,11 +4647,11 @@ static INT GetFlashBaseAddr(PMINI_ADAPTER Adapter)
 	if(Adapter->bDDRInitDone)
 	{
 		/*
-		For All Valid Flash Versions... except 1.1, take the value from FlashBaseAddr
-		In case of Raw Read... use the default value
+		  For All Valid Flash Versions... except 1.1, take the value from FlashBaseAddr
+		  In case of Raw Read... use the default value
 		*/
 		if(Adapter->uiFlashLayoutMajorVersion && (Adapter->bFlashRawRead == FALSE) &&
-			!((Adapter->uiFlashLayoutMajorVersion == 1) && (Adapter->uiFlashLayoutMinorVersion == 1))
+		   !((Adapter->uiFlashLayoutMajorVersion == 1) && (Adapter->uiFlashLayoutMinorVersion == 1))
 			)
 			uiBaseAddr = Adapter->uiFlashBaseAdd ;
 		else
@@ -4660,11 +4660,11 @@ static INT GetFlashBaseAddr(PMINI_ADAPTER Adapter)
 	else
 	{
 		/*
-		For All Valid Flash Versions... except 1.1, take the value from FlashBaseAddr
-		In case of Raw Read... use the default value
+		  For All Valid Flash Versions... except 1.1, take the value from FlashBaseAddr
+		  In case of Raw Read... use the default value
 		*/
 		if(Adapter->uiFlashLayoutMajorVersion && (Adapter->bFlashRawRead == FALSE) &&
-			!((Adapter->uiFlashLayoutMajorVersion == 1) && (Adapter->uiFlashLayoutMinorVersion == 1))
+		   !((Adapter->uiFlashLayoutMajorVersion == 1) && (Adapter->uiFlashLayoutMinorVersion == 1))
 			)
 			uiBaseAddr = Adapter->uiFlashBaseAdd | FLASH_CONTIGIOUS_START_ADDR_BEFORE_INIT;
 		else
@@ -4674,27 +4674,27 @@ static INT GetFlashBaseAddr(PMINI_ADAPTER Adapter)
 	return uiBaseAddr ;
 }
 /**
-BcmCopySection :- This API is used to copy the One section in another. Both section should
-				    be contiuous and of same size. Hence this Will not be applicabe to copy ISO.
+   BcmCopySection :- This API is used to copy the One section in another. Both section should
+   be contiuous and of same size. Hence this Will not be applicabe to copy ISO.
 
-@Adapater :- Bcm Driver Private Data Structure
-@SrcSection :- Source section From where data has to be copied
-@DstSection :- Destination section to which data has to be copied
-@offset :- Offset from/to  where data has to be copied from one section to another.
-@numOfBytes :- number of byes that has to be copyed from one section to another at given offset.
-			     in case of numofBytes  equal zero complete section will be copied.
+   @Adapater :- Bcm Driver Private Data Structure
+   @SrcSection :- Source section From where data has to be copied
+   @DstSection :- Destination section to which data has to be copied
+   @offset :- Offset from/to  where data has to be copied from one section to another.
+   @numOfBytes :- number of byes that has to be copyed from one section to another at given offset.
+   in case of numofBytes  equal zero complete section will be copied.
 
-Return Values-
-	Success : Return STATUS_SUCCESS
-	Faillure :- return negative error code
+   Return Values-
+   Success : Return STATUS_SUCCESS
+   Faillure :- return negative error code
 
 **/
 
 INT	BcmCopySection(PMINI_ADAPTER Adapter,
-						FLASH2X_SECTION_VAL SrcSection,
-						FLASH2X_SECTION_VAL DstSection,
-						UINT offset,
-						UINT numOfBytes)
+		       FLASH2X_SECTION_VAL SrcSection,
+		       FLASH2X_SECTION_VAL DstSection,
+		       UINT offset,
+		       UINT numOfBytes)
 {
 	UINT BuffSize = 0 ;
 	UINT BytesToBeCopied = 0;
@@ -4721,14 +4721,14 @@ INT	BcmCopySection(PMINI_ADAPTER Adapter,
 	if(numOfBytes == 0)
 	{
 		numOfBytes = BcmGetSectionValEndOffset(Adapter,SrcSection)
-				  - BcmGetSectionValStartOffset(Adapter,SrcSection);
+			- BcmGetSectionValStartOffset(Adapter,SrcSection);
 
 		bcm_dbg(Adapter, OTHERS, NVM_RW, ALL,
 			"Section Size :0x%x\n", numOfBytes);
 	}
 
 	if((offset + numOfBytes) > BcmGetSectionValEndOffset(Adapter,SrcSection)
-				  - BcmGetSectionValStartOffset(Adapter,SrcSection))
+	   - BcmGetSectionValStartOffset(Adapter,SrcSection))
 	{
 		pr_info("Input parameters going beyond the section offS: %x numB: %x of Source Section\n",
 			offset, numOfBytes);
@@ -4736,7 +4736,7 @@ INT	BcmCopySection(PMINI_ADAPTER Adapter,
 	}
 
 	if((offset + numOfBytes) > BcmGetSectionValEndOffset(Adapter,DstSection)
-				  - BcmGetSectionValStartOffset(Adapter,DstSection))
+	   - BcmGetSectionValStartOffset(Adapter,DstSection))
 	{
 		pr_info("Input parameters going beyond the section offS: %x numB: %x of Destination Section\n",
 			offset, numOfBytes);
@@ -4799,14 +4799,14 @@ INT	BcmCopySection(PMINI_ADAPTER Adapter,
 }
 
 /**
-SaveHeaderIfPresent :- This API is use to Protect the Header in case of Header Sector write
-@Adapater :- Bcm Driver Private Data Structure
-@pBuff :- Data buffer that has to be written in sector having the header map.
-@uiOffset :- Flash offset that has to be written.
+   SaveHeaderIfPresent :- This API is use to Protect the Header in case of Header Sector write
+   @Adapater :- Bcm Driver Private Data Structure
+   @pBuff :- Data buffer that has to be written in sector having the header map.
+   @uiOffset :- Flash offset that has to be written.
 
-Return value :-
-	Success :- On success return STATUS_SUCCESS
-	Faillure :- Return negative error code
+   Return value :-
+   Success :- On success return STATUS_SUCCESS
+   Faillure :- Return negative error code
 
 **/
 
@@ -4823,8 +4823,8 @@ INT SaveHeaderIfPresent(PMINI_ADAPTER Adapter, PUCHAR pBuff, UINT uiOffset)
 
 
 	if((uiSectAlignAddr == BcmGetSectionValEndOffset(Adapter,DSD2)- Adapter->uiSectorSize)||
-	(uiSectAlignAddr == BcmGetSectionValEndOffset(Adapter,DSD1)- Adapter->uiSectorSize)||
-	(uiSectAlignAddr == BcmGetSectionValEndOffset(Adapter,DSD0)- Adapter->uiSectorSize))
+	   (uiSectAlignAddr == BcmGetSectionValEndOffset(Adapter,DSD1)- Adapter->uiSectorSize)||
+	   (uiSectAlignAddr == BcmGetSectionValEndOffset(Adapter,DSD0)- Adapter->uiSectorSize))
 	{
 
 		//offset from the sector boundary having the header map
@@ -4834,7 +4834,7 @@ INT SaveHeaderIfPresent(PMINI_ADAPTER Adapter, PUCHAR pBuff, UINT uiOffset)
 	}
 
 	if(uiSectAlignAddr == BcmGetSectionValStartOffset(Adapter,ISO_IMAGE1) ||
-		uiSectAlignAddr == BcmGetSectionValStartOffset(Adapter,ISO_IMAGE2))
+	   uiSectAlignAddr == BcmGetSectionValStartOffset(Adapter,ISO_IMAGE2))
 	{
 		offsetToProtect = 0;
 		HeaderSizeToProtect = sizeof(ISO_HEADER);
@@ -4880,11 +4880,11 @@ INT SaveHeaderIfPresent(PMINI_ADAPTER Adapter, PUCHAR pBuff, UINT uiOffset)
 }
 
 /**
-BcmDoChipSelect : This will selcet the appropriate chip for writing.
-@Adapater :- Bcm Driver Private Data Structure
+   BcmDoChipSelect : This will selcet the appropriate chip for writing.
+   @Adapater :- Bcm Driver Private Data Structure
 
-OutPut:-
-	Select the Appropriate chip and retrn status Success
+   OutPut:-
+   Select the Appropriate chip and retrn status Success
 **/
 static INT BcmDoChipSelect(PMINI_ADAPTER Adapter, UINT offset)
 {
@@ -4904,10 +4904,10 @@ static INT BcmDoChipSelect(PMINI_ADAPTER Adapter, UINT offset)
 	//
 
 	/*
-	SelectedChip Variable is the selection that the host is 100% Sure the same as what the register will hold. This can be ONLY ensured
-	if the Chip doesn't goes to low power mode while the flash operation is in progress (NVMRdmWrmLock is taken)
-	Before every new Flash Write operation, we reset the variable. This is to ensure that after any wake-up from
-	power down modes (Idle mode/shutdown mode), the values in the register will be different.
+	  SelectedChip Variable is the selection that the host is 100% Sure the same as what the register will hold. This can be ONLY ensured
+	  if the Chip doesn't goes to low power mode while the flash operation is in progress (NVMRdmWrmLock is taken)
+	  Before every new Flash Write operation, we reset the variable. This is to ensure that after any wake-up from
+	  power down modes (Idle mode/shutdown mode), the values in the register will be different.
 	*/
 
 	if(Adapter->SelectedChip == ChipNum)
@@ -4941,10 +4941,10 @@ static INT BcmDoChipSelect(PMINI_ADAPTER Adapter, UINT offset)
 		}
 	}
 	/* In case the bits already written in the FLASH_CONFIG_REG is same as what the user desired,
-	    nothing to do... can return immediately.
-	    ASSUMPTION: FLASH_GPIO_CONFIG_REG will be in sync with FLASH_CONFIG_REG.
-	    Even if the chip goes to low power mode, it should wake with values in each register in sync with each other.
-	    These values are not written by host other than during CHIP_SELECT.
+	   nothing to do... can return immediately.
+	   ASSUMPTION: FLASH_GPIO_CONFIG_REG will be in sync with FLASH_CONFIG_REG.
+	   Even if the chip goes to low power mode, it should wake with values in each register in sync with each other.
+	   These values are not written by host other than during CHIP_SELECT.
 	*/
 	if(PartNum == ((FlashConfig >> CHIP_SELECT_BIT12) & 0x3))
 		return STATUS_SUCCESS;
@@ -4964,29 +4964,29 @@ static INT BcmDoChipSelect(PMINI_ADAPTER Adapter, UINT offset)
 }
 INT ReadDSDSignature(PMINI_ADAPTER Adapter, FLASH2X_SECTION_VAL dsd)
 {
-		UINT uiDSDsig = 0;
-		//UINT sigoffsetInMap = 0;
-		//DSD_HEADER dsdHeader = {0};
+	UINT uiDSDsig = 0;
+	//UINT sigoffsetInMap = 0;
+	//DSD_HEADER dsdHeader = {0};
 
 
-		//sigoffsetInMap =(PUCHAR)&(dsdHeader.DSDImageMagicNumber) -(PUCHAR)&dsdHeader;
+	//sigoffsetInMap =(PUCHAR)&(dsdHeader.DSDImageMagicNumber) -(PUCHAR)&dsdHeader;
 
-		if(dsd != DSD0 && dsd != DSD1 && dsd != DSD2)
-		{
-			pr_info("passed section value is not for DSDs\n");
-			return STATUS_FAILURE;
-		}
-		BcmFlash2xBulkRead(Adapter,
-						   &uiDSDsig,
-						   dsd,
-						   Adapter->psFlash2xCSInfo->OffsetFromDSDStartForDSDHeader + FIELD_OFFSET_IN_HEADER(PDSD_HEADER,DSDImageMagicNumber),
-						   SIGNATURE_SIZE);
+	if(dsd != DSD0 && dsd != DSD1 && dsd != DSD2)
+	{
+		pr_info("passed section value is not for DSDs\n");
+		return STATUS_FAILURE;
+	}
+	BcmFlash2xBulkRead(Adapter,
+			   &uiDSDsig,
+			   dsd,
+			   Adapter->psFlash2xCSInfo->OffsetFromDSDStartForDSDHeader + FIELD_OFFSET_IN_HEADER(PDSD_HEADER,DSDImageMagicNumber),
+			   SIGNATURE_SIZE);
 
-		uiDSDsig = ntohl(uiDSDsig);
-		bcm_dbg(Adapter, OTHERS, NVM_RW, ALL,
-			"DSD SIG :%x\n", uiDSDsig);
+	uiDSDsig = ntohl(uiDSDsig);
+	bcm_dbg(Adapter, OTHERS, NVM_RW, ALL,
+		"DSD SIG :%x\n", uiDSDsig);
 
-		return uiDSDsig ;
+	return uiDSDsig ;
 }
 INT ReadDSDPriority(PMINI_ADAPTER Adapter, FLASH2X_SECTION_VAL dsd)
 {
@@ -4999,10 +4999,10 @@ INT ReadDSDPriority(PMINI_ADAPTER Adapter, FLASH2X_SECTION_VAL dsd)
 		if(ReadDSDSignature(Adapter,dsd)== DSD_IMAGE_MAGIC_NUMBER)
 		{
 			BcmFlash2xBulkRead(Adapter,
-							   &uiDSDPri,
-							   dsd,
-							   Adapter->psFlash2xCSInfo->OffsetFromDSDStartForDSDHeader +FIELD_OFFSET_IN_HEADER(PDSD_HEADER, DSDImagePriority),
-							   4);
+					   &uiDSDPri,
+					   dsd,
+					   Adapter->psFlash2xCSInfo->OffsetFromDSDStartForDSDHeader +FIELD_OFFSET_IN_HEADER(PDSD_HEADER, DSDImagePriority),
+					   4);
 
 			uiDSDPri = ntohl(uiDSDPri);
 			bcm_dbg(Adapter, OTHERS, NVM_RW, ALL,
@@ -5025,21 +5025,21 @@ FLASH2X_SECTION_VAL getHighestPriDSD(PMINI_ADAPTER Adapter)
 	}
 	if(IsSectionWritable(Adapter,DSD1))
 	{
-		 DsdPri = ReadDSDPriority(Adapter,DSD1);
-		 if(DSDHighestPri  < DsdPri)
-		 {
+		DsdPri = ReadDSDPriority(Adapter,DSD1);
+		if(DSDHighestPri  < DsdPri)
+		{
 		 	DSDHighestPri = DsdPri ;
 			HighestPriDSD = DSD1;
-		 }
+		}
 	}
 	if(IsSectionWritable(Adapter,DSD0))
 	{
-		 DsdPri = ReadDSDPriority(Adapter,DSD0);
-		 if(DSDHighestPri  < DsdPri)
-		 {
+		DsdPri = ReadDSDPriority(Adapter,DSD0);
+		if(DSDHighestPri  < DsdPri)
+		{
 		 	DSDHighestPri = DsdPri ;
 			HighestPriDSD = DSD0;
-		 }
+		}
 	}
 	if(HighestPriDSD)
 		bcm_dbg(Adapter, OTHERS, NVM_RW, ALL,
@@ -5050,29 +5050,29 @@ FLASH2X_SECTION_VAL getHighestPriDSD(PMINI_ADAPTER Adapter)
 
 INT ReadISOSignature(PMINI_ADAPTER Adapter, FLASH2X_SECTION_VAL iso)
 {
-		UINT uiISOsig = 0;
-		//UINT sigoffsetInMap = 0;
-		//ISO_HEADER ISOHeader = {0};
+	UINT uiISOsig = 0;
+	//UINT sigoffsetInMap = 0;
+	//ISO_HEADER ISOHeader = {0};
 
 
-		//sigoffsetInMap =(PUCHAR)&(ISOHeader.ISOImageMagicNumber) -(PUCHAR)&ISOHeader;
+	//sigoffsetInMap =(PUCHAR)&(ISOHeader.ISOImageMagicNumber) -(PUCHAR)&ISOHeader;
 
-		if(iso != ISO_IMAGE1 && iso != ISO_IMAGE2)
-		{
-			pr_info("passed section value is not for ISOs\n");
-			return STATUS_FAILURE;
-		}
-		BcmFlash2xBulkRead(Adapter,
-						   &uiISOsig,
-						   iso,
-						   0 + FIELD_OFFSET_IN_HEADER(PISO_HEADER,ISOImageMagicNumber),
-						   SIGNATURE_SIZE);
+	if(iso != ISO_IMAGE1 && iso != ISO_IMAGE2)
+	{
+		pr_info("passed section value is not for ISOs\n");
+		return STATUS_FAILURE;
+	}
+	BcmFlash2xBulkRead(Adapter,
+			   &uiISOsig,
+			   iso,
+			   0 + FIELD_OFFSET_IN_HEADER(PISO_HEADER,ISOImageMagicNumber),
+			   SIGNATURE_SIZE);
 
-		uiISOsig = ntohl(uiISOsig);
-		bcm_dbg(Adapter, OTHERS, NVM_RW, ALL,
-			"ISO SIG :%x\n", uiISOsig);
+	uiISOsig = ntohl(uiISOsig);
+	bcm_dbg(Adapter, OTHERS, NVM_RW, ALL,
+		"ISO SIG :%x\n", uiISOsig);
 
-		return uiISOsig ;
+	return uiISOsig ;
 }
 INT ReadISOPriority(PMINI_ADAPTER Adapter, FLASH2X_SECTION_VAL iso)
 {
@@ -5083,10 +5083,10 @@ INT ReadISOPriority(PMINI_ADAPTER Adapter, FLASH2X_SECTION_VAL iso)
 		if(ReadISOSignature(Adapter,iso)== ISO_IMAGE_MAGIC_NUMBER)
 		{
 			BcmFlash2xBulkRead(Adapter,
-							   &ISOPri,
-							   iso,
-							   0 + FIELD_OFFSET_IN_HEADER(PISO_HEADER, ISOImagePriority),
-							   4);
+					   &ISOPri,
+					   iso,
+					   0 + FIELD_OFFSET_IN_HEADER(PISO_HEADER, ISOImagePriority),
+					   4);
 
 			ISOPri = ntohl(ISOPri);
 			bcm_dbg(Adapter, OTHERS, NVM_RW, ALL,
@@ -5109,12 +5109,12 @@ FLASH2X_SECTION_VAL getHighestPriISO(PMINI_ADAPTER Adapter)
 	}
 	if(IsSectionWritable(Adapter,ISO_IMAGE1))
 	{
-		 ISOPri = ReadISOPriority(Adapter,ISO_IMAGE1);
-		 if(ISOHighestPri  < ISOPri)
-		 {
+		ISOPri = ReadISOPriority(Adapter,ISO_IMAGE1);
+		if(ISOHighestPri  < ISOPri)
+		{
 			ISOHighestPri = ISOPri ;
 			HighestPriISO = ISO_IMAGE1;
-		 }
+		}
 	}
 	if(HighestPriISO)
 		bcm_dbg(Adapter, OTHERS, NVM_RW, ALL,
@@ -5123,11 +5123,11 @@ FLASH2X_SECTION_VAL getHighestPriISO(PMINI_ADAPTER Adapter)
 	return	HighestPriISO ;
 }
 INT WriteToFlashWithoutSectorErase(PMINI_ADAPTER Adapter,
-										PUINT pBuff,
-										FLASH2X_SECTION_VAL eFlash2xSectionVal,
-										UINT uiOffset,
-										UINT uiNumBytes
-										)
+				   PUINT pBuff,
+				   FLASH2X_SECTION_VAL eFlash2xSectionVal,
+				   UINT uiOffset,
+				   UINT uiNumBytes
+	)
 {
 #if !defined(BCM_SHM_INTERFACE) || defined(FLASH_DIRECT_ACCESS)
 	UINT uiTemp = 0, value = 0 ;
@@ -5156,7 +5156,7 @@ INT WriteToFlashWithoutSectorErase(PMINI_ADAPTER Adapter,
 	uiOffset = uiOffset + uiStartOffset;
 
 #if defined(BCM_SHM_INTERFACE) && !defined(FLASH_DIRECT_ACCESS)
-  Status = bcmflash_raw_writenoerase((uiOffset/FLASH_PART_SIZE),(uiOffset % FLASH_PART_SIZE), pcBuff,uiNumBytes);
+	Status = bcmflash_raw_writenoerase((uiOffset/FLASH_PART_SIZE),(uiOffset % FLASH_PART_SIZE), pcBuff,uiNumBytes);
 #else
 	rdmalt(Adapter, 0x0f000C80, &uiTemp, sizeof(uiTemp));
 	value = 0;
@@ -5194,77 +5194,77 @@ BOOLEAN IsSectionExistInFlash(PMINI_ADAPTER Adapter, FLASH2X_SECTION_VAL section
 	switch(section)
 	{
 
-		case ISO_IMAGE1 :
-			  if((Adapter->psFlash2xCSInfo->OffsetISOImage1Part1Start != UNINIT_PTR_IN_CS) &&
-			  		(IsNonCDLessDevice(Adapter) == FALSE))
-				  SectionPresent = TRUE ;
-			   break;
-		case ISO_IMAGE2 :
-				if((Adapter->psFlash2xCSInfo->OffsetISOImage2Part1Start != UNINIT_PTR_IN_CS) &&
-					(IsNonCDLessDevice(Adapter) == FALSE))
-					 SectionPresent = TRUE ;
-			  break;
-		case DSD0 :
-				if(Adapter->psFlash2xCSInfo->OffsetFromZeroForDSDStart != UNINIT_PTR_IN_CS)
-					 SectionPresent = TRUE ;
-				break;
-		case DSD1 :
-				if(Adapter->psFlash2xCSInfo->OffsetFromZeroForDSD1Start != UNINIT_PTR_IN_CS)
-					 SectionPresent = TRUE ;
-				break;
-		case DSD2 :
-				if(Adapter->psFlash2xCSInfo->OffsetFromZeroForDSD2Start != UNINIT_PTR_IN_CS)
-					 SectionPresent = TRUE ;
-				break;
-		case VSA0 :
-				if(Adapter->psFlash2xCSInfo->OffsetFromZeroForVSAStart != UNINIT_PTR_IN_CS)
-					 SectionPresent = TRUE ;
-				break;
-		case VSA1 :
-				if(Adapter->psFlash2xCSInfo->OffsetFromZeroForVSA1Start != UNINIT_PTR_IN_CS)
-					 SectionPresent = TRUE ;
-				break;
-		case VSA2 :
-				if(Adapter->psFlash2xCSInfo->OffsetFromZeroForVSA2Start != UNINIT_PTR_IN_CS)
-					 SectionPresent = TRUE ;
-				break;
-		case SCSI :
-				if(Adapter->psFlash2xCSInfo->OffsetFromZeroForScsiFirmware != UNINIT_PTR_IN_CS)
-					 SectionPresent = TRUE ;
-				break;
-		case CONTROL_SECTION :
-				if(Adapter->psFlash2xCSInfo->OffsetFromZeroForControlSectionStart != UNINIT_PTR_IN_CS)
-					 SectionPresent = TRUE ;
-				break;
-		default :
-			pr_info("Section Does not exist in Flash 2.x\n");
-			SectionPresent =  FALSE;
+	case ISO_IMAGE1 :
+		if((Adapter->psFlash2xCSInfo->OffsetISOImage1Part1Start != UNINIT_PTR_IN_CS) &&
+		   (IsNonCDLessDevice(Adapter) == FALSE))
+			SectionPresent = TRUE ;
+		break;
+	case ISO_IMAGE2 :
+		if((Adapter->psFlash2xCSInfo->OffsetISOImage2Part1Start != UNINIT_PTR_IN_CS) &&
+		   (IsNonCDLessDevice(Adapter) == FALSE))
+			SectionPresent = TRUE ;
+		break;
+	case DSD0 :
+		if(Adapter->psFlash2xCSInfo->OffsetFromZeroForDSDStart != UNINIT_PTR_IN_CS)
+			SectionPresent = TRUE ;
+		break;
+	case DSD1 :
+		if(Adapter->psFlash2xCSInfo->OffsetFromZeroForDSD1Start != UNINIT_PTR_IN_CS)
+			SectionPresent = TRUE ;
+		break;
+	case DSD2 :
+		if(Adapter->psFlash2xCSInfo->OffsetFromZeroForDSD2Start != UNINIT_PTR_IN_CS)
+			SectionPresent = TRUE ;
+		break;
+	case VSA0 :
+		if(Adapter->psFlash2xCSInfo->OffsetFromZeroForVSAStart != UNINIT_PTR_IN_CS)
+			SectionPresent = TRUE ;
+		break;
+	case VSA1 :
+		if(Adapter->psFlash2xCSInfo->OffsetFromZeroForVSA1Start != UNINIT_PTR_IN_CS)
+			SectionPresent = TRUE ;
+		break;
+	case VSA2 :
+		if(Adapter->psFlash2xCSInfo->OffsetFromZeroForVSA2Start != UNINIT_PTR_IN_CS)
+			SectionPresent = TRUE ;
+		break;
+	case SCSI :
+		if(Adapter->psFlash2xCSInfo->OffsetFromZeroForScsiFirmware != UNINIT_PTR_IN_CS)
+			SectionPresent = TRUE ;
+		break;
+	case CONTROL_SECTION :
+		if(Adapter->psFlash2xCSInfo->OffsetFromZeroForControlSectionStart != UNINIT_PTR_IN_CS)
+			SectionPresent = TRUE ;
+		break;
+	default :
+		pr_info("Section Does not exist in Flash 2.x\n");
+		SectionPresent =  FALSE;
 	}
 	return SectionPresent ;
 }
 INT IsSectionWritable(PMINI_ADAPTER Adapter, FLASH2X_SECTION_VAL Section)
 {
-		INT offset = STATUS_FAILURE;
-		INT Status = FALSE;
-		if(IsSectionExistInFlash(Adapter,Section) == FALSE)
-		{
-			pr_info("Section <%d> does not exist\n", Section);
-			return FALSE;
-		}
-		offset = BcmGetSectionValStartOffset(Adapter,Section);
-		if(offset == INVALID_OFFSET)
-		{
-			pr_info("Section<%d> does not exist\n", Section);
-			return FALSE;
-		}
+	INT offset = STATUS_FAILURE;
+	INT Status = FALSE;
+	if(IsSectionExistInFlash(Adapter,Section) == FALSE)
+	{
+		pr_info("Section <%d> does not exist\n", Section);
+		return FALSE;
+	}
+	offset = BcmGetSectionValStartOffset(Adapter,Section);
+	if(offset == INVALID_OFFSET)
+	{
+		pr_info("Section<%d> does not exist\n", Section);
+		return FALSE;
+	}
 
-		if(IsSectionExistInVendorInfo(Adapter,Section))
-		{
-			return !(Adapter->psFlash2xVendorInfo->VendorSection[Section].AccessFlags & FLASH2X_SECTION_RO);
-		}
+	if(IsSectionExistInVendorInfo(Adapter,Section))
+	{
+		return !(Adapter->psFlash2xVendorInfo->VendorSection[Section].AccessFlags & FLASH2X_SECTION_RO);
+	}
 
-		Status = IsOffsetWritable(Adapter,offset);
-		return Status ;
+	Status = IsOffsetWritable(Adapter,offset);
+	return Status ;
 }
 
 static INT CorruptDSDSig(PMINI_ADAPTER Adapter, FLASH2X_SECTION_VAL eFlash2xSectionVal)
@@ -5315,7 +5315,7 @@ static INT CorruptDSDSig(PMINI_ADAPTER Adapter, FLASH2X_SECTION_VAL eFlash2xSect
 			BlockStatus = BcmFlashUnProtectBlock(Adapter,uiSectAlignAddr,Adapter->uiSectorSize);
 
 			WriteToFlashWithoutSectorErase(Adapter,(PUINT)(pBuff + 12),eFlash2xSectionVal,
-												(uiOffset + 12),BYTE_WRITE_SUPPORT);
+						       (uiOffset + 12),BYTE_WRITE_SUPPORT);
 			if(BlockStatus)
 			{
 				BcmRestoreBlockProtectStatus(Adapter,BlockStatus);
@@ -5325,7 +5325,7 @@ static INT CorruptDSDSig(PMINI_ADAPTER Adapter, FLASH2X_SECTION_VAL eFlash2xSect
 		else
 		{
 			WriteToFlashWithoutSectorErase(Adapter,(PUINT)pBuff,eFlash2xSectionVal,
-												uiOffset ,MAX_RW_SIZE);
+						       uiOffset ,MAX_RW_SIZE);
 		}
 	}
 	else
@@ -5376,7 +5376,7 @@ static INT CorruptISOSig(PMINI_ADAPTER Adapter, FLASH2X_SECTION_VAL eFlash2xSect
 	{
 		Adapter->bSigCorrupted = TRUE;
 		WriteToFlashWithoutSectorErase(Adapter,(PUINT)pBuff,eFlash2xSectionVal,
-											uiOffset ,Adapter->ulFlashWriteSize);
+					       uiOffset ,Adapter->ulFlashWriteSize);
 	}
 	else
 	{
diff --git a/drivers/staging/bcm/nvm.h b/drivers/staging/bcm/nvm.h
index 651b5a4..afdd76a 100644
--- a/drivers/staging/bcm/nvm.h
+++ b/drivers/staging/bcm/nvm.h
@@ -36,11 +36,11 @@ typedef struct _FLASH_CS_INFO
 
 	B_UINT32 FlashLayoutVersion ;
 
-    // ISO Image/Format/BuildTool versioning
-    B_UINT32 ISOImageVersion;
+	// ISO Image/Format/BuildTool versioning
+	B_UINT32 ISOImageVersion;
 
-    // SCSI/Flash BootLoader versioning
-    B_UINT32 SCSIFirmwareVersion;
+	// SCSI/Flash BootLoader versioning
+	B_UINT32 SCSIFirmwareVersion;
 
 
 	B_UINT32 OffsetFromZeroForPart1ISOImage;
@@ -112,11 +112,11 @@ typedef struct _FLASH_2X_CS_INFO
 
 	B_UINT32 FlashLayoutVersion ;
 
-    // ISO Image/Format/BuildTool versioning
-    B_UINT32 ISOImageVersion;
+	// ISO Image/Format/BuildTool versioning
+	B_UINT32 ISOImageVersion;
 
-    // SCSI/Flash BootLoader versioning
-    B_UINT32 SCSIFirmwareVersion;
+	// SCSI/Flash BootLoader versioning
+	B_UINT32 SCSIFirmwareVersion;
 
 	// ISO Image1 Part1/SCSI Firmware/Flash Bootloader Start offset, size
 	B_UINT32 OffsetFromZeroForPart1ISOImage;
@@ -190,12 +190,12 @@ typedef struct _FLASH_2X_CS_INFO
 	B_UINT32 OffsetFromZeroForVSA2End;
 
 	/*
-*	 ACCESS_BITS_PER_SECTOR	2
-*	ACCESS_RW			0
-*	ACCESS_RO				1
-*	ACCESS_RESVD			2
-*	ACCESS_RESVD			3
-*	*/
+	 *	 ACCESS_BITS_PER_SECTOR	2
+	 *	ACCESS_RW			0
+	 *	ACCESS_RO				1
+	 *	ACCESS_RESVD			2
+	 *	ACCESS_RESVD			3
+	 *	*/
 	B_UINT32 SectorAccessBitMap[FLASH2X_TOTAL_SIZE/(DEFAULT_SECTOR_SIZE *16)];
 
 // All expansions to the control data structure should add here
diff --git a/drivers/staging/bcm/sort.c b/drivers/staging/bcm/sort.c
index 6eaaa8f..b791b0b 100644
--- a/drivers/staging/bcm/sort.c
+++ b/drivers/staging/bcm/sort.c
@@ -27,7 +27,7 @@ VOID SortPackInfo(PMINI_ADAPTER Adapter)
 	bcm_dbg(Adapter, OTHERS, CONN_MSG, ALL, "<=======\n");
 
 	sort(Adapter->PackInfo, NO_OF_QUEUES, sizeof(PacketInfo),
-		compare_packet_info, NULL);
+	     compare_packet_info, NULL);
 }
 
 static int compare_classifiers(void const *a, void const *b)
@@ -46,5 +46,5 @@ VOID SortClassifiers(PMINI_ADAPTER Adapter)
 	bcm_dbg(Adapter, OTHERS, CONN_MSG, ALL, "<=======\n");
 
 	sort(Adapter->astClassifierTable, MAX_CLASSIFIERS,
-		sizeof(S_CLASSIFIER_RULE), compare_classifiers, NULL);
+	     sizeof(S_CLASSIFIER_RULE), compare_classifiers, NULL);
 }
diff --git a/drivers/staging/bcm/target_params.h b/drivers/staging/bcm/target_params.h
index 1487638..316610e 100644
--- a/drivers/staging/bcm/target_params.h
+++ b/drivers/staging/bcm/target_params.h
@@ -3,77 +3,77 @@
 
 typedef struct _TARGET_PARAMS
 {
-      B_UINT32 m_u32CfgVersion;
+	B_UINT32 m_u32CfgVersion;
 
-      // Scanning Related Params
-      B_UINT32 m_u32CenterFrequency;
-      B_UINT32 m_u32BandAScan;
-      B_UINT32 m_u32BandBScan;
-      B_UINT32 m_u32BandCScan;
+	// Scanning Related Params
+	B_UINT32 m_u32CenterFrequency;
+	B_UINT32 m_u32BandAScan;
+	B_UINT32 m_u32BandBScan;
+	B_UINT32 m_u32BandCScan;
 
 
-      // QoS Params
-      B_UINT32 m_u32ErtpsOptions;
+	// QoS Params
+	B_UINT32 m_u32ErtpsOptions;
 
-      B_UINT32 m_u32PHSEnable;
+	B_UINT32 m_u32PHSEnable;
 
 
-      // HO Params
-      B_UINT32 m_u32HoEnable;
+	// HO Params
+	B_UINT32 m_u32HoEnable;
 
-      B_UINT32 m_u32HoReserved1;
-      B_UINT32 m_u32HoReserved2;
-      // Power Control Params
+	B_UINT32 m_u32HoReserved1;
+	B_UINT32 m_u32HoReserved2;
+	// Power Control Params
 
-      B_UINT32 m_u32MimoEnable;
+	B_UINT32 m_u32MimoEnable;
 
-      B_UINT32 m_u32SecurityEnable;
+	B_UINT32 m_u32SecurityEnable;
 
-      B_UINT32 m_u32PowerSavingModesEnable; //bit 1: 1 Idlemode enable; bit2: 1 Sleepmode Enable
-	  /* PowerSaving Mode Options:
-	     bit 0 = 1: CPE mode - to keep pcmcia if alive;
-	     bit 1 = 1: CINR reporing in Idlemode Msg
-	     bit 2 = 1: Default PSC Enable in sleepmode*/
-      B_UINT32 m_u32PowerSavingModeOptions;
+	B_UINT32 m_u32PowerSavingModesEnable; //bit 1: 1 Idlemode enable; bit2: 1 Sleepmode Enable
+	/* PowerSaving Mode Options:
+	   bit 0 = 1: CPE mode - to keep pcmcia if alive;
+	   bit 1 = 1: CINR reporing in Idlemode Msg
+	   bit 2 = 1: Default PSC Enable in sleepmode*/
+	B_UINT32 m_u32PowerSavingModeOptions;
 
-      B_UINT32 m_u32ArqEnable;
+	B_UINT32 m_u32ArqEnable;
 
-      // From Version #3, the HARQ section renamed as general
-      B_UINT32 m_u32HarqEnable;
-       // EEPROM Param Location
-       B_UINT32  m_u32EEPROMFlag;
-       // BINARY TYPE - 4th MSByte: Interface Type -  3rd MSByte: Vendor Type - 2nd MSByte
-       // Unused - LSByte
-      B_UINT32   m_u32Customize;
-      B_UINT32   m_u32ConfigBW;  /* In Hz */
-      B_UINT32   m_u32ShutDownInitThresholdTimer;
+	// From Version #3, the HARQ section renamed as general
+	B_UINT32 m_u32HarqEnable;
+	// EEPROM Param Location
+	B_UINT32  m_u32EEPROMFlag;
+	// BINARY TYPE - 4th MSByte: Interface Type -  3rd MSByte: Vendor Type - 2nd MSByte
+	// Unused - LSByte
+	B_UINT32   m_u32Customize;
+	B_UINT32   m_u32ConfigBW;  /* In Hz */
+	B_UINT32   m_u32ShutDownInitThresholdTimer;
 
-      B_UINT32  m_u32RadioParameter;
-      B_UINT32  m_u32PhyParameter1;
-      B_UINT32  m_u32PhyParameter2;
-      B_UINT32  m_u32PhyParameter3;
+	B_UINT32  m_u32RadioParameter;
+	B_UINT32  m_u32PhyParameter1;
+	B_UINT32  m_u32PhyParameter2;
+	B_UINT32  m_u32PhyParameter3;
 
-      B_UINT32	  m_u32TestOptions; // in eval mode only; lower 16bits = basic cid for testing; then bit 16 is test cqich,bit 17  test init rang; bit 18 test periodic rang and bit 19 is test harq ack/nack
+	B_UINT32	  m_u32TestOptions; // in eval mode only; lower 16bits = basic cid for testing; then bit 16 is test cqich,bit 17  test init rang; bit 18 test periodic rang and bit 19 is test harq ack/nack
 
 	B_UINT32 m_u32MaxMACDataperDLFrame;
 	B_UINT32 m_u32MaxMACDataperULFrame;
 
 	B_UINT32 m_u32Corr2MacFlags;
 
-    //adding driver params.
+	//adding driver params.
 	B_UINT32 HostDrvrConfig1;
-    B_UINT32 HostDrvrConfig2;
-    B_UINT32 HostDrvrConfig3;
-    B_UINT32 HostDrvrConfig4;
-    B_UINT32 HostDrvrConfig5;
-    B_UINT32 HostDrvrConfig6;
-    B_UINT32 m_u32SegmentedPUSCenable;
+	B_UINT32 HostDrvrConfig2;
+	B_UINT32 HostDrvrConfig3;
+	B_UINT32 HostDrvrConfig4;
+	B_UINT32 HostDrvrConfig5;
+	B_UINT32 HostDrvrConfig6;
+	B_UINT32 m_u32SegmentedPUSCenable;
 
 	// removed SHUT down related 'unused' params from here to sync 4.x and 5.x CFG files..
 
-    //BAMC Related Parameters
-    //Bit 0-15 Band AMC signaling configuration: Bit 1 = 1 – Enable Band AMC signaling.
-    //bit 16-31 Band AMC Data configuration: Bit 16 = 1 – Band AMC 2x3 support.
+	//BAMC Related Parameters
+	//Bit 0-15 Band AMC signaling configuration: Bit 1 = 1 – Enable Band AMC signaling.
+	//bit 16-31 Band AMC Data configuration: Bit 16 = 1 – Band AMC 2x3 support.
 	B_UINT32 m_u32BandAMCEnable;
 
 } stTargetParams,TARGET_PARAMS,*PTARGET_PARAMS, STARGETPARAMS, *PSTARGETPARAMS;
diff --git a/drivers/staging/bcm/vendorspecificextn.c b/drivers/staging/bcm/vendorspecificextn.c
index 4178cd1..da4d0f0 100644
--- a/drivers/staging/bcm/vendorspecificextn.c
+++ b/drivers/staging/bcm/vendorspecificextn.c
@@ -90,7 +90,7 @@ INT vendorextnIoctl(PMINI_ADAPTER Adapter, UINT cmd, ULONG arg)
 //------------------------------------------------------------------
 
 INT vendorextnReadSection(PVOID  pContext, PUCHAR pBuffer, FLASH2X_SECTION_VAL SectionVal,
-			UINT offset, UINT numOfBytes)
+			  UINT offset, UINT numOfBytes)
 {
 	return STATUS_FAILURE;
 }
@@ -115,7 +115,7 @@ INT vendorextnReadSection(PVOID  pContext, PUCHAR pBuffer, FLASH2X_SECTION_VAL S
 //
 //------------------------------------------------------------------
 INT vendorextnWriteSection(PVOID  pContext, PUCHAR pBuffer, FLASH2X_SECTION_VAL SectionVal,
-			UINT offset, UINT numOfBytes, BOOLEAN bVerify)
+			   UINT offset, UINT numOfBytes, BOOLEAN bVerify)
 {
 	return STATUS_FAILURE;
 }
@@ -139,7 +139,7 @@ INT vendorextnWriteSection(PVOID  pContext, PUCHAR pBuffer, FLASH2X_SECTION_VAL
 //
 //------------------------------------------------------------------
 INT vendorextnWriteSectionWithoutErase(PVOID  pContext, PUCHAR pBuffer, FLASH2X_SECTION_VAL SectionVal,
-			UINT offset, UINT numOfBytes)
+				       UINT offset, UINT numOfBytes)
 {
 	return STATUS_FAILURE;
 }
diff --git a/drivers/staging/bcm/vendorspecificextn.h b/drivers/staging/bcm/vendorspecificextn.h
index 7ff1495..f41c51b 100644
--- a/drivers/staging/bcm/vendorspecificextn.h
+++ b/drivers/staging/bcm/vendorspecificextn.h
@@ -9,10 +9,10 @@ INT vendorextnExit(PMINI_ADAPTER Adapter);
 INT vendorextnInit(PMINI_ADAPTER Adapter);
 INT vendorextnIoctl(PMINI_ADAPTER Adapter, UINT cmd, ULONG arg);
 INT vendorextnReadSection(PVOID  pContext, PUCHAR pBuffer, FLASH2X_SECTION_VAL SectionVal,
-			UINT offset, UINT numOfBytes);
+			  UINT offset, UINT numOfBytes);
 INT vendorextnWriteSection(PVOID  pContext, PUCHAR pBuffer, FLASH2X_SECTION_VAL SectionVal,
-			UINT offset, UINT numOfBytes, BOOLEAN bVerify);
+			   UINT offset, UINT numOfBytes, BOOLEAN bVerify);
 INT vendorextnWriteSectionWithoutErase(PVOID  pContext, PUCHAR pBuffer, FLASH2X_SECTION_VAL SectionVal,
-			UINT offset, UINT numOfBytes);
+				       UINT offset, UINT numOfBytes);
 
 #endif /*  */
-- 
1.7.8.111.gad25c.dirty

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



[Index of Archives]     [Linux Driver Backports]     [DMA Engine]     [Linux GPIO]     [Linux SPI]     [Video for Linux]     [Linux USB Devel]     [Linux Coverity]     [Linux Audio Users]     [Linux Kernel]     [Linux SCSI]     [Yosemite Backpacking]
  Powered by Linux