diff options
| author | Linux Build Service Account <lnxbuild@localhost> | 2017-03-24 14:10:05 -0700 |
|---|---|---|
| committer | Gerrit - the friendly Code Review server <code-review@localhost> | 2017-03-24 14:10:05 -0700 |
| commit | 78b04f4ff292e16f64f8a3e02835f50b380c5cbf (patch) | |
| tree | c6d7c8284c47d777e5aefadfcded84077d270e94 | |
| parent | 4e5d7e5a3e54ab6e6c7c9425896adf31a7a7e148 (diff) | |
| parent | b2edf77e0d8cf8d67939fc7f82fd24f204a0c687 (diff) | |
Merge "qcacld-3.0: Fix "no space before tabs" style errors"
| -rw-r--r-- | core/cds/inc/cds_api.h | 3 | ||||
| -rw-r--r-- | core/dp/txrx/ol_txrx_internal.h | 2 | ||||
| -rw-r--r-- | core/hdd/src/wlan_hdd_cfg80211.h | 10 | ||||
| -rw-r--r-- | core/hdd/src/wlan_hdd_ioctl.c | 8 | ||||
| -rw-r--r-- | core/mac/src/pe/lim/lim_utils.c | 2 | ||||
| -rw-r--r-- | core/sme/src/common/sme_api.c | 5 | ||||
| -rw-r--r-- | core/sme/src/csr/csr_neighbor_roam.c | 8 | ||||
| -rw-r--r-- | core/wma/src/wma_utils.c | 4 |
8 files changed, 20 insertions, 22 deletions
diff --git a/core/cds/inc/cds_api.h b/core/cds/inc/cds_api.h index b0f71a918bd8..f5854fb27491 100644 --- a/core/cds/inc/cds_api.h +++ b/core/cds/inc/cds_api.h @@ -77,8 +77,7 @@ enum cds_driver_state { /** * struct cds_sme_cbacks - list of sme functions registered with * CDS - * @sme_get_valid_channels: gets the valid channel list for - * current reg domain + * @sme_get_valid_channels: gets the valid channel list for current reg domain * @sme_get_nss_for_vdev: gets the nss allowed for the vdev type */ struct cds_sme_cbacks { diff --git a/core/dp/txrx/ol_txrx_internal.h b/core/dp/txrx/ol_txrx_internal.h index 4c9a6c70ea90..459d780a795b 100644 --- a/core/dp/txrx/ol_txrx_internal.h +++ b/core/dp/txrx/ol_txrx_internal.h @@ -278,7 +278,7 @@ ol_rx_mpdu_list_next(struct ol_txrx_pdev_t *pdev, break; \ case htt_tx_status_no_ack: \ TXRX_STATS_ADD(_pdev, pub.tx.dropped.no_ack.pkts, \ - _p_cntrs); \ + _p_cntrs); \ TXRX_STATS_ADD(_pdev, pub.tx.dropped.no_ack.bytes, \ _b_cntrs); \ break; \ diff --git a/core/hdd/src/wlan_hdd_cfg80211.h b/core/hdd/src/wlan_hdd_cfg80211.h index de3c37eb1ad9..3cfd8b773ac8 100644 --- a/core/hdd/src/wlan_hdd_cfg80211.h +++ b/core/hdd/src/wlan_hdd_cfg80211.h @@ -249,13 +249,13 @@ typedef enum { * @QCA_NL80211_VENDOR_SUBCMD_DFS_OFFLOAD_CAC_STARTED: Indicate that driver * started CAC on DFS channel * @QCA_NL80211_VENDOR_SUBCMD_DFS_OFFLOAD_CAC_FINISHED: Indicate that driver - * completed the CAC check on DFS channel + * completed the CAC check on DFS channel * @QCA_NL80211_VENDOR_SUBCMD_DFS_OFFLOAD_CAC_ABORTED: Indicate that the CAC - * check was aborted by the driver + * check was aborted by the driver * @QCA_NL80211_VENDOR_SUBCMD_DFS_OFFLOAD_CAC_NOP_FINISHED: Indicate that the - * driver completed NOP + * driver completed NOP * @QCA_NL80211_VENDOR_SUBCMD_DFS_OFFLOAD_RADAR_DETECTED: Indicate that the - * driver detected radar signal on the current operating channel + * driver detected radar signal on the current operating channel * @QCA_NL80211_VENDOR_SUBCMD_GET_WIFI_INFO: get wlan driver information * @QCA_NL80211_VENDOR_SUBCMD_WIFI_LOGGER_START: start wifi logger * @QCA_NL80211_VENDOR_SUBCMD_WIFI_LOGGER_MEMORY_DUMP: memory dump request @@ -3648,7 +3648,7 @@ static inline int wlan_hdd_send_roam_auth_event(hdd_adapter_t *adapter, int wlan_hdd_cfg80211_update_apies(hdd_adapter_t *adapter); #if !(defined (SUPPORT_WDEV_CFG80211_VENDOR_EVENT_ALLOC)) && \ - (LINUX_VERSION_CODE < KERNEL_VERSION(4, 1, 0)) && \ + (LINUX_VERSION_CODE < KERNEL_VERSION(4, 1, 0)) && \ !(defined(WITH_BACKPORTS)) static inline struct sk_buff * diff --git a/core/hdd/src/wlan_hdd_ioctl.c b/core/hdd/src/wlan_hdd_ioctl.c index 7c5c0763843f..6add68d8b95d 100644 --- a/core/hdd/src/wlan_hdd_ioctl.c +++ b/core/hdd/src/wlan_hdd_ioctl.c @@ -991,7 +991,7 @@ static int hdd_parse_reassoc_v1(hdd_adapter_t *adapter, const char *command) * hdd_parse_reassoc_v2() - parse version 2 of the REASSOC command * @adapter: Adapter upon which the command was received * @command: Command that was received, ASCII command - * followed by binary data + * followed by binary data * * This function parses the v2 REASSOC command with the format * @@ -1250,7 +1250,7 @@ hdd_parse_sendactionframe_v1(hdd_adapter_t *adapter, const char *command) * SENDACTIONFRAME command * @adapter: Adapter upon which the command was received * @command: Command that was received, ASCII command - * followed by binary data + * followed by binary data * * This function parses the v2 SENDACTIONFRAME command with the format * @@ -1352,7 +1352,7 @@ hdd_parse_sendactionframe(hdd_adapter_t *adapter, const char *command, * hdd_parse_channellist() - HDD Parse channel list * @pValue: Pointer to input channel list * @ChannelList: Pointer to local output array to record - * channel list + * channel list * @pNumChannels: Pointer to number of roam scan channels * * This function parses the channel list passed in the format @@ -1525,7 +1525,7 @@ exit: * SETROAMSCANCHANNELS command * @adapter: Adapter upon which the command was received * @command: Command that was received, ASCII command - * followed by binary data + * followed by binary data * * This function parses the v2 SETROAMSCANCHANNELS command with the format * diff --git a/core/mac/src/pe/lim/lim_utils.c b/core/mac/src/pe/lim/lim_utils.c index ba2a46d0be81..c8bb6857898e 100644 --- a/core/mac/src/pe/lim/lim_utils.c +++ b/core/mac/src/pe/lim/lim_utils.c @@ -7263,7 +7263,7 @@ void lim_send_set_dtim_period(tpAniSirGlobal mac_ctx, uint8_t dtim_period, * * Frame treat as duplicate: * if retry bit is set and - * if source address and seq number matches with the last processed frame + * if source address and seq number matches with the last processed frame * * Return: false if duplicate frame, else true. */ diff --git a/core/sme/src/common/sme_api.c b/core/sme/src/common/sme_api.c index f2ec7c49a73b..09f4feab65e4 100644 --- a/core/sme/src/common/sme_api.c +++ b/core/sme/src/common/sme_api.c @@ -4613,7 +4613,7 @@ QDF_STATUS sme_get_config_param(tHalHandle hHal, tSmeConfigParams *pParam) * sme_cfg_set_int() - Sets the cfg parameter value. * @hal: Handle to hal. * @cfg_id: Configuration parameter ID. - * @value: value to be saved in the cfg parameter. + * @value: value to be saved in the cfg parameter. * * This function sets the string value in cfg parameter. * @@ -4657,8 +4657,7 @@ QDF_STATUS sme_cfg_set_str(tHalHandle hal, uint16_t cfg_id, uint8_t *str, * sme_cfg_get_int() - Gets the cfg parameter value. * @hal: Handle to hal. * @cfg_id: Configuration parameter ID. - * @cfg_value: Pointer to variable in which cfg value - * will be saved. + * @cfg_value: Pointer to variable in which cfg value will be saved. * * This function gets the value of the cfg parameter. * diff --git a/core/sme/src/csr/csr_neighbor_roam.c b/core/sme/src/csr/csr_neighbor_roam.c index 442b548c8bbf..6215a6ad9207 100644 --- a/core/sme/src/csr/csr_neighbor_roam.c +++ b/core/sme/src/csr/csr_neighbor_roam.c @@ -505,7 +505,7 @@ csr_neighbor_roam_prepare_scan_profile_filter(tpAniSirGlobal pMac, * @output_ch_list: The output channel list * @output_num_of_ch: The number of channels in output channel list * @merged_output_num_of_ch: The final number of channels in the - * output channel list. + * output channel list. * * This function is used to filter out the channels based on the * currently associated AP channel @@ -561,13 +561,13 @@ QDF_STATUS csr_neighbor_roam_channels_filter_by_current_band(tpAniSirGlobal pMac * @mac_ctx: Pointer to Global MAC structure * @session_id: Session ID * @input_ch_list: The additional channels to merge in to the - * "merged" channels list. + * "merged" channels list. * @input_num_of_ch: The number of additional channels. * @output_ch_list: The place to put the "merged" channel list. * @output_num_of_ch: The original number of channels in the - * "merged" channels list. + * "merged" channels list. * @merged_output_num_of_ch: The final number of channels in the - * "merged" channel list. + * "merged" channel list. * * This function is used to merge two channel list. * NB: If called with outputNumOfChannels == 0, this routines simply diff --git a/core/wma/src/wma_utils.c b/core/wma/src/wma_utils.c index 5b2d3608c63a..3564219f8b5b 100644 --- a/core/wma/src/wma_utils.c +++ b/core/wma/src/wma_utils.c @@ -2394,10 +2394,10 @@ int32_t wma_txrx_fw_stats_reset(tp_wma_handle wma_handle, } #ifdef HELIUMPLUS -#define SET_UPLOAD_MASK(_mask, _rate_info) \ +#define SET_UPLOAD_MASK(_mask, _rate_info) \ ((_mask) = 1 << (_rate_info ## _V2)) #else /* !HELIUMPLUS */ -#define SET_UPLOAD_MASK(_mask, _rate_info) \ +#define SET_UPLOAD_MASK(_mask, _rate_info) \ ((_mask) = 1 << (_rate_info)) #endif |
