This patch replaces "ULONG" with "unsigned long" in Adapter.h. Signed-off-by: Kevin McKinney <klmckinney1@xxxxxxxxx> --- drivers/staging/bcm/Adapter.h | 34 +++++++++++++++++----------------- 1 file changed, 17 insertions(+), 17 deletions(-) diff --git a/drivers/staging/bcm/Adapter.h b/drivers/staging/bcm/Adapter.h index 1ddeb5a..6b20b77 100644 --- a/drivers/staging/bcm/Adapter.h +++ b/drivers/staging/bcm/Adapter.h @@ -41,8 +41,8 @@ union bcm_ip_address { ULONG ulIpv4Mask[MAX_IP_RANGE_LENGTH]; /* Source Ip Mask Address Range */ }; struct { - ULONG ulIpv6Addr[MAX_IP_RANGE_LENGTH * 4]; /* Source Ip Address Range */ - ULONG ulIpv6Mask[MAX_IP_RANGE_LENGTH * 4]; /* Source Ip Mask Address Range */ + unsigned long ulIpv6Addr[MAX_IP_RANGE_LENGTH * 4]; /* Source Ip Address Range */ + unsigned long ulIpv6Mask[MAX_IP_RANGE_LENGTH * 4]; /* Source Ip Mask Address Range */ }; struct { u8 ucIpv4Address[MAX_IP_RANGE_LENGTH * IP_LENGTH_OF_ADDRESS]; @@ -60,7 +60,7 @@ struct bcm_hdr_suppression_contextinfo { }; struct bcm_classifier_rule { - ULONG ulSFID; + unsigned long ulSFID; u8 ucReserved[2]; B_UINT16 uiClassifierRuleIndex; bool bUsed; @@ -114,7 +114,7 @@ struct bcm_classifier_rule { struct bcm_fragmented_packet_info { bool bUsed; - ULONG ulSrcIpAddress; + unsigned long ulSrcIpAddress; unsigned short usIpIdentification; struct bcm_classifier_rule *pstMatchedClassifierEntry; bool bOutOfOrderFragment; @@ -122,7 +122,7 @@ struct bcm_fragmented_packet_info { struct bcm_packet_info { /* classification extension Rule */ - ULONG ulSFID; + unsigned long ulSFID; unsigned short usVCID_Value; UINT uiThreshold; /* This field determines the priority of the SF Queues */ @@ -199,11 +199,11 @@ struct bcm_tarang_data { bool MacTracingEnabled; bool bApplicationToExit; struct bcm_mibs_dropped_cntrl_msg stDroppedAppCntrlMsgs; - ULONG RxCntrlMsgBitMask; + unsigned long RxCntrlMsgBitMask; }; struct bcm_targetdsx_buffer { - ULONG ulTargetDsxBuffer; + unsigned long ulTargetDsxBuffer; B_UINT16 tid; bool valid; }; @@ -253,8 +253,8 @@ struct bcm_mini_adapter { /*************** qos ******************/ bool bETHCSEnabled; - ULONG BEBucketSize; - ULONG rtPSBucketSize; + unsigned long BEBucketSize; + unsigned long rtPSBucketSize; u8 LinkStatus; bool AutoLinkUp; bool AutoSyncup; @@ -275,9 +275,9 @@ struct bcm_mini_adapter { struct semaphore rdmwrmsync; struct bcm_targetdsx_buffer astTargetDsxBuffer[MAX_TARGET_DSX_BUFFERS]; - ULONG ulFreeTargetBufferCnt; - ULONG ulCurrentTargetBuffer; - ULONG ulTotalTargetBuffersAvailable; + unsigned long ulFreeTargetBufferCnt; + unsigned long ulCurrentTargetBuffer; + unsigned long ulTotalTargetBuffersAvailable; unsigned long chip_id; wait_queue_head_t lowpower_mode_wait_queue; bool bFlashBoot; @@ -294,7 +294,7 @@ struct bcm_mini_adapter { bool bIsAutoCorrectEnabled; bool bDDRInitDone; int DDRSetting; - ULONG ulPowerSaveMode; + unsigned long ulPowerSaveMode; spinlock_t txtransmitlock; B_UINT8 txtransmit_running; /* Thread for control packet handling */ @@ -356,9 +356,9 @@ struct bcm_mini_adapter { * Generally it is Active DSD but in case of NVM RD/WR it might be different. */ UINT ulFlashCalStart; - ULONG ulFlashControlSectionStart; - ULONG ulFlashWriteSize; - ULONG ulFlashID; + unsigned long ulFlashControlSectionStart; + unsigned long ulFlashWriteSize; + unsigned long ulFlashID; FP_FLASH_WRITE fpFlashWrite; FP_FLASH_WRITE_STATUS fpFlashWriteWithStatusCheck; @@ -390,7 +390,7 @@ struct bcm_mini_adapter { bool StopAllXaction; UINT32 liTimeSinceLastNetEntry; /* Used to Support extended CAPI requirements from */ struct semaphore LowPowerModeSync; - ULONG liDrainCalculated; + unsigned long liDrainCalculated; UINT gpioBitMap; struct bcm_debug_state stDebugState; }; -- 1.7.9.5 _______________________________________________ devel mailing list devel@xxxxxxxxxxxxxxxxxxxxxx http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel