Commit f70c8a91 authored by Lisa Nguyen's avatar Lisa Nguyen Committed by Greg Kroah-Hartman
Browse files

staging: bcm: Replace FALSE with false 



Replace user-defined type FALSE with C defined false keyword.

Signed-off-by: default avatarLisa Nguyen <lisa@xenapiadmin.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 3abd6f11

drivers/staging/bcm/Bcmchar.c

+22 −22
Original line number Diff line number Diff line
@@ -119,7 +119,7 @@ static ssize_t bcm_char_read(struct file *filp, char __user *buf, size_t size, 
		return -ENODEV;

	}



	if (FALSE == Adapter->fw_download_done)

	if (false == Adapter->fw_download_done)

		return -EACCES;



	down(&Adapter->RxAppControlQueuelock);
@@ -180,7 +180,7 @@ static long bcm_char_ioctl(struct file *filp, UINT cmd, ULONG arg) 
	if (Adapter->device_removed)

		return -EFAULT;



	if (FALSE == Adapter->fw_download_done) {

	if (false == Adapter->fw_download_done) {

		switch (cmd) {

		case IOCTL_MAC_ADDR_REQ:

		case IOCTL_LINK_REQ:
@@ -425,7 +425,7 @@ static long bcm_char_ioctl(struct file *filp, UINT cmd, ULONG arg) 
		uiOperation = gpio_info.uiGpioValue;

		value = (1<<uiBit);



		if (IsReqGpioIsLedInNVM(Adapter, value) == FALSE) {

		if (IsReqGpioIsLedInNVM(Adapter, value) == false) {

			BCM_DEBUG_PRINT(Adapter, DBG_TYPE_OTHERS, OSAL_DBG, DBG_LVL_ALL, "Sorry, Requested GPIO<0x%X> is not correspond to LED !!!", value);

			Status = -EINVAL;

			break;
@@ -572,7 +572,7 @@ static long bcm_char_ioctl(struct file *filp, UINT cmd, ULONG arg) 
		if (copy_from_user(&gpio_multi_info, IoBuffer.InputBuffer, IoBuffer.InputLength))

			return -EFAULT;



		if (IsReqGpioIsLedInNVM(Adapter, pgpio_multi_info[WIMAX_IDX].uiGPIOMask) == FALSE) {

		if (IsReqGpioIsLedInNVM(Adapter, pgpio_multi_info[WIMAX_IDX].uiGPIOMask) == false) {

			BCM_DEBUG_PRINT(Adapter, DBG_TYPE_OTHERS, OSAL_DBG, DBG_LVL_ALL,

					"Sorry, Requested GPIO<0x%X> is not correspond to NVM LED bit map<0x%X>!!!",

					pgpio_multi_info[WIMAX_IDX].uiGPIOMask, Adapter->gpioBitMap);
@@ -665,7 +665,7 @@ static long bcm_char_ioctl(struct file *filp, UINT cmd, ULONG arg) 
		}



		/* Validating the request */

		if (IsReqGpioIsLedInNVM(Adapter, pgpio_multi_mode[WIMAX_IDX].uiGPIOMask) == FALSE) {

		if (IsReqGpioIsLedInNVM(Adapter, pgpio_multi_mode[WIMAX_IDX].uiGPIOMask) == false) {

			BCM_DEBUG_PRINT(Adapter, DBG_TYPE_OTHERS, OSAL_DBG, DBG_LVL_ALL,

					"Sorry, Requested GPIO<0x%X> is not correspond to NVM LED bit map<0x%X>!!!",

					pgpio_multi_mode[WIMAX_IDX].uiGPIOMask, Adapter->gpioBitMap);
@@ -768,10 +768,10 @@ static long bcm_char_ioctl(struct file *filp, UINT cmd, ULONG arg) 
		if (down_trylock(&Adapter->fw_download_sema))

			return -EBUSY;



		Adapter->bBinDownloaded = FALSE;

		Adapter->bBinDownloaded = false;

		Adapter->fw_download_process_pid = current->pid;

		Adapter->bCfgDownloaded = FALSE;

		Adapter->fw_download_done = FALSE;

		Adapter->bCfgDownloaded = false;

		Adapter->fw_download_done = false;

		netif_carrier_off(Adapter->dev);

		netif_stop_queue(Adapter->dev);

		Status = reset_card_proc(Adapter);
@@ -848,7 +848,7 @@ static long bcm_char_ioctl(struct file *filp, UINT cmd, ULONG arg) 


			if (Adapter->LEDInfo.led_thread_running & BCM_LED_THREAD_RUNNING_ACTIVELY) {

				Adapter->DriverState = DRIVER_INIT;

				Adapter->LEDInfo.bLedInitDone = FALSE;

				Adapter->LEDInfo.bLedInitDone = false;

				wake_up(&Adapter->LEDInfo.notify_led_event);

			}

		}
@@ -900,7 +900,7 @@ static long bcm_char_ioctl(struct file *filp, UINT cmd, ULONG arg) 
			BCM_DEBUG_PRINT(Adapter, DBG_TYPE_PRINTK, 0, 0, "Unable to send interrupt...\n");



		timeout = 5*HZ;

		Adapter->waiting_to_fw_download_done = FALSE;

		Adapter->waiting_to_fw_download_done = false;

		wait_event_timeout(Adapter->ioctl_fw_dnld_wait_queue,

				Adapter->waiting_to_fw_download_done, timeout);

		Adapter->fw_download_process_pid = INVALID_PID;
@@ -1052,7 +1052,7 @@ static long bcm_char_ioctl(struct file *filp, UINT cmd, ULONG arg) 
		if (tracing_flag)

			Adapter->pTarangs->MacTracingEnabled = TRUE;

		else

			Adapter->pTarangs->MacTracingEnabled = FALSE;

			Adapter->pTarangs->MacTracingEnabled = false;

		break;

	}
@@ -1109,7 +1109,7 @@ static long bcm_char_ioctl(struct file *filp, UINT cmd, ULONG arg) 
	}



	case IOCTL_BCM_WAKE_UP_DEVICE_FROM_IDLE:

		if ((FALSE == Adapter->bTriedToWakeUpFromlowPowerMode) && (TRUE == Adapter->IdleMode)) {

		if ((false == Adapter->bTriedToWakeUpFromlowPowerMode) && (TRUE == Adapter->IdleMode)) {

			Adapter->usIdleModePattern = ABORT_IDLE_MODE;

			Adapter->bWakeUpDevice = TRUE;

			wake_up(&Adapter->process_rx_cntrlpkt);
@@ -1168,7 +1168,7 @@ static long bcm_char_ioctl(struct file *filp, UINT cmd, ULONG arg) 
			break;

		}



		if (pBulkBuffer->SwapEndian == FALSE)

		if (pBulkBuffer->SwapEndian == false)

			Status = wrmWithLock(Adapter, (UINT)pBulkBuffer->Register, (PCHAR)pBulkBuffer->Values, IoBuffer.InputLength - 2*sizeof(ULONG));

		else

			Status = wrmaltWithLock(Adapter, (UINT)pBulkBuffer->Register, (PUINT)pBulkBuffer->Values, IoBuffer.InputLength - 2*sizeof(ULONG));
@@ -1387,7 +1387,7 @@ static long bcm_char_ioctl(struct file *filp, UINT cmd, ULONG arg) 
			if (IsFlash2x(Adapter))

				BcmFlash2xWriteSig(Adapter, Adapter->eActiveDSD);



			Adapter->bHeaderChangeAllowed = FALSE;

			Adapter->bHeaderChangeAllowed = false;



			up(&Adapter->NVMRdmWrmLock);
@@ -1432,7 +1432,7 @@ static long bcm_char_ioctl(struct file *filp, UINT cmd, ULONG arg) 
		BCM_DEBUG_PRINT(Adapter, DBG_TYPE_OTHERS, OSAL_DBG, DBG_LVL_ALL, "\nsFlash2xRead.bVerify :%x\n", sFlash2xRead.bVerify);



		/* This was internal to driver for raw read. now it has ben exposed to user space app. */

		if (validateFlash2xReadWrite(Adapter, &sFlash2xRead) == FALSE)

		if (validateFlash2xReadWrite(Adapter, &sFlash2xRead) == false)

			return STATUS_FAILURE;



		NOB = sFlash2xRead.numOfBytes;
@@ -1510,7 +1510,7 @@ static long bcm_char_ioctl(struct file *filp, UINT cmd, ULONG arg) 
		}



		/* First make this False so that we can enable the Sector Permission Check in BeceemFlashBulkWrite */

		Adapter->bAllDSDWriteAllow = FALSE;

		Adapter->bAllDSDWriteAllow = false;



		BCM_DEBUG_PRINT(Adapter, DBG_TYPE_OTHERS, OSAL_DBG, DBG_LVL_ALL, "IOCTL_BCM_FLASH2X_SECTION_WRITE Called");
@@ -1531,7 +1531,7 @@ static long bcm_char_ioctl(struct file *filp, UINT cmd, ULONG arg) 
			return -EINVAL;

		}



		if (validateFlash2xReadWrite(Adapter, &sFlash2xWrite) == FALSE)

		if (validateFlash2xReadWrite(Adapter, &sFlash2xWrite) == false)

			return STATUS_FAILURE;



		InputAddr = sFlash2xWrite.pDataBuff;
@@ -1686,7 +1686,7 @@ static long bcm_char_ioctl(struct file *filp, UINT cmd, ULONG arg) 


	case IOCTL_BCM_IDENTIFY_ACTIVE_SECTION: {

		/* Right Now we are taking care of only DSD */

		Adapter->bAllDSDWriteAllow = FALSE;

		Adapter->bAllDSDWriteAllow = false;

		BCM_DEBUG_PRINT(Adapter, DBG_TYPE_OTHERS, OSAL_DBG, DBG_LVL_ALL, "IOCTL_BCM_IDENTIFY_ACTIVE_SECTION called");

		Status = STATUS_SUCCESS;

	}
@@ -1697,7 +1697,7 @@ static long bcm_char_ioctl(struct file *filp, UINT cmd, ULONG arg) 
		Status = STATUS_SUCCESS;

		BCM_DEBUG_PRINT(Adapter, DBG_TYPE_OTHERS, OSAL_DBG, DBG_LVL_ALL, "IOCTL_BCM_COPY_SECTION  Called");



		Adapter->bAllDSDWriteAllow = FALSE;

		Adapter->bAllDSDWriteAllow = false;

		if (IsFlash2x(Adapter) != TRUE) {

			BCM_DEBUG_PRINT(Adapter, DBG_TYPE_PRINTK, 0, 0, "Flash Does not have 2.x map");

			return -EINVAL;
@@ -1720,12 +1720,12 @@ static long bcm_char_ioctl(struct file *filp, UINT cmd, ULONG arg) 
		BCM_DEBUG_PRINT(Adapter, DBG_TYPE_OTHERS, OSAL_DBG, DBG_LVL_ALL, "offset :%x", sCopySectStrut.offset);

		BCM_DEBUG_PRINT(Adapter, DBG_TYPE_OTHERS, OSAL_DBG, DBG_LVL_ALL, "NOB :%x", sCopySectStrut.numOfBytes);



		if (IsSectionExistInFlash(Adapter, sCopySectStrut.SrcSection) == FALSE) {

		if (IsSectionExistInFlash(Adapter, sCopySectStrut.SrcSection) == false) {

			BCM_DEBUG_PRINT(Adapter, DBG_TYPE_PRINTK, 0, 0, "Source Section<%x> does not exixt in Flash ", sCopySectStrut.SrcSection);

			return -EINVAL;

		}



		if (IsSectionExistInFlash(Adapter, sCopySectStrut.DstSection) == FALSE) {

		if (IsSectionExistInFlash(Adapter, sCopySectStrut.DstSection) == false) {

			BCM_DEBUG_PRINT(Adapter, DBG_TYPE_PRINTK, 0, 0, "Destinatio Section<%x> does not exixt in Flash ", sCopySectStrut.DstSection);

			return -EINVAL;

		}
@@ -1924,7 +1924,7 @@ static long bcm_char_ioctl(struct file *filp, UINT cmd, ULONG arg) 
				OutPutBuff = OutPutBuff + ReadBytes;

			}

		}

		Adapter->bFlashRawRead = FALSE;

		Adapter->bFlashRawRead = false;

		up(&Adapter->NVMRdmWrmLock);

		kfree(pReadBuff);

		break;

drivers/staging/bcm/Bcmnet.c

+1 −1
Original line number Diff line number Diff line
@@ -6,7 +6,7 @@ static INT bcm_open(struct net_device *dev) 
{

	struct bcm_mini_adapter *Adapter = GET_BCM_ADAPTER(dev);



	if (Adapter->fw_download_done == FALSE) {

	if (Adapter->fw_download_done == false) {

		pr_notice(PFX "%s: link up failed (download in progress)\n",

			  dev->name);

		return -EBUSY;

drivers/staging/bcm/CmHost.c

+27 −27
Original line number Diff line number Diff line
@@ -256,7 +256,7 @@ static inline VOID CopyClassifierRuleToSF(struct bcm_mini_adapter *Adapter, stru 
	pstClassifierEntry = &Adapter->astClassifierTable[nClassifierIndex];

	if (pstClassifierEntry) {

		/* Store if Ipv6 */

		pstClassifierEntry->bIpv6Protocol = (Adapter->PackInfo[uiSearchRuleIndex].ucIpVersion == IPV6) ? TRUE : FALSE;

		pstClassifierEntry->bIpv6Protocol = (Adapter->PackInfo[uiSearchRuleIndex].ucIpVersion == IPV6) ? TRUE : false;



		/* Destinaiton Port */

		pstClassifierEntry->ucDestPortRangeLength = psfCSType->cCPacketClassificationRule.u8ProtocolDestPortRangeLength / 4;
@@ -301,7 +301,7 @@ static inline VOID CopyClassifierRuleToSF(struct bcm_mini_adapter *Adapter, stru 
				psfCSType->cCPacketClassificationRule.u8IPDestinationAddressLength,

				psfCSType->cCPacketClassificationRule.u8IPDestinationAddress,

				(Adapter->PackInfo[uiSearchRuleIndex].ucIpVersion == IPV6) ?

			TRUE : FALSE, eDestIpAddress);

			TRUE : false, eDestIpAddress);



		/* Source Ip Address and Mask */

		BCM_DEBUG_PRINT(Adapter, DBG_TYPE_OTHERS, CONN_MSG, DBG_LVL_ALL, "Ip Source Parameters : ");
@@ -309,7 +309,7 @@ static inline VOID CopyClassifierRuleToSF(struct bcm_mini_adapter *Adapter, stru 
		CopyIpAddrToClassifier(pstClassifierEntry,

				psfCSType->cCPacketClassificationRule.u8IPMaskedSourceAddressLength,

				psfCSType->cCPacketClassificationRule.u8IPMaskedSourceAddress,

				(Adapter->PackInfo[uiSearchRuleIndex].ucIpVersion == IPV6) ? TRUE : FALSE,

				(Adapter->PackInfo[uiSearchRuleIndex].ucIpVersion == IPV6) ? TRUE : false,

				eSrcIpAddress);



		/* TOS */
@@ -383,7 +383,7 @@ static inline VOID DeleteClassifierRuleFromSF(struct bcm_mini_adapter *Adapter, 
	u16PacketClassificationRuleIndex = Adapter->astClassifierTable[nClassifierIndex].uiClassifierRuleIndex;

	pstClassifierEntry = &Adapter->astClassifierTable[nClassifierIndex];

	if (pstClassifierEntry) {

		pstClassifierEntry->bUsed = FALSE;

		pstClassifierEntry->bUsed = false;

		pstClassifierEntry->uiClassifierRuleIndex = 0;

		memset(pstClassifierEntry, 0, sizeof(struct bcm_classifier_rule));
@@ -685,7 +685,7 @@ static VOID CopyToAdapter(register struct bcm_mini_adapter *Adapter, /* <Pointer 
							memcpy(sPhsRule.u8PHSF, psfCSType->cPhsRule.u8PHSF, MAX_PHS_LENGTHS);

							memcpy(sPhsRule.u8PHSM, psfCSType->cPhsRule.u8PHSM, MAX_PHS_LENGTHS);

							sPhsRule.u8RefCnt = 0;

							sPhsRule.bUnclassifiedPHSRule = FALSE;

							sPhsRule.bUnclassifiedPHSRule = false;

							sPhsRule.PHSModifiedBytes = 0;

							sPhsRule.PHSModifiedNumPackets = 0;

							sPhsRule.PHSErrorNumPackets = 0;
@@ -1577,7 +1577,7 @@ static ULONG GetNextTargetBufferLocation(struct bcm_mini_adapter *Adapter, B_UIN 
	ULONG idx, max_try;



	if ((Adapter->ulTotalTargetBuffersAvailable == 0) || (Adapter->ulFreeTargetBufferCnt == 0)) {

		ClearTargetDSXBuffer(Adapter, tid, FALSE);

		ClearTargetDSXBuffer(Adapter, tid, false);

		return 0;

	}
@@ -1590,7 +1590,7 @@ static ULONG GetNextTargetBufferLocation(struct bcm_mini_adapter *Adapter, B_UIN 


	if (max_try == 0) {

		BCM_DEBUG_PRINT(Adapter, DBG_TYPE_PRINTK, 0, 0, "\n GetNextTargetBufferLocation : Error No Free Target DSX Buffers FreeCnt : %lx ", Adapter->ulFreeTargetBufferCnt);

		ClearTargetDSXBuffer(Adapter, tid, FALSE);

		ClearTargetDSXBuffer(Adapter, tid, false);

		return 0;

	}
@@ -1644,9 +1644,9 @@ bool CmControlResponseMessage(struct bcm_mini_adapter *Adapter, /* <Pointer to 
	 */

	pstAddIndication = RestoreCmControlResponseMessage(Adapter, pvBuffer);

	if (pstAddIndication == NULL) {

		ClearTargetDSXBuffer(Adapter, ((struct bcm_add_indication *)pvBuffer)->u16TID, FALSE);

		ClearTargetDSXBuffer(Adapter, ((struct bcm_add_indication *)pvBuffer)->u16TID, false);

		BCM_DEBUG_PRINT(Adapter, DBG_TYPE_PRINTK, 0, 0, "Error in restoring Service Flow param structure from DSx message");

		return FALSE;

		return false;

	}



	DumpCmControlPacket(pstAddIndication);
@@ -1656,7 +1656,7 @@ bool CmControlResponseMessage(struct bcm_mini_adapter *Adapter, /* <Pointer to 
	pLeader->Status = CM_CONTROL_NEWDSX_MULTICLASSIFIER_REQ;

	pLeader->Vcid = 0;



	ClearTargetDSXBuffer(Adapter, pstAddIndication->u16TID, FALSE);

	ClearTargetDSXBuffer(Adapter, pstAddIndication->u16TID, false);

	BCM_DEBUG_PRINT(Adapter, DBG_TYPE_PRINTK, 0, 0, "### TID RECEIVED %d\n", pstAddIndication->u16TID);

	switch (pstAddIndication->u8Type) {

	case DSA_REQ:
@@ -1708,9 +1708,9 @@ bool CmControlResponseMessage(struct bcm_mini_adapter *Adapter, /* <Pointer to 
			if (pstAddIndication->sfAdmittedSet.bValid == TRUE)

				Adapter->PackInfo[uiSearchRuleIndex].bAdmittedSet = TRUE;



			if (pstAddIndication->sfActiveSet.bValid == FALSE) {

				Adapter->PackInfo[uiSearchRuleIndex].bActive = FALSE;

				Adapter->PackInfo[uiSearchRuleIndex].bActivateRequestSent = FALSE;

			if (pstAddIndication->sfActiveSet.bValid == false) {

				Adapter->PackInfo[uiSearchRuleIndex].bActive = false;

				Adapter->PackInfo[uiSearchRuleIndex].bActivateRequestSent = false;

				if (pstAddIndication->sfAdmittedSet.bValid)

					psfLocalSet = &pstAddIndication->sfAdmittedSet;

				else if (pstAddIndication->sfAuthorizedSet.bValid)
@@ -1722,8 +1722,8 @@ bool CmControlResponseMessage(struct bcm_mini_adapter *Adapter, /* <Pointer to 


			if (!psfLocalSet) {

				BCM_DEBUG_PRINT(Adapter, DBG_TYPE_PRINTK, 0, 0, "No set is valid\n");

				Adapter->PackInfo[uiSearchRuleIndex].bActive = FALSE;

				Adapter->PackInfo[uiSearchRuleIndex].bValid = FALSE;

				Adapter->PackInfo[uiSearchRuleIndex].bActive = false;

				Adapter->PackInfo[uiSearchRuleIndex].bValid = false;

				Adapter->PackInfo[uiSearchRuleIndex].usVCID_Value = 0;

				kfree(pstAddIndication);

			} else if (psfLocalSet->bValid && (pstAddIndication->u8CC == 0)) {
@@ -1759,15 +1759,15 @@ bool CmControlResponseMessage(struct bcm_mini_adapter *Adapter, /* <Pointer to 
					}

				}

			} else {

				Adapter->PackInfo[uiSearchRuleIndex].bActive = FALSE;

				Adapter->PackInfo[uiSearchRuleIndex].bValid = FALSE;

				Adapter->PackInfo[uiSearchRuleIndex].bActive = false;

				Adapter->PackInfo[uiSearchRuleIndex].bValid = false;

				Adapter->PackInfo[uiSearchRuleIndex].usVCID_Value = 0;

				kfree(pstAddIndication);

			}

		} else {

			BCM_DEBUG_PRINT(Adapter, DBG_TYPE_PRINTK, 0, 0, "DSA ACK did not get valid SFID");

			kfree(pstAddIndication);

			return FALSE;

			return false;

		}

	}

	break;
@@ -1812,9 +1812,9 @@ bool CmControlResponseMessage(struct bcm_mini_adapter *Adapter, /* <Pointer to 
			if (pstChangeIndication->sfAdmittedSet.bValid == TRUE)

				Adapter->PackInfo[uiSearchRuleIndex].bAdmittedSet = TRUE;



			if (pstChangeIndication->sfActiveSet.bValid == FALSE) {

				Adapter->PackInfo[uiSearchRuleIndex].bActive = FALSE;

				Adapter->PackInfo[uiSearchRuleIndex].bActivateRequestSent = FALSE;

			if (pstChangeIndication->sfActiveSet.bValid == false) {

				Adapter->PackInfo[uiSearchRuleIndex].bActive = false;

				Adapter->PackInfo[uiSearchRuleIndex].bActivateRequestSent = false;



				if (pstChangeIndication->sfAdmittedSet.bValid)

					psfLocalSet = &pstChangeIndication->sfAdmittedSet;
@@ -1827,8 +1827,8 @@ bool CmControlResponseMessage(struct bcm_mini_adapter *Adapter, /* <Pointer to 


			if (!psfLocalSet) {

				BCM_DEBUG_PRINT(Adapter, DBG_TYPE_PRINTK, 0, 0, "No set is valid\n");

				Adapter->PackInfo[uiSearchRuleIndex].bActive = FALSE;

				Adapter->PackInfo[uiSearchRuleIndex].bValid = FALSE;

				Adapter->PackInfo[uiSearchRuleIndex].bActive = false;

				Adapter->PackInfo[uiSearchRuleIndex].bValid = false;

				Adapter->PackInfo[uiSearchRuleIndex].usVCID_Value = 0;

				kfree(pstAddIndication);

			} else if (psfLocalSet->bValid && (pstChangeIndication->u8CC == 0)) {
@@ -1847,7 +1847,7 @@ bool CmControlResponseMessage(struct bcm_mini_adapter *Adapter, /* <Pointer to 
		} else {

			BCM_DEBUG_PRINT(Adapter, DBG_TYPE_PRINTK, 0, 0, "DSC ACK did not get valid SFID");

			kfree(pstAddIndication);

			return FALSE;

			return false;

		}

	}

	break;
@@ -1883,7 +1883,7 @@ bool CmControlResponseMessage(struct bcm_mini_adapter *Adapter, /* <Pointer to 
		break;

	default:

		kfree(pstAddIndication);

		return FALSE;

		return false;

	}

	return TRUE;

}
@@ -1934,13 +1934,13 @@ VOID OverrideServiceFlowParams(struct bcm_mini_adapter *Adapter, PUINT puiBuffer 
			continue;

		}



		if (pHostInfo->RetainSF == FALSE) {

		if (pHostInfo->RetainSF == false) {

			BCM_DEBUG_PRINT(Adapter, DBG_TYPE_OTHERS, CONN_MSG, DBG_LVL_ALL, "Going to Delete SF");

			deleteSFBySfid(Adapter, uiSearchRuleIndex);

		} else {

			Adapter->PackInfo[uiSearchRuleIndex].usVCID_Value = ntohs(pHostInfo->VCID);

			Adapter->PackInfo[uiSearchRuleIndex].usCID = ntohs(pHostInfo->newCID);

			Adapter->PackInfo[uiSearchRuleIndex].bActive = FALSE;

			Adapter->PackInfo[uiSearchRuleIndex].bActive = false;



			BCM_DEBUG_PRINT(Adapter, DBG_TYPE_OTHERS, CONN_MSG, DBG_LVL_ALL, "pHostInfo->QoSParamSet: 0x%x\n", pHostInfo->QoSParamSet);

drivers/staging/bcm/DDRInit.c

+1 −1
Original line number Diff line number Diff line
@@ -1106,7 +1106,7 @@ int download_ddr_settings(struct bcm_mini_adapter *Adapter) 
	unsigned long ul_ddr_setting_load_addr = DDR_DUMP_INTERNAL_DEVICE_MEMORY;

	UINT  value = 0;

	int retval = STATUS_SUCCESS;

	bool bOverrideSelfRefresh = FALSE;

	bool bOverrideSelfRefresh = false;



	switch (Adapter->chip_id)

	{

drivers/staging/bcm/HandleControlPacket.c

+5 −5
Original line number Diff line number Diff line
@@ -14,7 +14,7 @@ 
static VOID handle_rx_control_packet(struct bcm_mini_adapter *Adapter, struct sk_buff *skb)

{

	struct bcm_tarang_data *pTarang = NULL;

	bool HighPriorityMessage = FALSE;

	bool HighPriorityMessage = false;

	struct sk_buff *newPacket = NULL;

	CHAR cntrl_msg_mask_bit = 0;

	bool drop_pkt_flag = TRUE;
@@ -91,13 +91,13 @@ static VOID handle_rx_control_packet(struct bcm_mini_adapter *Adapter, struct sk 
		 *	cntrl_msg_mask_bit);

		 */

		if (pTarang->RxCntrlMsgBitMask & (1 << cntrl_msg_mask_bit))

			drop_pkt_flag = FALSE;

			drop_pkt_flag = false;



		if ((drop_pkt_flag == TRUE) ||

				(pTarang->AppCtrlQueueLen > MAX_APP_QUEUE_LEN)

				|| ((pTarang->AppCtrlQueueLen >

					MAX_APP_QUEUE_LEN / 2) &&

				    (HighPriorityMessage == FALSE))) {

				    (HighPriorityMessage == false))) {

			/*

			 * Assumption:-

			 * 1. every tarang manages it own dropped pkt
@@ -175,8 +175,8 @@ int control_packet_handler(struct bcm_mini_adapter *Adapter /* pointer to adapte 
			return 0;

		}

		if (TRUE == Adapter->bWakeUpDevice) {

			Adapter->bWakeUpDevice = FALSE;

			if ((FALSE == Adapter->bTriedToWakeUpFromlowPowerMode)

			Adapter->bWakeUpDevice = false;

			if ((false == Adapter->bTriedToWakeUpFromlowPowerMode)

					&& ((TRUE == Adapter->IdleMode) ||

					    (TRUE == Adapter->bShutStatus))) {

				BCM_DEBUG_PRINT(Adapter, DBG_TYPE_OTHERS,