diff options
| author | Jeff Johnson <jjohnson@qca.qualcomm.com> | 2014-02-18 15:57:26 -0800 |
|---|---|---|
| committer | Akash Patel <c_akashp@qca.qualcomm.com> | 2014-03-03 10:38:26 -0800 |
| commit | 33d874457cd4cfeb4952452a5b2401f9862596cb (patch) | |
| tree | a584d9018f7f6d1d6ea694cdaa2e5b3ae5f096aa | |
| parent | f5e1e564fdfd4f5971856ca3137434a039a2f804 (diff) | |
qcacld: CORE/HDD cleanfile
Run CORE/HDD through kernel/scripts/cleanfile to remove whitespace
that is inconsistent with the Linux Kernel coding standard
Change-Id: I6a82bf8655a66e0dc47ede970405b476e28c058b
CRs-fixed: 619495
39 files changed, 977 insertions, 989 deletions
diff --git a/CORE/HDD/inc/bap_hdd_main.h b/CORE/HDD/inc/bap_hdd_main.h index ea1eaa4f3f3d..e9f58da105a9 100644 --- a/CORE/HDD/inc/bap_hdd_main.h +++ b/CORE/HDD/inc/bap_hdd_main.h @@ -29,17 +29,17 @@ #define BAP_HDD_MAIN_H /**=========================================================================== - + \file BAP_HDD_MAIN_H.h - + \brief Linux HDD Adapter Type - + ==========================================================================*/ - -/*--------------------------------------------------------------------------- + +/*--------------------------------------------------------------------------- Include files - -------------------------------------------------------------------------*/ - + -------------------------------------------------------------------------*/ + #include <linux/netdevice.h> #include <linux/skbuff.h> #include <vos_list.h> @@ -51,34 +51,34 @@ #define BSL_MAX_CLIENTS 1 #define BSL_MAX_PHY_LINK_PER_CLIENT 1 -/*--------------------------------------------------------------------------- +/*--------------------------------------------------------------------------- Function declarations and documenation - -------------------------------------------------------------------------*/ + -------------------------------------------------------------------------*/ /**--------------------------------------------------------------------------- - + \brief BSL_Init() - Initialize the BSL Misc char driver - + This is called in by WLANBAP_Open() as part of bringing up the BT-AMP PAL (BAP) WLANBAP_Open() will pass in the device context created. - + \param - NA - + \return - 0 for success non-zero for failure - + --------------------------------------------------------------------------*/ int BSL_Init (void *pCtx); /**--------------------------------------------------------------------------- - + \brief BSL_Deinit() - De-initialize the BSL Misc char driver - + This is called in by WLANBAP_Close() as part of bringing down the BT-AMP PAL (BAP) - + \param - NA - + \return - 0 for success non-zero for failure - + --------------------------------------------------------------------------*/ int BSL_Deinit(void *pCtx); diff --git a/CORE/HDD/inc/bap_hdd_misc.h b/CORE/HDD/inc/bap_hdd_misc.h index ecbcdb51dfc2..889961d4a0b1 100644 --- a/CORE/HDD/inc/bap_hdd_misc.h +++ b/CORE/HDD/inc/bap_hdd_misc.h @@ -29,39 +29,39 @@ #define BAP_HDD_MISC_H /**=========================================================================== - + \file BAP_HDD_MISC.h - + \brief Linux HDD Adapter Type - + ==========================================================================*/ - -/*--------------------------------------------------------------------------- + +/*--------------------------------------------------------------------------- Include files - -------------------------------------------------------------------------*/ - + -------------------------------------------------------------------------*/ + #include <bapApi.h> #include <vos_types.h> -/*--------------------------------------------------------------------------- +/*--------------------------------------------------------------------------- Function declarations and documenation - -------------------------------------------------------------------------*/ + -------------------------------------------------------------------------*/ /**--------------------------------------------------------------------------- - + \brief WLANBAP_SetConfig() - To updates some configuration for BAP module in SME - + This should be called after WLANBAP_Start(). - + \param - NA - + \return - - The result code associated with performing the operation + The result code associated with performing the operation - VOS_STATUS_E_FAILURE: failed to set the config in SME BAP + VOS_STATUS_E_FAILURE: failed to set the config in SME BAP VOS_STATUS_SUCCESS: Success - + --------------------------------------------------------------------------*/ VOS_STATUS WLANBAP_SetConfig ( @@ -69,71 +69,71 @@ VOS_STATUS WLANBAP_SetConfig ); /**--------------------------------------------------------------------------- - + \brief WLANBAP_RegisterWithHCI() - To register WLAN PAL with HCI - - + + \param pAdapter : HDD adapter - + \return - - The result code associated with performing the operation + The result code associated with performing the operation - VOS_STATUS_E_FAILURE: failed to register with HCI + VOS_STATUS_E_FAILURE: failed to register with HCI VOS_STATUS_SUCCESS: Success - + --------------------------------------------------------------------------*/ VOS_STATUS WLANBAP_RegisterWithHCI(hdd_adapter_t *pAdapter); /**--------------------------------------------------------------------------- - + \brief WLANBAP_DeregisterFromHCI() - To deregister WLAN PAL with HCI - - + + \param - NA - + \return - - The result code associated with performing the operation + The result code associated with performing the operation - VOS_STATUS_E_FAILURE: failed to deregister with HCI + VOS_STATUS_E_FAILURE: failed to deregister with HCI VOS_STATUS_SUCCESS: Success - + --------------------------------------------------------------------------*/ VOS_STATUS WLANBAP_DeregisterFromHCI(void); /**--------------------------------------------------------------------------- - + \brief WLANBAP_StopAmp() - To stop the current AMP traffic/connection - - + + \param - NA - + \return - - The result code associated with performing the operation + The result code associated with performing the operation - VOS_STATUS_E_FAILURE: failed to stop AMP connection + VOS_STATUS_E_FAILURE: failed to stop AMP connection VOS_STATUS_SUCCESS: Success - + --------------------------------------------------------------------------*/ VOS_STATUS WLANBAP_StopAmp(void); /**--------------------------------------------------------------------------- - + \brief WLANBAP_AmpSessionOn() - To check if AMP connection is on currently - - + + \param - NA - + \return - - The result code associated with performing the operation + The result code associated with performing the operation - VOS_TRUE: AMP connection is on + VOS_TRUE: AMP connection is on VOS_FALSE: AMP connection is not on - + --------------------------------------------------------------------------*/ v_BOOL_t WLANBAP_AmpSessionOn(void); #endif // end #if !defined( BAP_HDD_MISC_H ) diff --git a/CORE/HDD/inc/qc_sap_ioctl.h b/CORE/HDD/inc/qc_sap_ioctl.h index bcf78bd54b39..7c900dda74dd 100644 --- a/CORE/HDD/inc/qc_sap_ioctl.h +++ b/CORE/HDD/inc/qc_sap_ioctl.h @@ -49,7 +49,7 @@ typedef struct sSSID typedef struct sSSIDInfo { - tSSID ssid; + tSSID ssid; u_int8_t ssidHidden; }tSSIDInfo; @@ -83,7 +83,7 @@ typedef enum { eQC_AUTH_TYPE_OPEN_SYSTEM, eQC_AUTH_TYPE_SHARED_KEY, eQC_AUTH_TYPE_AUTO_SWITCH -} eQcAuthType; +} eQcAuthType; typedef enum { eQC_WPS_BEACON_IE, @@ -110,7 +110,7 @@ typedef struct s_CommitConfig { QC_ACCEPT_UNLESS_DENIED = 0, QC_DENY_UNLESS_ACCEPTED = 1, } qc_macaddr_acl; - + struct qc_mac_acl_entry *accept_mac; /* MAC filtering */ u_int32_t num_accept_mac; struct qc_mac_acl_entry *deny_mac; /* MAC filtering */ @@ -124,10 +124,10 @@ typedef struct s_CommitConfig { u_int32_t countryCode[3]; //it ignored if [0] is 0. u_int32_t ht_op_mode_fixed; - + /*HT capability information to enable/diabale protection * bit15 bit14 bit13 bit12 bit11 bit10 bit9 bit8 - * (overlap) from11a from11b from11g Ht20 NonGf LsigTxop Rifs OBSS + * (overlap) from11a from11b from11g Ht20 NonGf LsigTxop Rifs OBSS * bit7 bit6 bit5 bit4 bit3 bit2 bit1 bit0 * from11a from11b from11g ht20 nonGf lsigTxop rifs obss*/ u_int16_t ht_capab; @@ -187,7 +187,7 @@ struct sQcSapreq_wscie { typedef struct sQcSapreq_WPSPBCProbeReqIES { u_int8_t macaddr[QCSAP_ADDR_LEN]; u_int16_t probeReqIELen; - u_int8_t probeReqIE[512]; + u_int8_t probeReqIE[512]; } sQcSapreq_WPSPBCProbeReqIES_t ; /* @@ -196,7 +196,7 @@ typedef struct sQcSapreq_WPSPBCProbeReqIES { typedef struct { - v_U8_t num_channels; + v_U8_t num_channels; v_U8_t channels[WNI_CFG_VALID_CHANNEL_LIST_LEN]; }tChannelListInfo, *tpChannelListInfo; @@ -239,7 +239,7 @@ typedef struct #define QCSAP_IOCTL_MODIFY_ACL (SIOCIWFIRSTPRIV+18) #define QCSAP_IOCTL_GET_CHANNEL_LIST (SIOCIWFIRSTPRIV+19) -#define QCSAP_IOCTL_SET_TX_POWER (SIOCIWFIRSTPRIV+20) +#define QCSAP_IOCTL_SET_TX_POWER (SIOCIWFIRSTPRIV+20) #define QCSAP_IOCTL_GET_STA_INFO (SIOCIWFIRSTPRIV+21) #define QCSAP_IOCTL_SET_MAX_TX_POWER (SIOCIWFIRSTPRIV+22) #define QCSAP_IOCTL_DATAPATH_SNAP_SHOT (SIOCIWFIRSTPRIV+23) @@ -298,7 +298,7 @@ typedef struct #define QCSAP_GET_GTX_BWMASK 67 #endif /* QCA_WIFI_2_0 */ -enum { +enum { QCSAP_PARAM_MAX_ASSOC = 1, QCSAP_PARAM_GET_WLAN_DBG = 4, QCSAP_PARAM_MODULE_DOWN_IND = 5, @@ -312,7 +312,7 @@ enum { QCSAP_PARAM_SET_MCC_CHANNEL_QUOTA = 13, }; -int iw_softap_get_channel_list(struct net_device *dev, +int iw_softap_get_channel_list(struct net_device *dev, struct iw_request_info *info, union iwreq_data *wrqu, char *extra); diff --git a/CORE/HDD/inc/wlan_hdd_assoc.h b/CORE/HDD/inc/wlan_hdd_assoc.h index 6dd6914be2b7..7ba62db11533 100644 --- a/CORE/HDD/inc/wlan_hdd_assoc.h +++ b/CORE/HDD/inc/wlan_hdd_assoc.h @@ -26,7 +26,7 @@ * */ -#if !defined( HDD_CONNECTION_H__ ) +#if !defined( HDD_CONNECTION_H__ ) #define HDD_CONNECTION_H__ #include <wlan_hdd_mib.h> #define HDD_MAX_NUM_IBSS_STA ( 32 ) @@ -41,7 +41,7 @@ #endif #endif #define TKIP_COUNTER_MEASURE_STARTED 1 -#define TKIP_COUNTER_MEASURE_STOPED 0 +#define TKIP_COUNTER_MEASURE_STOPED 0 /* Timeout (in ms) for Link to Up before Registering Station */ #define ASSOC_LINKUP_TIMEOUT 60 @@ -53,7 +53,7 @@ #define IBSS_BROADCAST_STAID 1 #endif -typedef enum +typedef enum { /** Not associated in Infra or participating in an IBSS / Ad-hoc network.*/ eConnectionState_NotConnected, @@ -80,22 +80,22 @@ typedef struct connection_info_s { /** connection state of the NIC.*/ eConnectionState connState; - + /** BSS type of the current connection. Comes from the MIB at the time the connect request is issued in combination with the BssDescription from the associated entity.*/ - + eMib_dot11DesiredBssType connDot11DesiredBssType; /** BSSID */ tCsrBssid bssId; - + /** SSID Info*/ tCsrSSIDInfo SSID; - + /** Station ID */ v_U8_t staId[ HDD_MAX_NUM_IBSS_STA ]; /** Peer Mac Address of the IBSS Stations */ - v_MACADDR_t peerMacAddress[ HDD_MAX_NUM_IBSS_STA ]; + v_MACADDR_t peerMacAddress[ HDD_MAX_NUM_IBSS_STA ]; /** Auth Type */ eCsrAuthType authType; @@ -109,14 +109,14 @@ typedef struct connection_info_s tCsrKeys Keys; /** Operation Channel */ - v_U8_t operationChannel; - + v_U8_t operationChannel; + /** Remembers authenticated state */ v_U8_t uIsAuthenticated; /** Dot11Mode */ tANI_U32 dot11Mode; - + }connection_info_t; /*Forward declaration of Adapter*/ typedef struct hdd_adapter_s hdd_adapter_t; @@ -134,7 +134,7 @@ typedef enum #endif /* QCA_WIFI_2_0 */ extern v_BOOL_t hdd_connIsConnected( hdd_station_ctx_t *pHddStaCtx ); -extern eHalStatus hdd_smeRoamCallback( void *pContext, tCsrRoamInfo *pRoamInfo, v_U32_t roamId, +extern eHalStatus hdd_smeRoamCallback( void *pContext, tCsrRoamInfo *pRoamInfo, v_U32_t roamId, eRoamCmdStatus roamStatus, eCsrRoamResult roamResult ); extern v_VOID_t hdd_connSaveConnectInfo( hdd_adapter_t *pAdapter, tCsrRoamInfo *pRoamInfo, eCsrRoamBssType eBssType ); diff --git a/CORE/HDD/inc/wlan_hdd_cfg80211.h b/CORE/HDD/inc/wlan_hdd_cfg80211.h index 0aec533bbb78..30535109d334 100644 --- a/CORE/HDD/inc/wlan_hdd_cfg80211.h +++ b/CORE/HDD/inc/wlan_hdd_cfg80211.h @@ -41,7 +41,7 @@ //value for initial part of frames and number of bytes to be compared -#define GAS_INITIAL_REQ "\x04\x0a" +#define GAS_INITIAL_REQ "\x04\x0a" #define GAS_INITIAL_REQ_SIZE 2 #define GAS_INITIAL_RSP "\x04\x0b" @@ -53,7 +53,7 @@ #define GAS_COMEBACK_RSP "\x04\x0d" #define GAS_COMEBACK_RSP_SIZE 2 -#define P2P_PUBLIC_ACTION_FRAME "\x04\x09\x50\x6f\x9a\x09" +#define P2P_PUBLIC_ACTION_FRAME "\x04\x09\x50\x6f\x9a\x09" #define P2P_PUBLIC_ACTION_FRAME_SIZE 6 #define P2P_ACTION_FRAME "\x7f\x50\x6f\x9a\x09" diff --git a/CORE/HDD/inc/wlan_hdd_debugfs.h b/CORE/HDD/inc/wlan_hdd_debugfs.h index b1b2a9b19c28..40415fd154e0 100644 --- a/CORE/HDD/inc/wlan_hdd_debugfs.h +++ b/CORE/HDD/inc/wlan_hdd_debugfs.h @@ -41,4 +41,3 @@ inline void hdd_debugfs_exit(hdd_context_t *pHddCtx) } #endif /* #ifdef WLAN_OPEN_SOURCE */ #endif /* #ifndef _WLAN_HDD_DEBUGFS_H */ - diff --git a/CORE/HDD/inc/wlan_hdd_dev_pwr.h b/CORE/HDD/inc/wlan_hdd_dev_pwr.h index 07dbcddf2584..a2bb4723b6a5 100644 --- a/CORE/HDD/inc/wlan_hdd_dev_pwr.h +++ b/CORE/HDD/inc/wlan_hdd_dev_pwr.h @@ -36,7 +36,7 @@ /*---------------------------------------------------------------------------- @brief Registration function. - Register suspend, resume callback functions with platform driver. + Register suspend, resume callback functions with platform driver. @param hdd_context_t pHddCtx Global hdd context diff --git a/CORE/HDD/inc/wlan_hdd_dp_utils.h b/CORE/HDD/inc/wlan_hdd_dp_utils.h index 153854e4bc78..0165c9fa33cb 100644 --- a/CORE/HDD/inc/wlan_hdd_dp_utils.h +++ b/CORE/HDD/inc/wlan_hdd_dp_utils.h @@ -65,7 +65,7 @@ typedef struct hdd_list_s hdd_list_node_t anchor; v_SIZE_t count; v_SIZE_t max_size; - spinlock_t lock; + spinlock_t lock; } hdd_list_t; typedef struct @@ -76,7 +76,7 @@ typedef struct } skb_list_node_t; //FIXME Need a helper function to cleanup skbs in a queue. Required for cleanup/shutdown - + /**----------------------------------------------------------------------------- Function declarations and documenation ----------------------------------------------------------------------------*/ diff --git a/CORE/HDD/inc/wlan_hdd_ftm.h b/CORE/HDD/inc/wlan_hdd_ftm.h index 2bcba1a2dff0..44b16eccbdf2 100644 --- a/CORE/HDD/inc/wlan_hdd_ftm.h +++ b/CORE/HDD/inc/wlan_hdd_ftm.h @@ -39,7 +39,7 @@ #define WLAN_FTM_FAILURE 1 #define WLAN_FTM_START 1 -#define WLAN_FTM_STOP 2 +#define WLAN_FTM_STOP 2 #define WLAN_FTM_CMD 3 @@ -100,7 +100,7 @@ typedef enum { WLAN_FTM_CMD_START = 1, - WLAN_FTM_CMD_STOP, + WLAN_FTM_CMD_STOP, WLAN_FTM_CMD_CMD } wlan_hdd_ftm_cmds; typedef struct ftm_hdr_s { @@ -121,7 +121,7 @@ typedef struct wlan_hdd_ftm_request_s v_U8_t cmd_code; v_U8_t sub_sys_id; v_U16_t mode_id; - ftm_hdr_t ftm_hdr; + ftm_hdr_t ftm_hdr; v_U16_t module_type; wlan_hdd_ftm_payload ftmpkt; }wlan_hdd_ftm_request_t; @@ -131,7 +131,7 @@ typedef struct wlan_hdd_ftm_response_s v_U8_t cmd_code; v_U8_t sub_sys_id; v_U16_t mode_id; - ftm_hdr_t ftm_hdr; + ftm_hdr_t ftm_hdr; v_U16_t ftm_err_code; wlan_hdd_ftm_payload ftmpkt; }wlan_hdd_ftm_response_t; @@ -149,7 +149,7 @@ typedef struct wlan_hdd_ftm_status_s tAniNlHdr *wnl; /**vos event */ vos_event_t ftm_vos_event; - + /** completion variable for ftm command to complete*/ struct completion ftm_comp_var; v_BOOL_t IsCmdPending; @@ -165,10 +165,10 @@ typedef struct wlan_hdd_ftm_status_s } wlan_hdd_ftm_status_t; typedef struct ftm_msg_s { - /* This field can be used as sequence + /* This field can be used as sequence number/dialogue token for matching request/response */ v_U16_t type; - + /* This guy carries the command buffer along with command id */ void *cmd_ptr; v_U32_t bodyval; diff --git a/CORE/HDD/inc/wlan_hdd_host_offload.h b/CORE/HDD/inc/wlan_hdd_host_offload.h index 3314b3f191c4..5082fe3b5a0d 100644 --- a/CORE/HDD/inc/wlan_hdd_host_offload.h +++ b/CORE/HDD/inc/wlan_hdd_host_offload.h @@ -60,4 +60,3 @@ typedef struct } tHostOffloadRequest, *tpHostOffloadRequest; #endif // __WLAN_HDD_HOST_OFFLOAD_H__ - diff --git a/CORE/HDD/inc/wlan_hdd_hostapd.h b/CORE/HDD/inc/wlan_hdd_hostapd.h index c3e855a0cdda..22abc8b59a07 100644 --- a/CORE/HDD/inc/wlan_hdd_hostapd.h +++ b/CORE/HDD/inc/wlan_hdd_hostapd.h @@ -61,29 +61,29 @@ VOS_STATUS hdd_register_hostapd(hdd_adapter_t *pAdapter, tANI_U8 rtnl_held); VOS_STATUS hdd_unregister_hostapd(hdd_adapter_t *pAdapter); -eCsrAuthType +eCsrAuthType hdd_TranslateRSNToCsrAuthType( u_int8_t auth_suite[4]); -eCsrEncryptionType +eCsrEncryptionType hdd_TranslateRSNToCsrEncryptionType(u_int8_t cipher_suite[4]); -eCsrEncryptionType +eCsrEncryptionType hdd_TranslateRSNToCsrEncryptionType(u_int8_t cipher_suite[4]); -eCsrAuthType +eCsrAuthType hdd_TranslateWPAToCsrAuthType(u_int8_t auth_suite[4]); -eCsrEncryptionType +eCsrEncryptionType hdd_TranslateWPAToCsrEncryptionType(u_int8_t cipher_suite[4]); VOS_STATUS hdd_softap_sta_deauth(hdd_adapter_t*,v_U8_t*); void hdd_softap_sta_disassoc(hdd_adapter_t*,v_U8_t*); void hdd_softap_tkip_mic_fail_counter_measure(hdd_adapter_t*,v_BOOL_t); int hdd_softap_unpackIE( tHalHandle halHandle, - eCsrEncryptionType *pEncryptType, - eCsrEncryptionType *mcEncryptType, - eCsrAuthType *pAuthType, - u_int16_t gen_ie_len, + eCsrEncryptionType *pEncryptType, + eCsrEncryptionType *mcEncryptType, + eCsrAuthType *pAuthType, + u_int16_t gen_ie_len, u_int8_t *gen_ie ); VOS_STATUS hdd_hostapd_SAPEventCB( tpSap_Event pSapEvent, v_PVOID_t usrDataForCallback); diff --git a/CORE/HDD/inc/wlan_hdd_includes.h b/CORE/HDD/inc/wlan_hdd_includes.h index 8305b8e925c4..239e7920b911 100644 --- a/CORE/HDD/inc/wlan_hdd_includes.h +++ b/CORE/HDD/inc/wlan_hdd_includes.h @@ -29,18 +29,18 @@ #define HDD_INCLUDES_H__ /**=========================================================================== - + \file wlan_hdd_includes.h - + \brief Internal includes for the Linux HDD - + ==========================================================================*/ - + /* $HEADER$ */ - -/*--------------------------------------------------------------------------- + +/*--------------------------------------------------------------------------- Include files - -------------------------------------------------------------------------*/ + -------------------------------------------------------------------------*/ // throw all the includes in here f to get the .c files in the HDD to compile. @@ -67,7 +67,7 @@ #ifdef FEATURE_OEM_DATA_SUPPORT /*include for oem data req specific structures*/ /*and function declarations*/ -#include "wlan_hdd_oemdata.h" +#include "wlan_hdd_oemdata.h" #endif #endif // end #if !defined( HDD_INCLUDES_H__ ) diff --git a/CORE/HDD/inc/wlan_hdd_keep_alive.h b/CORE/HDD/inc/wlan_hdd_keep_alive.h index f040841f5c1b..a33074c7c272 100644 --- a/CORE/HDD/inc/wlan_hdd_keep_alive.h +++ b/CORE/HDD/inc/wlan_hdd_keep_alive.h @@ -49,11 +49,10 @@ typedef struct { v_U8_t packetType; v_U32_t timePeriod; - v_U8_t hostIpv4Addr[4]; + v_U8_t hostIpv4Addr[4]; v_U8_t destIpv4Addr[4]; v_U8_t destMacAddr [6]; v_U8_t bssIdx; } tKeepAliveRequest, *tpKeepAliveRequest; #endif // __WLAN_HDD_KEEP_ALIVE_H__ - diff --git a/CORE/HDD/inc/wlan_hdd_mib.h b/CORE/HDD/inc/wlan_hdd_mib.h index 191418bdddd2..7dd878ed9fdc 100644 --- a/CORE/HDD/inc/wlan_hdd_mib.h +++ b/CORE/HDD/inc/wlan_hdd_mib.h @@ -25,7 +25,7 @@ * to the Linux Foundation. */ #if !defined( WLAN_HDD_MIB_h__ ) -#define WLAN_HDD_MIB_h__ +#define WLAN_HDD_MIB_h__ #include <vos_types.h> @@ -36,29 +36,29 @@ typedef enum eMib_dot11DesiredBssType_independent = 2, eMib_dot11DesiredBssType_infra_ap =3, eMib_dot11DesiredBssType_any = 4 - + } eMib_dot11DesiredBssType; -/** This is the maximum number of BSSIDs supported in the - dot11DesiredBssidList. All the code operates off of +/** This is the maximum number of BSSIDs supported in the + dot11DesiredBssidList. All the code operates off of this maximum BSSID list count. */ #define MIB_DOT11_DESIRED_BSSID_LIST_MAX_COUNT ( 1 ) typedef struct { v_U32_t cEntries; - - v_MACADDR_t BSSIDs[ MIB_DOT11_DESIRED_BSSID_LIST_MAX_COUNT ]; + + v_MACADDR_t BSSIDs[ MIB_DOT11_DESIRED_BSSID_LIST_MAX_COUNT ]; } sMib_dot11DesiredBssidList; -/** This is the maximum number of SSIDs supported in the - dot11DesiredSsidList. All the code operates off of +/** This is the maximum number of SSIDs supported in the + dot11DesiredSsidList. All the code operates off of this maximum SSID list count. */ - + #define MIB_DOT11_DESIRED_SSID_LIST_MAX_COUNT ( 1 ) #define MIB_DOT11_SSID_MAX_LENGTH ( 32 ) @@ -67,14 +67,14 @@ typedef struct { v_U32_t ssidLength; v_U8_t ssid[ MIB_DOT11_SSID_MAX_LENGTH ]; - + } sDot11Ssid; typedef struct { v_U32_t cEntries; - - sDot11Ssid SSIDs[ MIB_DOT11_DESIRED_SSID_LIST_MAX_COUNT ]; + + sDot11Ssid SSIDs[ MIB_DOT11_DESIRED_SSID_LIST_MAX_COUNT ]; } sMib_dot11DesiredSsidList; @@ -86,14 +86,14 @@ typedef enum eMib_dot11AutoConfigEnabled_None = 0U, eMib_dot11AutoConfigEnabled_Phy = 0x00000001U, eMib_dot11AutoConfigEnabled_Mac = 0x00000002U - + } eMib_dot11AutoConfigEnabled; #define MIB_DOT11_SUPPORTED_PHY_TYPES_MAX_COUNT ( 3 ) -typedef enum tagMib_dot11PhyType +typedef enum tagMib_dot11PhyType { eMib_dot11PhyType_11b, eMib_dot11PhyType_11a, @@ -103,26 +103,26 @@ typedef enum tagMib_dot11PhyType typedef struct tagMib_dot11SupportedPhyTypes { - v_U32_t cEntries; - eMib_dot11PhyType phyTypes[ MIB_DOT11_SUPPORTED_PHY_TYPES_MAX_COUNT ]; + v_U32_t cEntries; + eMib_dot11PhyType phyTypes[ MIB_DOT11_SUPPORTED_PHY_TYPES_MAX_COUNT ]; } sMib_dot11SupportedPhyTypes; typedef enum { - eMib_DevicePowerState_D0, - eMib_DevicePowerState_D1, - eMib_DevicePowerState_D2, + eMib_DevicePowerState_D0, + eMib_DevicePowerState_D1, + eMib_DevicePowerState_D2, eMib_DevicePowerState_D3 - -} eMib_DevicePowerState; - + +} eMib_DevicePowerState; + typedef enum { eMib_dot11NICPowerState_OFF = VOS_FALSE, eMib_dot11NICPowerState_ON = VOS_TRUE - + } eMib_dot11NICPowerState; @@ -130,26 +130,26 @@ typedef enum { eMib_dot11HardwarePHYState_OFF = VOS_FALSE, eMib_dot11HardwarePHYState_ON = VOS_TRUE - + } eMib_dot11HardwarePHYState; typedef enum { - eMib_dot11PowerSavingLevel_None, + eMib_dot11PowerSavingLevel_None, eMib_dot11PowerSavingLevel_MaxPS, eMib_dot11PowerSavingLevel_FastPS, eMib_dot11PowerSavingLevel_MaximumLevel - -} eMib_dot11PowerSavingLevel; + +} eMib_dot11PowerSavingLevel; #define MIB_DOT11_MAC_EXCLUSION_LIST_MAX_COUNT 4 typedef struct { v_U32_t cEntries; - - v_MACADDR_t macAddrs[ MIB_DOT11_MAC_EXCLUSION_LIST_MAX_COUNT ]; + + v_MACADDR_t macAddrs[ MIB_DOT11_MAC_EXCLUSION_LIST_MAX_COUNT ]; } sMib_dot11MacExcludeList; diff --git a/CORE/HDD/inc/wlan_hdd_oemdata.h b/CORE/HDD/inc/wlan_hdd_oemdata.h index aca6a73266fd..955f49b9698b 100644 --- a/CORE/HDD/inc/wlan_hdd_oemdata.h +++ b/CORE/HDD/inc/wlan_hdd_oemdata.h @@ -28,11 +28,11 @@ #ifdef FEATURE_OEM_DATA_SUPPORT /**=========================================================================== - + \file wlan_hdd_oemdata.h - + \brief Internal includes for the oem data - + ==========================================================================*/ diff --git a/CORE/HDD/inc/wlan_hdd_p2p.h b/CORE/HDD/inc/wlan_hdd_p2p.h index 3f2710e0c3ee..3337760d6627 100644 --- a/CORE/HDD/inc/wlan_hdd_p2p.h +++ b/CORE/HDD/inc/wlan_hdd_p2p.h @@ -110,7 +110,7 @@ int wlan_hdd_cfg80211_cancel_remain_on_channel( struct wiphy *wiphy, u64 cookie ); #if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,38)) -int wlan_hdd_cfg80211_mgmt_tx_cancel_wait(struct wiphy *wiphy, +int wlan_hdd_cfg80211_mgmt_tx_cancel_wait(struct wiphy *wiphy, #if (LINUX_VERSION_CODE >= KERNEL_VERSION(3,6,0)) struct wireless_dev *wdev, #else diff --git a/CORE/HDD/inc/wlan_hdd_power.h b/CORE/HDD/inc/wlan_hdd_power.h index f0c30dfe4509..49ddc729b2aa 100644 --- a/CORE/HDD/inc/wlan_hdd_power.h +++ b/CORE/HDD/inc/wlan_hdd_power.h @@ -51,7 +51,7 @@ //gEnableSuspend = 2 in INI file implies suspend to deep sleep #define WLAN_MAP_SUSPEND_TO_DEEP_SLEEP 2 - //gEnableSuspend = 3 in INI file implies suspend to set MCAST/BCAST filter + //gEnableSuspend = 3 in INI file implies suspend to set MCAST/BCAST filter #define WLAN_MAP_SUSPEND_TO_MCAST_BCAST_FILTER 3 //gEnableDriverStop = 1 implies map driver stop to standby @@ -75,10 +75,10 @@ * Function declarations and documentation * ------------------------------------------------------------------------*/ eHalStatus hdd_exit_standby(hdd_context_t *pHddCtx); - VOS_STATUS hdd_exit_deep_sleep(hdd_context_t *pHddCtx, + VOS_STATUS hdd_exit_deep_sleep(hdd_context_t *pHddCtx, hdd_adapter_t* pAdapter); VOS_STATUS hdd_enter_standby(hdd_context_t *pHddCtx); - VOS_STATUS hdd_enter_deep_sleep(hdd_context_t *pHddCtx, + VOS_STATUS hdd_enter_deep_sleep(hdd_context_t *pHddCtx, hdd_adapter_t* pAdapter); #ifdef CONFIG_HAS_EARLYSUSPEND VOS_STATUS hdd_wlan_reset(void); diff --git a/CORE/HDD/inc/wlan_hdd_softap_tx_rx.h b/CORE/HDD/inc/wlan_hdd_softap_tx_rx.h index cdce12535c64..51c923d100a0 100644 --- a/CORE/HDD/inc/wlan_hdd_softap_tx_rx.h +++ b/CORE/HDD/inc/wlan_hdd_softap_tx_rx.h @@ -30,21 +30,21 @@ #define WLAN_HDD_SOFTAP_TX_RX_H /**=========================================================================== - + \file wlan_hdd_softap_tx_rx.h - + \brief Linux HDD SOFTAP Tx/RX APIs - + ==========================================================================*/ - -/*--------------------------------------------------------------------------- + +/*--------------------------------------------------------------------------- Include files - -------------------------------------------------------------------------*/ + -------------------------------------------------------------------------*/ #include <wlan_hdd_hostapd.h> -/*--------------------------------------------------------------------------- +/*--------------------------------------------------------------------------- Preprocessor definitions and constants - -------------------------------------------------------------------------*/ + -------------------------------------------------------------------------*/ #define HDD_SOFTAP_TX_BK_QUEUE_MAX_LEN (82*2) #define HDD_SOFTAP_TX_BE_QUEUE_MAX_LEN (78*2) #define HDD_SOFTAP_TX_VI_QUEUE_MAX_LEN (74*2) @@ -56,21 +56,21 @@ #define HDD_SOFTAP_VI_WEIGHT_DEFAULT 8 #define HDD_SOFTAP_VO_WEIGHT_DEFAULT 18 -/*--------------------------------------------------------------------------- +/*--------------------------------------------------------------------------- Type declarations - -------------------------------------------------------------------------*/ - -/*--------------------------------------------------------------------------- + -------------------------------------------------------------------------*/ + +/*--------------------------------------------------------------------------- Function declarations and documenation - -------------------------------------------------------------------------*/ + -------------------------------------------------------------------------*/ /**============================================================================ - @brief hdd_softap_hard_start_xmit() - Function registered with the Linux OS for + @brief hdd_softap_hard_start_xmit() - Function registered with the Linux OS for transmitting packets @param skb : [in] pointer to OS packet (sk_buff) @param dev : [in] pointer to Libra softap network device - + @return : NET_XMIT_DROP if packets are dropped : NET_XMIT_SUCCESS if packet is enqueued succesfully ===========================================================================*/ @@ -87,11 +87,11 @@ extern int hdd_softap_hard_start_xmit(struct sk_buff *skb, struct net_device *de extern void hdd_softap_tx_timeout(struct net_device *dev); /**============================================================================ - @brief hdd_softap_stats() - Function registered with the Linux OS for + @brief hdd_softap_stats() - Function registered with the Linux OS for device TX/RX statistics @param dev : [in] pointer to Libra network device - + @return : pointer to net_device_stats structure ===========================================================================*/ extern struct net_device_stats* hdd_softap_stats(struct net_device *dev); @@ -100,8 +100,8 @@ extern struct net_device_stats* hdd_softap_stats(struct net_device *dev); @brief hdd_softap_init_tx_rx() - Init function to initialize Tx/RX modules in HDD - @param pAdapter : [in] pointer to adapter context - @return : VOS_STATUS_E_FAILURE if any errors encountered + @param pAdapter : [in] pointer to adapter context + @return : VOS_STATUS_E_FAILURE if any errors encountered : VOS_STATUS_SUCCESS otherwise ===========================================================================*/ extern VOS_STATUS hdd_softap_init_tx_rx( hdd_adapter_t *pAdapter ); @@ -110,8 +110,8 @@ extern VOS_STATUS hdd_softap_init_tx_rx( hdd_adapter_t *pAdapter ); @brief hdd_softap_deinit_tx_rx() - Deinit function to clean up Tx/RX modules in HDD - @param pAdapter : [in] pointer to adapter context - @return : VOS_STATUS_E_FAILURE if any errors encountered + @param pAdapter : [in] pointer to adapter context + @return : VOS_STATUS_E_FAILURE if any errors encountered : VOS_STATUS_SUCCESS otherwise ===========================================================================*/ extern VOS_STATUS hdd_softap_deinit_tx_rx( hdd_adapter_t *pAdapter ); @@ -122,8 +122,8 @@ extern VOS_STATUS hdd_softap_deinit_tx_rx( hdd_adapter_t *pAdapter ); @param pAdapter : [in] pointer to adapter context @param STAId : [in] Station ID to deinit - @param pmacAddrSTA : [in] pointer to the MAC address of the station - @return : VOS_STATUS_E_FAILURE if any errors encountered + @param pmacAddrSTA : [in] pointer to the MAC address of the station + @return : VOS_STATUS_E_FAILURE if any errors encountered : VOS_STATUS_SUCCESS otherwise ===========================================================================*/ extern VOS_STATUS hdd_softap_init_tx_rx_sta( hdd_adapter_t *pAdapter, v_U8_t STAId, v_MACADDR_t *pmacAddrSTA); @@ -133,8 +133,8 @@ extern VOS_STATUS hdd_softap_init_tx_rx_sta( hdd_adapter_t *pAdapter, v_U8_t STA modules in HDD @param pAdapter : [in] pointer to adapter context - @param STAId : [in] Station ID to deinit - @return : VOS_STATUS_E_FAILURE if any errors encountered + @param STAId : [in] Station ID to deinit + @return : VOS_STATUS_E_FAILURE if any errors encountered : VOS_STATUS_SUCCESS otherwise ===========================================================================*/ extern VOS_STATUS hdd_softap_deinit_tx_rx_sta ( hdd_adapter_t *pAdapter, v_U8_t STAId ); @@ -143,8 +143,8 @@ extern VOS_STATUS hdd_softap_deinit_tx_rx_sta ( hdd_adapter_t *pAdapter, v_U8_t @brief hdd_disconnect_tx_rx() - Disconnect function to clean up Tx/RX modules in HDD - @param pAdapter : [in] pointer to adapter context - @return : VOS_STATUS_E_FAILURE if any errors encountered + @param pAdapter : [in] pointer to adapter context + @return : VOS_STATUS_E_FAILURE if any errors encountered : VOS_STATUS_SUCCESS otherwise ===========================================================================*/ extern VOS_STATUS hdd_softap_disconnect_tx_rx( hdd_adapter_t *pAdapter ); @@ -154,29 +154,29 @@ extern VOS_STATUS hdd_softap_disconnect_tx_rx( hdd_adapter_t *pAdapter ); to indicate that a packet has been transmitted across the SDIO bus succesfully. OS packet resources can be released after this cbk. - @param vosContext : [in] pointer to VOS context - @param pVosPacket : [in] pointer to VOS packet (containing skb) - @param vosStatusIn : [in] status of the transmission + @param vosContext : [in] pointer to VOS context + @param pVosPacket : [in] pointer to VOS packet (containing skb) + @param vosStatusIn : [in] status of the transmission - @return : VOS_STATUS_E_FAILURE if any errors encountered + @return : VOS_STATUS_E_FAILURE if any errors encountered : VOS_STATUS_SUCCESS otherwise ===========================================================================*/ -extern VOS_STATUS hdd_softap_tx_complete_cbk( v_VOID_t *vosContext, - vos_pkt_t *pVosPacket, +extern VOS_STATUS hdd_softap_tx_complete_cbk( v_VOID_t *vosContext, + vos_pkt_t *pVosPacket, VOS_STATUS vosStatusIn ); /**============================================================================ - @brief hdd_softap_tx_fetch_packet_cbk() - Callback function invoked by TL to + @brief hdd_softap_tx_fetch_packet_cbk() - Callback function invoked by TL to fetch a packet for transmission. - @param vosContext : [in] pointer to VOS context + @param vosContext : [in] pointer to VOS context @param staId : [in] Station for which TL is requesting a pkt @param ucAC : [in] pointer to access category requested by TL @param pVosPacket : [out] pointer to VOS packet packet pointer - @param pPktMetaInfo : [out] pointer to meta info for the pkt - + @param pPktMetaInfo : [out] pointer to meta info for the pkt + @return : VOS_STATUS_E_EMPTY if no packets to transmit - : VOS_STATUS_E_FAILURE if any errors encountered + : VOS_STATUS_E_FAILURE if any errors encountered : VOS_STATUS_SUCCESS otherwise ===========================================================================*/ extern VOS_STATUS hdd_softap_tx_fetch_packet_cbk( v_VOID_t *vosContext, @@ -186,36 +186,36 @@ extern VOS_STATUS hdd_softap_tx_fetch_packet_cbk( v_VOID_t *vosContext, WLANTL_MetaInfoType *pPktMetaInfo ); /**============================================================================ - @brief hdd_softap_tx_low_resource_cbk() - Callback function invoked in the - case where VOS packets are not available at the time of the call to get - packets. This callback function is invoked by VOS when packets are + @brief hdd_softap_tx_low_resource_cbk() - Callback function invoked in the + case where VOS packets are not available at the time of the call to get + packets. This callback function is invoked by VOS when packets are available. - @param pVosPacket : [in] pointer to VOS packet - @param userData : [in] opaque user data that was passed initially - - @return : VOS_STATUS_E_FAILURE if any errors encountered, + @param pVosPacket : [in] pointer to VOS packet + @param userData : [in] opaque user data that was passed initially + + @return : VOS_STATUS_E_FAILURE if any errors encountered, : VOS_STATUS_SUCCESS otherwise =============================================================================*/ -extern VOS_STATUS hdd_softap_tx_low_resource_cbk( vos_pkt_t *pVosPacket, +extern VOS_STATUS hdd_softap_tx_low_resource_cbk( vos_pkt_t *pVosPacket, v_VOID_t *userData ); #ifndef QCA_WIFI_2_0 /**============================================================================ @brief hdd_softap_rx_packet_cbk() - Receive callback registered with TL. - TL will call this to notify the HDD when a packet was received + TL will call this to notify the HDD when a packet was received for a registered STA. - @param vosContext : [in] pointer to VOS context - @param pVosPacket : [in] pointer to VOS packet (conatining sk_buff) + @param vosContext : [in] pointer to VOS context + @param pVosPacket : [in] pointer to VOS packet (conatining sk_buff) @param staId : [in] Station Id - @param pRxMetaInfo : [in] pointer to meta info for the received pkt(s) + @param pRxMetaInfo : [in] pointer to meta info for the received pkt(s) - @return : VOS_STATUS_E_FAILURE if any errors encountered, + @return : VOS_STATUS_E_FAILURE if any errors encountered, : VOS_STATUS_SUCCESS otherwise ===========================================================================*/ -extern VOS_STATUS hdd_softap_rx_packet_cbk( v_VOID_t *vosContext, - vos_pkt_t *pVosPacket, +extern VOS_STATUS hdd_softap_rx_packet_cbk( v_VOID_t *vosContext, + vos_pkt_t *pVosPacket, v_U8_t staId, WLANTL_RxMetaInfoType* pRxMetaInfo ); @@ -258,7 +258,7 @@ VOS_STATUS hdd_softap_rx_mul_packet_cbk(v_VOID_t *vosContext, @param pAdapter : [in] pointer to adapter context @param STAId : [in] Station ID to deregister - @return : VOS_STATUS_E_FAILURE if any errors encountered + @return : VOS_STATUS_E_FAILURE if any errors encountered : VOS_STATUS_SUCCESS otherwise ===========================================================================*/ extern VOS_STATUS hdd_softap_DeregisterSTA( hdd_adapter_t *pAdapter, tANI_U8 staId ); @@ -274,12 +274,12 @@ extern VOS_STATUS hdd_softap_DeregisterSTA( hdd_adapter_t *pAdapter, tANI_U8 sta @param bcastSig : [in] Broadcast Signature send to TL @param pPeerMacAddress : [in] station MAC address @param fWmmEnabled : [in] Wmm enabled sta or not - @return : VOS_STATUS_E_FAILURE if any errors encountered + @return : VOS_STATUS_E_FAILURE if any errors encountered : VOS_STATUS_SUCCESS otherwise =========================================================================== */ extern VOS_STATUS hdd_softap_RegisterSTA( hdd_adapter_t *pAdapter, v_BOOL_t fAuthRequired, - v_BOOL_t fPrivacyBit, + v_BOOL_t fPrivacyBit, v_U8_t staId, v_U8_t ucastSig, v_U8_t bcastSig, @@ -291,7 +291,7 @@ extern VOS_STATUS hdd_softap_RegisterSTA( hdd_adapter_t *pAdapter, @param pAdapter : [in] pointer to adapter context @param fPrivacyBit : [in] privacy bit needs to be set or not - @return : VOS_STATUS_E_FAILURE if any errors encountered + @return : VOS_STATUS_E_FAILURE if any errors encountered : VOS_STATUS_SUCCESS otherwise =========================================================================== */ extern VOS_STATUS hdd_softap_Register_BC_STA( hdd_adapter_t *pAdapter, v_BOOL_t fPrivacyBit); @@ -300,7 +300,7 @@ extern VOS_STATUS hdd_softap_Register_BC_STA( hdd_adapter_t *pAdapter, v_BOOL_t @brief hdd_softap_DeregisterSTA - DeRegister the default broadcast station into TL block @param pAdapter : [in] pointer to adapter context - @return : VOS_STATUS_E_FAILURE if any errors encountered + @return : VOS_STATUS_E_FAILURE if any errors encountered : VOS_STATUS_SUCCESS otherwise =========================================================================== */ extern VOS_STATUS hdd_softap_Deregister_BC_STA( hdd_adapter_t *pAdapter); @@ -309,7 +309,7 @@ extern VOS_STATUS hdd_softap_Deregister_BC_STA( hdd_adapter_t *pAdapter); @brief hdd_softap_stop_bss - Helper function to stop bss and do cleanup in HDD and TL @param pAdapter : [in] pointer to adapter context - @return : VOS_STATUS_E_FAILURE if any errors encountered + @return : VOS_STATUS_E_FAILURE if any errors encountered : VOS_STATUS_SUCCESS otherwise =========================================================================== */ extern VOS_STATUS hdd_softap_stop_bss( hdd_adapter_t *pHostapdAdapter); @@ -321,7 +321,7 @@ extern VOS_STATUS hdd_softap_stop_bss( hdd_adapter_t *pHostapdAdapter); @param pAdapter : [in] pointer to adapter context @param pDestMacAddress : [in] pointer to station MAC address @param state : [in] new station state - @return : VOS_STATUS_E_FAILURE if any errors encountered + @return : VOS_STATUS_E_FAILURE if any errors encountered : VOS_STATUS_SUCCESS otherwise =========================================================================== */ extern VOS_STATUS hdd_softap_change_STA_state( hdd_adapter_t *pAdapter, v_MACADDR_t *pDestMacAddress, WLANTL_STAStateType state); @@ -332,7 +332,7 @@ extern VOS_STATUS hdd_softap_change_STA_state( hdd_adapter_t *pAdapter, v_MACADD @param pAdapter : [in] pointer to adapter context @param pDestMacAddress : [in] pointer to station MAC address @param staId : [out] station id - @return : VOS_STATUS_E_FAILURE if any errors encountered + @return : VOS_STATUS_E_FAILURE if any errors encountered : VOS_STATUS_SUCCESS otherwise =========================================================================== */ extern VOS_STATUS hdd_softap_GetStaId( hdd_adapter_t *pAdapter, v_MACADDR_t *pMacAddress, v_U8_t *staId); diff --git a/CORE/HDD/inc/wlan_hdd_tx_rx.h b/CORE/HDD/inc/wlan_hdd_tx_rx.h index b500edd258b1..050fa972fa81 100644 --- a/CORE/HDD/inc/wlan_hdd_tx_rx.h +++ b/CORE/HDD/inc/wlan_hdd_tx_rx.h @@ -57,8 +57,8 @@ #define HDD_80211_HEADER_LEN 24 #define HDD_80211_HEADER_QOS_CTL 2 #define HDD_LLC_HDR_LEN 6 -#define HDD_FRAME_TYPE_MASK 0x0c -#define HDD_FRAME_SUBTYPE_MASK 0xf0 +#define HDD_FRAME_TYPE_MASK 0x0c +#define HDD_FRAME_SUBTYPE_MASK 0xf0 #define HDD_FRAME_TYPE_DATA 0x08 #define HDD_FRAME_TYPE_MGMT 0x00 #define HDD_FRAME_SUBTYPE_QOSDATA 0x80 @@ -75,21 +75,21 @@ #define SME_QOS_UAPSD_CFG_VI_CHANGED_MASK 0xF4 #define SME_QOS_UAPSD_CFG_VO_CHANGED_MASK 0xF8 -/*--------------------------------------------------------------------------- +/*--------------------------------------------------------------------------- Type declarations - -------------------------------------------------------------------------*/ - -/*--------------------------------------------------------------------------- + -------------------------------------------------------------------------*/ + +/*--------------------------------------------------------------------------- Function declarations and documenation - -------------------------------------------------------------------------*/ + -------------------------------------------------------------------------*/ /**============================================================================ - @brief hdd_hard_start_xmit() - Function registered with the Linux OS for + @brief hdd_hard_start_xmit() - Function registered with the Linux OS for transmitting packets @param skb : [in] pointer to OS packet (sk_buff) @param dev : [in] pointer to Libra network device - + @return : NET_XMIT_DROP if packets are dropped : NET_XMIT_SUCCESS if packet is enqueued succesfully ===========================================================================*/ @@ -107,11 +107,11 @@ extern int hdd_mon_hard_start_xmit(struct sk_buff *skb, struct net_device *dev); extern void hdd_tx_timeout(struct net_device *dev); /**============================================================================ - @brief hdd_stats() - Function registered with the Linux OS for + @brief hdd_stats() - Function registered with the Linux OS for device TX/RX statistics @param dev : [in] pointer to Libra network device - + @return : pointer to net_device_stats structure ===========================================================================*/ extern struct net_device_stats* hdd_stats(struct net_device *dev); @@ -120,8 +120,8 @@ extern struct net_device_stats* hdd_stats(struct net_device *dev); @brief hdd_init_tx_rx() - Init function to initialize Tx/RX modules in HDD - @param pAdapter : [in] pointer to adapter context - @return : VOS_STATUS_E_FAILURE if any errors encountered + @param pAdapter : [in] pointer to adapter context + @return : VOS_STATUS_E_FAILURE if any errors encountered : VOS_STATUS_SUCCESS otherwise ===========================================================================*/ extern VOS_STATUS hdd_init_tx_rx( hdd_adapter_t *pAdapter ); @@ -130,8 +130,8 @@ extern VOS_STATUS hdd_init_tx_rx( hdd_adapter_t *pAdapter ); @brief hdd_deinit_tx_rx() - Deinit function to clean up Tx/RX modules in HDD - @param pAdapter : [in] pointer to adapter context - @return : VOS_STATUS_E_FAILURE if any errors encountered + @param pAdapter : [in] pointer to adapter context + @return : VOS_STATUS_E_FAILURE if any errors encountered : VOS_STATUS_SUCCESS otherwise ===========================================================================*/ extern VOS_STATUS hdd_deinit_tx_rx( hdd_adapter_t *pAdapter ); @@ -140,8 +140,8 @@ extern VOS_STATUS hdd_deinit_tx_rx( hdd_adapter_t *pAdapter ); @brief hdd_disconnect_tx_rx() - Disconnect function to clean up Tx/RX modules in HDD - @param pAdapter : [in] pointer to adapter context - @return : VOS_STATUS_E_FAILURE if any errors encountered + @param pAdapter : [in] pointer to adapter context + @return : VOS_STATUS_E_FAILURE if any errors encountered : VOS_STATUS_SUCCESS otherwise ===========================================================================*/ extern VOS_STATUS hdd_disconnect_tx_rx( hdd_adapter_t *pAdapter ); @@ -151,29 +151,29 @@ extern VOS_STATUS hdd_disconnect_tx_rx( hdd_adapter_t *pAdapter ); to indicate that a packet has been transmitted across the SDIO bus succesfully. OS packet resources can be released after this cbk. - @param vosContext : [in] pointer to VOS context - @param pVosPacket : [in] pointer to VOS packet (containing skb) - @param vosStatusIn : [in] status of the transmission + @param vosContext : [in] pointer to VOS context + @param pVosPacket : [in] pointer to VOS packet (containing skb) + @param vosStatusIn : [in] status of the transmission - @return : VOS_STATUS_E_FAILURE if any errors encountered + @return : VOS_STATUS_E_FAILURE if any errors encountered : VOS_STATUS_SUCCESS otherwise ===========================================================================*/ -extern VOS_STATUS hdd_tx_complete_cbk( v_VOID_t *vosContext, - vos_pkt_t *pVosPacket, +extern VOS_STATUS hdd_tx_complete_cbk( v_VOID_t *vosContext, + vos_pkt_t *pVosPacket, VOS_STATUS vosStatusIn ); /**============================================================================ - @brief hdd_tx_fetch_packet_cbk() - Callback function invoked by TL to + @brief hdd_tx_fetch_packet_cbk() - Callback function invoked by TL to fetch a packet for transmission. - @param vosContext : [in] pointer to VOS context + @param vosContext : [in] pointer to VOS context @param staId : [in] Station for which TL is requesting a pkt @param ucAC : [in] pointer to access category requested by TL @param pVosPacket : [out] pointer to VOS packet packet pointer - @param pPktMetaInfo : [out] pointer to meta info for the pkt - + @param pPktMetaInfo : [out] pointer to meta info for the pkt + @return : VOS_STATUS_E_EMPTY if no packets to transmit - : VOS_STATUS_E_FAILURE if any errors encountered + : VOS_STATUS_E_FAILURE if any errors encountered : VOS_STATUS_SUCCESS otherwise ===========================================================================*/ extern VOS_STATUS hdd_tx_fetch_packet_cbk( v_VOID_t *vosContext, @@ -183,36 +183,36 @@ extern VOS_STATUS hdd_tx_fetch_packet_cbk( v_VOID_t *vosContext, WLANTL_MetaInfoType *pPktMetaInfo ); /**============================================================================ - @brief hdd_tx_low_resource_cbk() - Callback function invoked in the - case where VOS packets are not available at the time of the call to get - packets. This callback function is invoked by VOS when packets are + @brief hdd_tx_low_resource_cbk() - Callback function invoked in the + case where VOS packets are not available at the time of the call to get + packets. This callback function is invoked by VOS when packets are available. - @param pVosPacket : [in] pointer to VOS packet - @param userData : [in] opaque user data that was passed initially - - @return : VOS_STATUS_E_FAILURE if any errors encountered, + @param pVosPacket : [in] pointer to VOS packet + @param userData : [in] opaque user data that was passed initially + + @return : VOS_STATUS_E_FAILURE if any errors encountered, : VOS_STATUS_SUCCESS otherwise =============================================================================*/ -extern VOS_STATUS hdd_tx_low_resource_cbk( vos_pkt_t *pVosPacket, +extern VOS_STATUS hdd_tx_low_resource_cbk( vos_pkt_t *pVosPacket, v_VOID_t *userData ); #ifndef QCA_WIFI_2_0 /**============================================================================ @brief hdd_rx_packet_cbk() - Receive callback registered with TL. - TL will call this to notify the HDD when a packet was received + TL will call this to notify the HDD when a packet was received for a registered STA. - @param vosContext : [in] pointer to VOS context - @param pVosPacket : [in] pointer to VOS packet (conatining sk_buff) + @param vosContext : [in] pointer to VOS context + @param pVosPacket : [in] pointer to VOS packet (conatining sk_buff) @param staId : [in] Station Id - @param pRxMetaInfo : [in] pointer to meta info for the received pkt(s) + @param pRxMetaInfo : [in] pointer to meta info for the received pkt(s) - @return : VOS_STATUS_E_FAILURE if any errors encountered, + @return : VOS_STATUS_E_FAILURE if any errors encountered, : VOS_STATUS_SUCCESS otherwise ===========================================================================*/ -extern VOS_STATUS hdd_rx_packet_cbk( v_VOID_t *vosContext, - vos_pkt_t *pVosPacket, +extern VOS_STATUS hdd_rx_packet_cbk( v_VOID_t *vosContext, + vos_pkt_t *pVosPacket, v_U8_t staId, WLANTL_RxMetaInfoType* pRxMetaInfo ); #else @@ -252,17 +252,17 @@ VOS_STATUS hdd_rx_mul_packet_cbk(v_VOID_t *vosContext, /**============================================================================ @brief hdd_IsEAPOLPacket() - Checks the packet is EAPOL or not. - @param pVosPacket : [in] pointer to vos packet - @return : VOS_TRUE if the packet is EAPOL + @param pVosPacket : [in] pointer to vos packet + @return : VOS_TRUE if the packet is EAPOL : VOS_FALSE otherwise ===========================================================================*/ extern v_BOOL_t hdd_IsEAPOLPacket( vos_pkt_t *pVosPacket ); /**============================================================================ - @brief hdd_mon_tx_mgmt_pkt() - Transmit MGMT packet received on monitor + @brief hdd_mon_tx_mgmt_pkt() - Transmit MGMT packet received on monitor interface. - @param pAdapter: [in] SAP/P2P GO adapter. + @param pAdapter: [in] SAP/P2P GO adapter. ===========================================================================*/ void hdd_mon_tx_mgmt_pkt(hdd_adapter_t* pAdapter); diff --git a/CORE/HDD/inc/wlan_hdd_version.h b/CORE/HDD/inc/wlan_hdd_version.h index b79ccaaea495..3c19cc44988a 100644 --- a/CORE/HDD/inc/wlan_hdd_version.h +++ b/CORE/HDD/inc/wlan_hdd_version.h @@ -32,13 +32,13 @@ // Description: Miniport driver version information // // Author: Larry Cawley -// +// //// //=================================================================== #if !defined( __hddVersion_h__ ) #define __hddVersion_h__ -// force string expansion from chars +// force string expansion from chars #define strEXPAND(x) #x #define strSTRING(x) strEXPAND(x) #define strVERSION( _mj, _mn, _sfx, _build ) strSTRING(_mj) "." strSTRING(_mn) "." strSTRING(_sfx) "." strSTRING(_build) @@ -46,38 +46,38 @@ #if defined( BLD_REL ) #define HDD_DRIVER_MAJOR_VERSION BLD_REL -#else -#define HDD_DRIVER_MAJOR_VERSION 0 +#else +#define HDD_DRIVER_MAJOR_VERSION 0 #endif #if defined( BLD_VER ) #define HDD_DRIVER_MINOR_VERSION BLD_VER -#else +#else #define HDD_DRIVER_MINOR_VERSION 0 #endif #if defined( BLD_SFX ) -#define HDD_DRIVER_SUFFIX BLD_SFX +#define HDD_DRIVER_SUFFIX BLD_SFX #else #define HDD_DRIVER_SUFFIX 0 -#endif +#endif #if defined( BLD_NUM ) #define HDD_DRIVER_BUILD BLD_NUM -#else -#define HDD_DRIVER_BUILD 0000 -#endif -#define HDD_BUILD_DATETIME __DATE__ " " __TIME__ +#else +#define HDD_DRIVER_BUILD 0000 +#endif +#define HDD_BUILD_DATETIME __DATE__ " " __TIME__ #define HDD_DRIVER_VERSION WNI_DRIVER_MAJOR_VERSION,WNI_DRIVER_MINOR_VERSION #define HDD_DRIVER_VERSION_STR strVERSION( WNI_DRIVER_MAJOR_VERSION, WNI_DRIVER_MINOR_VERSION, WNI_DRIVER_SUFFIX, WNI_DRIVER_BUILD ) - + #define HDD_COMPANYNAME_FULL "QUALCOMM, Inc." #define HDD_DRIVER_DESCRIPTION "QUALCOMM Gen6 802.11n Wireless Adapter" -#define OEM_FILEDESCRIPTION_STR ANI_DRIVER_DESCRIPTION - -#define OEM_COMPANYNAME_STR ANI_COMPANYNAME_FULL +#define OEM_FILEDESCRIPTION_STR ANI_DRIVER_DESCRIPTION + +#define OEM_COMPANYNAME_STR ANI_COMPANYNAME_FULL #define OEM_INTERNALNAME_STR "WLAN_QCT_DRV.dll" #define OEM_INTERNALNAME_STR2 "WLAN_QCT_DRV.dll" diff --git a/CORE/HDD/inc/wlan_hdd_wext.h b/CORE/HDD/inc/wlan_hdd_wext.h index 85c4b3426d1d..2db90c6735b3 100644 --- a/CORE/HDD/inc/wlan_hdd_wext.h +++ b/CORE/HDD/inc/wlan_hdd_wext.h @@ -125,7 +125,7 @@ typedef enum // TSPEC revoked by AP, async HDD_WLAN_WMM_STATUS_LOST = 18, // some internal failure like memory allocation failure, etc, sync - HDD_WLAN_WMM_STATUS_INTERNAL_FAILURE = 19, + HDD_WLAN_WMM_STATUS_INTERNAL_FAILURE = 19, // U-APSD failed during setup but OTA setup (whether TSPEC exchnage or // re-assoc) was done so app should release this QoS, async @@ -164,27 +164,27 @@ typedef enum /** Disable 11d */ #define DISABLE_11D 0 -/* +/* refer wpa.h in wpa supplicant code for REASON_MICHAEL_MIC_FAILURE - supplicant sets REASON_MICHAEL_MIC_FAILURE as the reason code when it sends the MLME deauth IOCTL + supplicant sets REASON_MICHAEL_MIC_FAILURE as the reason code when it sends the MLME deauth IOCTL for TKIP counter measures */ #define HDD_REASON_MICHAEL_MIC_FAILURE 14 -/* +/* * These are for TLV fields in WPS IE */ -#define HDD_WPS_UUID_LEN 16 -#define HDD_WPS_ELEM_VERSION 0x104a -#define HDD_WPS_ELEM_REQUEST_TYPE 0x103a -#define HDD_WPS_ELEM_CONFIG_METHODS 0x1008 -#define HDD_WPS_ELEM_UUID_E 0x1047 -#define HDD_WPS_ELEM_PRIMARY_DEVICE_TYPE 0x1054 -#define HDD_WPS_ELEM_RF_BANDS 0x103c -#define HDD_WPS_ELEM_ASSOCIATION_STATE 0x1002 +#define HDD_WPS_UUID_LEN 16 +#define HDD_WPS_ELEM_VERSION 0x104a +#define HDD_WPS_ELEM_REQUEST_TYPE 0x103a +#define HDD_WPS_ELEM_CONFIG_METHODS 0x1008 +#define HDD_WPS_ELEM_UUID_E 0x1047 +#define HDD_WPS_ELEM_PRIMARY_DEVICE_TYPE 0x1054 +#define HDD_WPS_ELEM_RF_BANDS 0x103c +#define HDD_WPS_ELEM_ASSOCIATION_STATE 0x1002 #define HDD_WPS_ELEM_CONFIGURATION_ERROR 0x1009 -#define HDD_WPS_ELEM_DEVICE_PASSWORD_ID 0x1012 +#define HDD_WPS_ELEM_DEVICE_PASSWORD_ID 0x1012 #define HDD_WPA_ELEM_VENDOR_EXTENSION 0x1049 @@ -197,12 +197,12 @@ typedef enum #define HDD_WPS_ELEM_WPS_STATE 0x1044 #define HDD_WPS_ELEM_APSETUPLOCK 0x1057 -#define HDD_WPS_ELEM_SELECTEDREGISTRA 0x1041 +#define HDD_WPS_ELEM_SELECTEDREGISTRA 0x1041 #define HDD_WPS_ELEM_RSP_TYPE 0x103B #define HDD_WPS_ELEM_MANUFACTURER 0x1021 #define HDD_WPS_ELEM_MODEL_NAME 0x1023 #define HDD_WPS_ELEM_MODEL_NUM 0x1024 -#define HDD_WPS_ELEM_SERIAL_NUM 0x1042 +#define HDD_WPS_ELEM_SERIAL_NUM 0x1042 #define HDD_WPS_ELEM_DEVICE_NAME 0x1011 #define HDD_WPS_ELEM_REGISTRA_CONF_METHODS 0x1053 @@ -247,35 +247,35 @@ typedef enum WEXT_SCAN_PENDING_MAX } hdd_scan_pending_option_e; -/* - * This structure contains the interface level (granularity) - * configuration information in support of wireless extensions. +/* + * This structure contains the interface level (granularity) + * configuration information in support of wireless extensions. */ -typedef struct hdd_wext_state_s +typedef struct hdd_wext_state_s { /** The CSR "desired" Profile */ - tCsrRoamProfile roamProfile; + tCsrRoamProfile roamProfile; /** BSSID to which connect request is received */ tCsrBssid req_bssId; - /** The association status code */ + /** The association status code */ v_U32_t statusCode; /** wpa version WPA/WPA2/None*/ - v_S31_t wpaVersion; - + v_S31_t wpaVersion; + /**WPA or RSN IE*/ - u_int8_t WPARSNIE[MAX_WPA_RSN_IE_LEN]; + u_int8_t WPARSNIE[MAX_WPA_RSN_IE_LEN]; /**gen IE */ tSirAddie genIE; /**Additional IE for assoc */ - tSirAddie assocAddIE; - + tSirAddie assocAddIE; + /**auth key mgmt */ - v_S31_t authKeyMgmt; + v_S31_t authKeyMgmt; /**vos event */ vos_event_t vosevent; @@ -283,7 +283,7 @@ typedef struct hdd_wext_state_s vos_event_t scanevent; /**Counter measure state, Started/Stopped*/ - v_BOOL_t mTKIPCounterMeasures; + v_BOOL_t mTKIPCounterMeasures; /**Completion Variable*/ struct completion completion_var; @@ -330,7 +330,7 @@ extern int hdd_wlan_get_frag_threshold(hdd_adapter_t *pAdapter, extern void hdd_wlan_get_version(hdd_adapter_t *pAdapter, union iwreq_data *wrqu, char *extra); -extern int iw_get_scan(struct net_device *dev, +extern int iw_get_scan(struct net_device *dev, struct iw_request_info *info, union iwreq_data *wrqu, char *extra); @@ -340,11 +340,11 @@ extern int iw_set_scan(struct net_device *dev, struct iw_request_info *info, extern int iw_set_cscan(struct net_device *dev, struct iw_request_info *info, union iwreq_data *wrqu, char *extra); -extern int iw_set_essid(struct net_device *dev, +extern int iw_set_essid(struct net_device *dev, struct iw_request_info *info, union iwreq_data *wrqu, char *extra); -extern int iw_get_essid(struct net_device *dev, +extern int iw_get_essid(struct net_device *dev, struct iw_request_info *info, struct iw_point *dwrq, char *extra); @@ -386,7 +386,7 @@ void hdd_GetClassA_statisticsCB(void *pStats, void *pContext); VOS_STATUS wlan_hdd_check_ula_done(hdd_adapter_t *pAdapter); -v_U8_t* wlan_hdd_get_vendor_oui_ie_ptr(v_U8_t *oui, v_U8_t oui_size, +v_U8_t* wlan_hdd_get_vendor_oui_ie_ptr(v_U8_t *oui, v_U8_t oui_size, v_U8_t *ie, int ie_len); VOS_STATUS wlan_hdd_enter_bmps(hdd_adapter_t *pAdapter, int mode); @@ -421,4 +421,3 @@ void* wlan_hdd_change_country_code_callback(void *pAdapter); VOS_STATUS wlan_hdd_set_powersave(hdd_adapter_t *pAdapter, int mode); #endif // __WEXT_IW_H__ - diff --git a/CORE/HDD/inc/wlan_hdd_wmm.h b/CORE/HDD/inc/wlan_hdd_wmm.h index 9b9ed5a16f0e..c2400ecaca66 100644 --- a/CORE/HDD/inc/wlan_hdd_wmm.h +++ b/CORE/HDD/inc/wlan_hdd_wmm.h @@ -86,7 +86,7 @@ typedef enum HDD_LINUX_AC_BK = 3 } hdd_wmm_linuxac_t; - + /*! @brief types of classification supported */ typedef enum @@ -201,7 +201,7 @@ typedef struct } hdd_wmm_status_t; extern const v_U8_t hdd_QdiscAcToTlAC[]; -extern const v_U8_t hddWmmUpToAcMap[]; +extern const v_U8_t hddWmmUpToAcMap[]; extern const v_U8_t hddLinuxUpToAcMap[]; /**============================================================================ @@ -362,7 +362,7 @@ v_BOOL_t hdd_wmm_is_active( hdd_adapter_t* pAdapter ); @param handle : [in] handle to uniquely identify a TS @param pTspec : [in] pointer to the traffic spec - @return : HDD_WLAN_WMM_STATUS_* + @return : HDD_WLAN_WMM_STATUS_* ===========================================================================*/ hdd_wlan_wmm_status_e hdd_wmm_addts( hdd_adapter_t* pAdapter, v_U32_t handle, @@ -375,7 +375,7 @@ hdd_wlan_wmm_status_e hdd_wmm_addts( hdd_adapter_t* pAdapter, @param pAdapter : [in] pointer to adapter context @param handle : [in] handle to uniquely identify a TS - @return : HDD_WLAN_WMM_STATUS_* + @return : HDD_WLAN_WMM_STATUS_* ===========================================================================*/ hdd_wlan_wmm_status_e hdd_wmm_delts( hdd_adapter_t* pAdapter, v_U32_t handle ); @@ -387,7 +387,7 @@ hdd_wlan_wmm_status_e hdd_wmm_delts( hdd_adapter_t* pAdapter, @param pAdapter : [in] pointer to adapter context @param handle : [in] handle to uniquely identify a TS - @return : HDD_WLAN_WMM_STATUS_* + @return : HDD_WLAN_WMM_STATUS_* ===========================================================================*/ hdd_wlan_wmm_status_e hdd_wmm_checkts( hdd_adapter_t* pAdapter, v_U32_t handle ); diff --git a/CORE/HDD/inc/wlan_hdd_wowl.h b/CORE/HDD/inc/wlan_hdd_wowl.h index 842acbb222c9..d6eab9ff18d9 100644 --- a/CORE/HDD/inc/wlan_hdd_wowl.h +++ b/CORE/HDD/inc/wlan_hdd_wowl.h @@ -31,8 +31,8 @@ /*============================================================================ @file wlan_hdd_wowl.h - This module houses all the logic for WOWL in HDD. - + This module houses all the logic for WOWL in HDD. + It provides the following APIs - Ability to enable/disable following WoWL modes @@ -40,12 +40,12 @@ 2) Pattern Byte Matching (PBM) mode - Ability to add/remove patterns for PBM - A Magic Packet is a packet that contains 6 0xFFs followed by 16 contiguous + A Magic Packet is a packet that contains 6 0xFFs followed by 16 contiguous copies of the receiving NIC's Ethernet address. There is no API to configure Magic Packet Pattern. Wakeup pattern (used for PBM) is defined as following: - typedef struct + typedef struct { U8 PatternSize; // Non-Zero pattern size U8 PatternMaskSize; // Non-zero pattern mask size @@ -54,19 +54,19 @@ } hdd_wowl_ptrn_t; PatternSize and PatternMaskSize indicate size of the variable length Pattern - and PatternMask. PatternMask indicates which bytes of an incoming packet + and PatternMask. PatternMask indicates which bytes of an incoming packet should be compared with corresponding bytes in the pattern. - Maximum allowed pattern size is 128 bytes. Maximum allowed PatternMaskSize - is 16 bytes. + Maximum allowed pattern size is 128 bytes. Maximum allowed PatternMaskSize + is 16 bytes. Maximum number of patterns that can be configured is 8 HDD will add following 2 commonly used patterns for PBM by default: 1) ARP Broadcast Pattern 2) Unicast Pattern - - However note that WoWL will not be enabled by default by HDD. WoWL needs to + + However note that WoWL will not be enabled by default by HDD. WoWL needs to enabled explcitly by exercising the iwpriv command. HDD will expose an API that accepts patterns as Hex string in the following @@ -87,13 +87,13 @@ Mangement frames are not subjected to WoWL filtering and are discarded when WoWL is enabled. - Whenever a patern match succeeds, RX path is restored and packets (both - management and data) will be pushed to the host from that point onwards. - Therefore, exit from WoWL is implicit and happens automatically when the + Whenever a patern match succeeds, RX path is restored and packets (both + management and data) will be pushed to the host from that point onwards. + Therefore, exit from WoWL is implicit and happens automatically when the first packet match succeeds. WoWL works on top of BMPS. So when WoWL is requested, SME will attempt to put - the device in BMPS mode (if not already in BMPS). If attempt to BMPS fails, + the device in BMPS mode (if not already in BMPS). If attempt to BMPS fails, request for WoWL will be rejected. ============================================================================*/ @@ -193,7 +193,7 @@ v_BOOL_t hdd_exit_wowl (hdd_adapter_t*pAdapter); /**============================================================================ @brief hdd_init_wowl() - Init function which will initialize the WoWL module - and perform any required intial configuration + and perform any required intial configuration @return : FALSE if any errors encountered : TRUE otherwise diff --git a/CORE/HDD/inc/wlan_qct_driver.h b/CORE/HDD/inc/wlan_qct_driver.h index c42a23d68be8..31c30706b9c7 100644 --- a/CORE/HDD/inc/wlan_qct_driver.h +++ b/CORE/HDD/inc/wlan_qct_driver.h @@ -48,9 +48,9 @@ $Header:$ $DateTime: $ $Author: $ - when who what, where, why + when who what, where, why -------- --- -------------------------------------------------------- - 04/05/09 kanand Created module. + 04/05/09 kanand Created module. ===========================================================================*/ @@ -65,16 +65,16 @@ #include <linux/cdev.h> #include <linux/time.h> -/*--------------------------------------------------------------------------- +/*--------------------------------------------------------------------------- * Preprocessor definitions and constants - *-------------------------------------------------------------------------*/ + *-------------------------------------------------------------------------*/ -/*--------------------------------------------------------------------------- +/*--------------------------------------------------------------------------- * Type declarations - *-------------------------------------------------------------------------*/ + *-------------------------------------------------------------------------*/ -/*------------------------------------------------------------------------- +/*------------------------------------------------------------------------- * Function declarations and documentation * ------------------------------------------------------------------------*/ - + #endif // if !defined __WLAN_QCT_DRIVER_H diff --git a/CORE/HDD/src/bap_hdd_main.c b/CORE/HDD/src/bap_hdd_main.c index 4a3bea88204a..9d2f08ba87a3 100644 --- a/CORE/HDD/src/bap_hdd_main.c +++ b/CORE/HDD/src/bap_hdd_main.c @@ -479,7 +479,7 @@ static VOS_STATUS WLANBAP_STAFetchPktCB { VOS_TRACE( VOS_MODULE_ID_BAP, VOS_TRACE_LEVEL_ERROR, "WLANBAP_STAFetchPktCB vos_pkt_wrap_data_packet " "failed status =%d\n", VosStatus ); - kfree_skb(skb); + kfree_skb(skb); return VosStatus; } @@ -496,7 +496,7 @@ static VOS_STATUS WLANBAP_STAFetchPktCB // return the packet VosStatus = vos_pkt_return_packet( pVosPkt ); - kfree_skb(skb); + kfree_skb(skb); VOS_ASSERT(VOS_IS_STATUS_SUCCESS( VosStatus )); return VosStatus; @@ -573,14 +573,14 @@ static VOS_STATUS WLANBAP_STARxCB // get the pointer to the next packet in the chain // (but don't unlink the packet since we free the entire chain later) VosStatus = vos_pkt_walk_packet_chain( pVosPacket, &pNextVosPacket, VOS_FALSE); - + // both "success" and "empty" are acceptable results if (!((VosStatus == VOS_STATUS_SUCCESS) || (VosStatus == VOS_STATUS_E_EMPTY))) { VOS_TRACE( VOS_MODULE_ID_HDD, VOS_TRACE_LEVEL_FATAL,"%s: Failure walking packet chain", __func__); return VOS_STATUS_E_FAILURE; } - + // process the packet VosStatus = WLANBAP_XlateRxDataPkt( ppctx->bapHdl, pctx->PhyLinkHdl, &Ac, pVosPacket ); @@ -613,7 +613,7 @@ static VOS_STATUS WLANBAP_STARxCB bt_cb(skb)->pkt_type = HCI_ACLDATA_PKT; //skb->protocol = eth_type_trans(skb, skb->dev); //skb->ip_summed = CHECKSUM_UNNECESSARY; - + // This is my receive skb pointer gpBslctx->rx_skb = skb; @@ -622,7 +622,7 @@ static VOS_STATUS WLANBAP_STARxCB // now process the next packet in the chain pVosPacket = pNextVosPacket; - + } while (pVosPacket); @@ -874,13 +874,13 @@ static VOS_STATUS WLANBAP_EventCB if ( pHddHdl == NULL ) { - /* Consider the following error scenarios to bypass the NULL check: - - create LL without a call for create PL before - - delete LL or PL when no AMP connection has been established yet - Client context is unimportant from HCI point of view, only needed by the TLV API in BAP - TODO: Change the TLV APIs to not to carry the client context; it doesn't use it anyway + /* Consider the following error scenarios to bypass the NULL check: + - create LL without a call for create PL before + - delete LL or PL when no AMP connection has been established yet + Client context is unimportant from HCI point of view, only needed by the TLV API in BAP + TODO: Change the TLV APIs to not to carry the client context; it doesn't use it anyway */ - if (( AssocSpecificEvent ) && + if (( AssocSpecificEvent ) && (BTAMP_TLV_HCI_PHYSICAL_LINK_COMPLETE_EVENT != pBapHCIEvent->bapHCIEventCode) && (BTAMP_TLV_HCI_DISCONNECT_PHYSICAL_LINK_COMPLETE_EVENT != pBapHCIEvent->bapHCIEventCode)) { @@ -1514,9 +1514,9 @@ static VOS_STATUS WLANBAP_EventCB return(VOS_STATUS_SUCCESS); } // WLANBAP_EventCB() -static VOS_STATUS +static VOS_STATUS WLANBAP_PhyLinkFailure -( +( BslClientCtxType* pctx, v_U8_t phy_link_handle ) @@ -1524,13 +1524,13 @@ WLANBAP_PhyLinkFailure VOS_STATUS vosStatus; tBtampHCI_Event bapHCIEvent; - /* Format the Physical Link Complete event to return... */ + /* Format the Physical Link Complete event to return... */ bapHCIEvent.bapHCIEventCode = BTAMP_TLV_HCI_PHYSICAL_LINK_COMPLETE_EVENT; bapHCIEvent.u.btampPhysicalLinkCompleteEvent.present = 1; bapHCIEvent.u.btampPhysicalLinkCompleteEvent.status = WLANBAP_ERROR_UNSPECIFIED_ERROR; - bapHCIEvent.u.btampPhysicalLinkCompleteEvent.phy_link_handle + bapHCIEvent.u.btampPhysicalLinkCompleteEvent.phy_link_handle = phy_link_handle; - bapHCIEvent.u.btampPhysicalLinkCompleteEvent.ch_number + bapHCIEvent.u.btampPhysicalLinkCompleteEvent.ch_number = 0; //TBD: Could be a cleaner way to get the PhyLinkCtx handle; For now works BslPhyLinkCtx[0].pClientCtx = pctx; diff --git a/CORE/HDD/src/wlan_hdd_cfg80211.c b/CORE/HDD/src/wlan_hdd_cfg80211.c index fe126e6fa469..84223138d653 100644 --- a/CORE/HDD/src/wlan_hdd_cfg80211.c +++ b/CORE/HDD/src/wlan_hdd_cfg80211.c @@ -10089,4 +10089,3 @@ static struct cfg80211_ops wlan_hdd_cfg80211_ops = #endif .dump_survey = wlan_hdd_cfg80211_dump_survey, }; - diff --git a/CORE/HDD/src/wlan_hdd_debugfs.c b/CORE/HDD/src/wlan_hdd_debugfs.c index 98b791deeb7f..bc9d0e81be3f 100644 --- a/CORE/HDD/src/wlan_hdd_debugfs.c +++ b/CORE/HDD/src/wlan_hdd_debugfs.c @@ -471,4 +471,3 @@ void hdd_debugfs_exit(hdd_context_t *pHddCtx) debugfs_remove_recursive(pHddCtx->debugfs_phy); } #endif /* #ifdef WLAN_OPEN_SOURCE */ - diff --git a/CORE/HDD/src/wlan_hdd_dev_pwr.c b/CORE/HDD/src/wlan_hdd_dev_pwr.c index 73c1d8baaa80..30b01fc2b84e 100644 --- a/CORE/HDD/src/wlan_hdd_dev_pwr.c +++ b/CORE/HDD/src/wlan_hdd_dev_pwr.c @@ -25,21 +25,21 @@ * to the Linux Foundation. */ -/**========================================================================= - - EDIT HISTORY FOR FILE - - - This section contains comments describing changes made to the module. - Notice that changes are listed in reverse chronological order. - - - $Header:$ $DateTime: $ $Author: $ - - - when who what, where, why +/**========================================================================= + + EDIT HISTORY FOR FILE + + + This section contains comments describing changes made to the module. + Notice that changes are listed in reverse chronological order. + + + $Header:$ $DateTime: $ $Author: $ + + + when who what, where, why -------- --- -------------------------------------------------------- - 03/29/11 tbh Created module. + 03/29/11 tbh Created module. ==========================================================================*/ @@ -121,7 +121,7 @@ static int wlan_suspend(hdd_context_t* pHddCtx) } /* - Suspending MC Thread, Rx Thread and Tx Thread as the platform driver is going to Suspend. + Suspending MC Thread, Rx Thread and Tx Thread as the platform driver is going to Suspend. */ VOS_TRACE(VOS_MODULE_ID_HDD, VOS_TRACE_LEVEL_INFO, "%s: Suspending Mc, Rx and Tx Threads",__func__); @@ -206,7 +206,7 @@ static int wlan_suspend(hdd_context_t* pHddCtx) /* Set the Mc Thread as Suspended */ pHddCtx->isMcThreadSuspended = TRUE; - + /* Set the Station state as Suspended */ pHddCtx->isWlanSuspended = TRUE; @@ -316,7 +316,7 @@ int hddDevSuspendHdlr(struct device *dev) /*---------------------------------------------------------------------------- @brief Function to resume the wlan driver. - This function will get called by platform driver Resume on System Resume + This function will get called by platform driver Resume on System Resume @param dev platform_func_device @@ -360,7 +360,7 @@ static const struct dev_pm_ops pm_ops = { * @brief Registration function. - Register suspend, resume callback functions with platform driver. + Register suspend, resume callback functions with platform driver. @param hdd_context_t pHddCtx Global hdd context @@ -408,7 +408,7 @@ VOS_STATUS hddDeregisterPmOps(hdd_context_t *pHddCtx) @param dev : Device context changedTmLevel : Changed new TM level - @return + @return ----------------------------------------------------------------------------*/ void hddDevTmLevelChangedHandler(struct device *dev, int changedTmLevel) @@ -475,7 +475,7 @@ void hddDevTmLevelChangedHandler(struct device *dev, int changedTmLevel) if (hdd_connIsConnected(WLAN_HDD_GET_STATION_CTX_PTR(staAdapater))) { sme_RoamDisconnect(pHddCtx->hHal, - staAdapater->sessionId, + staAdapater->sessionId, eCSR_DISCONNECT_REASON_UNSPECIFIED); } } @@ -561,7 +561,7 @@ VOS_STATUS hddDevTmRegisterNotifyCallback(hdd_context_t *pHddCtx) /* Set Default TM Level as Lowest, do nothing */ pHddCtx->tmInfo.currentTmLevel = WLAN_HDD_TM_LEVEL_0; - vos_mem_zero(&pHddCtx->tmInfo.tmAction, sizeof(hdd_tmLevelAction_t)); + vos_mem_zero(&pHddCtx->tmInfo.tmAction, sizeof(hdd_tmLevelAction_t)); vos_timer_init(&pHddCtx->tmInfo.txSleepTimer, VOS_TIMER_TYPE_SW, hddDevTmTxBlockTimeoutHandler, diff --git a/CORE/HDD/src/wlan_hdd_dp_utils.c b/CORE/HDD/src/wlan_hdd_dp_utils.c index c6fdca5e8728..a58d068fd58a 100644 --- a/CORE/HDD/src/wlan_hdd_dp_utils.c +++ b/CORE/HDD/src/wlan_hdd_dp_utils.c @@ -43,11 +43,11 @@ /**----------------------------------------------------------------------------- Preprocessor definitions and constants ----------------------------------------------------------------------------*/ - + /**----------------------------------------------------------------------------- Type declarations ----------------------------------------------------------------------------*/ - + /**----------------------------------------------------------------------------- Function declarations and documenation ----------------------------------------------------------------------------*/ @@ -83,7 +83,7 @@ VOS_STATUS hdd_list_remove_front( hdd_list_t *pList, hdd_list_node_t **ppNode ) { return VOS_STATUS_E_EMPTY; } - + listptr = pList->anchor.next; *ppNode = listptr; list_del(pList->anchor.next); @@ -121,7 +121,7 @@ VOS_STATUS hdd_list_remove_node( hdd_list_t *pList, } // verify that pNodeToRemove is indeed part of list pList - list_for_each(tmp, &pList->anchor) + list_for_each(tmp, &pList->anchor) { if (tmp == pNodeToRemove) { @@ -132,7 +132,7 @@ VOS_STATUS hdd_list_remove_node( hdd_list_t *pList, if (found == 0) return VOS_STATUS_E_INVAL; - list_del(pNodeToRemove); + list_del(pNodeToRemove); pList->count--; return VOS_STATUS_SUCCESS; @@ -158,7 +158,7 @@ VOS_STATUS hdd_list_peek_next( hdd_list_t *pList, hdd_list_node_t *pNode, struct list_head * listptr; int found = 0; hdd_list_node_t *tmp; - + if ( ( pList == NULL) || ( pNode == NULL) || (ppNode == NULL)) { return VOS_STATUS_E_FAULT; @@ -170,7 +170,7 @@ VOS_STATUS hdd_list_peek_next( hdd_list_t *pList, hdd_list_node_t *pNode, } // verify that pNode is indeed part of list pList - list_for_each(tmp, &pList->anchor) + list_for_each(tmp, &pList->anchor) { if (tmp == pNode) { @@ -219,4 +219,3 @@ VOS_STATUS hdd_string_to_hex( char *pSrcMac, int length, char *pDescMac ) return VOS_STATUS_SUCCESS; } - diff --git a/CORE/HDD/src/wlan_hdd_early_suspend.c b/CORE/HDD/src/wlan_hdd_early_suspend.c index b7034d827650..efe694160e30 100644 --- a/CORE/HDD/src/wlan_hdd_early_suspend.c +++ b/CORE/HDD/src/wlan_hdd_early_suspend.c @@ -119,7 +119,7 @@ void hdd_suspend_standby_cbk (void *callbackContext, eHalStatus status) { hdd_context_t *pHddCtx = (hdd_context_t*)callbackContext; hddLog(VOS_TRACE_LEVEL_INFO, "%s: Standby status = %d", __func__, status); - g_standby_status = status; + g_standby_status = status; if(eHAL_STATUS_SUCCESS == status) { @@ -153,7 +153,7 @@ void hdd_suspend_full_pwr_callback(void *callbackContext, eHalStatus status) } eHalStatus hdd_exit_standby(hdd_context_t *pHddCtx) -{ +{ eHalStatus status = VOS_STATUS_SUCCESS; hddLog(VOS_TRACE_LEVEL_INFO, "%s: WLAN being resumed from standby",__func__); @@ -166,7 +166,7 @@ eHalStatus hdd_exit_standby(hdd_context_t *pHddCtx) if(status == eHAL_STATUS_PMC_PENDING) { //Block on a completion variable. Can't wait forever though - wait_for_completion_interruptible_timeout(&pHddCtx->full_pwr_comp_var, + wait_for_completion_interruptible_timeout(&pHddCtx->full_pwr_comp_var, msecs_to_jiffies(WLAN_WAIT_TIME_FULL_PWR)); status = g_full_pwr_status; if(g_full_pwr_status != eHAL_STATUS_SUCCESS) @@ -207,20 +207,20 @@ VOS_STATUS hdd_enter_standby(hdd_context_t *pHddCtx) //Note we do not disable queues unnecessarily. Queues should already be disabled //if STA is disconnected or the queue will be disabled as and when disconnect //happens because of standby procedure. - + //Ensure that device is in full power first. There is scope for optimization //here especially in scenarios where PMC is already in IMPS or REQUEST_IMPS. //Core s/w needs to be optimized to handle this. Until then we request full //power before issuing request for standby. INIT_COMPLETION(pHddCtx->full_pwr_comp_var); g_full_pwr_status = eHAL_STATUS_FAILURE; - halStatus = sme_RequestFullPower(pHddCtx->hHal, hdd_suspend_full_pwr_callback, + halStatus = sme_RequestFullPower(pHddCtx->hHal, hdd_suspend_full_pwr_callback, pHddCtx, eSME_FULL_PWR_NEEDED_BY_HDD); if(halStatus == eHAL_STATUS_PMC_PENDING) { //Block on a completion variable. Can't wait forever though - wait_for_completion_interruptible_timeout(&pHddCtx->full_pwr_comp_var, + wait_for_completion_interruptible_timeout(&pHddCtx->full_pwr_comp_var, msecs_to_jiffies(WLAN_WAIT_TIME_FULL_PWR)); if(g_full_pwr_status != eHAL_STATUS_SUCCESS) { @@ -253,10 +253,10 @@ VOS_STATUS hdd_enter_standby(hdd_context_t *pHddCtx) g_standby_status = eHAL_STATUS_FAILURE; halStatus = sme_RequestStandby(pHddCtx->hHal, hdd_suspend_standby_cbk, pHddCtx); - if (halStatus == eHAL_STATUS_PMC_PENDING) + if (halStatus == eHAL_STATUS_PMC_PENDING) { //Wait till WLAN device enters standby mode - wait_for_completion_timeout(&pHddCtx->standby_comp_var, + wait_for_completion_timeout(&pHddCtx->standby_comp_var, msecs_to_jiffies(WLAN_WAIT_TIME_STANDBY)); if (g_standby_status != eHAL_STATUS_SUCCESS && g_standby_status != eHAL_STATUS_PMC_NOT_NOW) { @@ -308,13 +308,13 @@ VOS_STATUS hdd_enter_deep_sleep(hdd_context_t *pHddCtx, hdd_adapter_t *pAdapter) //Ensure that device is in full power as we will touch H/W during vos_Stop INIT_COMPLETION(pHddCtx->full_pwr_comp_var); g_full_pwr_status = eHAL_STATUS_FAILURE; - halStatus = sme_RequestFullPower(pHddCtx->hHal, hdd_suspend_full_pwr_callback, + halStatus = sme_RequestFullPower(pHddCtx->hHal, hdd_suspend_full_pwr_callback, pHddCtx, eSME_FULL_PWR_NEEDED_BY_HDD); if(halStatus == eHAL_STATUS_PMC_PENDING) { //Block on a completion variable. Can't wait forever though - wait_for_completion_interruptible_timeout(&pHddCtx->full_pwr_comp_var, + wait_for_completion_interruptible_timeout(&pHddCtx->full_pwr_comp_var, msecs_to_jiffies(WLAN_WAIT_TIME_FULL_PWR)); if(g_full_pwr_status != eHAL_STATUS_SUCCESS){ hddLog(VOS_TRACE_LEVEL_FATAL,"%s: sme_RequestFullPower failed",__func__); @@ -336,7 +336,7 @@ VOS_STATUS hdd_enter_deep_sleep(hdd_context_t *pHddCtx, hdd_adapter_t *pAdapter) if(halStatus == eHAL_STATUS_SUCCESS) { //Block on a completion variable. Can't wait forever though. - wait_for_completion_interruptible_timeout(&pAdapter->disconnect_comp_var, + wait_for_completion_interruptible_timeout(&pAdapter->disconnect_comp_var, msecs_to_jiffies(WLAN_WAIT_TIME_DISCONNECT)); } @@ -390,7 +390,7 @@ VOS_STATUS hdd_exit_deep_sleep(hdd_context_t *pHddCtx, hdd_adapter_t *pAdapter) goto err_deep_sleep; } - VOS_TRACE( VOS_MODULE_ID_HDD, VOS_TRACE_LEVEL_INFO, + VOS_TRACE( VOS_MODULE_ID_HDD, VOS_TRACE_LEVEL_INFO, "%s: calling vos_start",__func__); vosStatus = vos_start( pHddCtx->pvosContext ); VOS_ASSERT( VOS_IS_STATUS_SUCCESS( vosStatus ) ); @@ -401,7 +401,7 @@ VOS_STATUS hdd_exit_deep_sleep(hdd_context_t *pHddCtx, hdd_adapter_t *pAdapter) goto err_deep_sleep; } - VOS_TRACE( VOS_MODULE_ID_HDD, VOS_TRACE_LEVEL_INFO, + VOS_TRACE( VOS_MODULE_ID_HDD, VOS_TRACE_LEVEL_INFO, "%s: calling hdd_post_voss_start_config",__func__); vosStatus = hdd_post_voss_start_config( pHddCtx ); VOS_ASSERT( VOS_IS_STATUS_SUCCESS( vosStatus ) ); @@ -1188,7 +1188,7 @@ void hdd_unregister_mcast_bcast_filter(hdd_context_t *pHddCtx) return; } - if (WLAN_MAP_SUSPEND_TO_MCAST_BCAST_FILTER == + if (WLAN_MAP_SUSPEND_TO_MCAST_BCAST_FILTER == pHddCtx->cfg_ini->nEnableSuspend) { if(!pHddCtx->cfg_ini->enablePowersaveOffload) @@ -1304,7 +1304,7 @@ void hdd_resume_wlan(void) hddLog(VOS_TRACE_LEVEL_FATAL,"%s: HDD context is Null",__func__); return; } - + if (pHddCtx->isLogpInProgress) { hddLog(VOS_TRACE_LEVEL_INFO, "%s: Ignore resume wlan, LOGP in progress!", __func__); @@ -1328,8 +1328,8 @@ void hdd_resume_wlan(void) } -#ifdef SUPPORT_EARLY_SUSPEND_STANDBY_DEEPSLEEP - if(pHddCtx->hdd_ps_state == eHDD_SUSPEND_DEEP_SLEEP) +#ifdef SUPPORT_EARLY_SUSPEND_STANDBY_DEEPSLEEP + if(pHddCtx->hdd_ps_state == eHDD_SUSPEND_DEEP_SLEEP) { hddLog(VOS_TRACE_LEVEL_INFO, "%s: WLAN being resumed from deep sleep",__func__); hdd_exit_deep_sleep(pAdapter); @@ -1339,7 +1339,7 @@ void hdd_resume_wlan(void) if(pHddCtx->hdd_ignore_dtim_enabled == TRUE) { /*Switch back to DTIM 1*/ - tSirSetPowerParamsReq powerRequest = { 0 }; + tSirSetPowerParamsReq powerRequest = { 0 }; powerRequest.uIgnoreDTIM = pHddCtx->hdd_actual_ignore_DTIM_value; powerRequest.uListenInterval = pHddCtx->hdd_actual_LI_value; @@ -1352,10 +1352,10 @@ void hdd_resume_wlan(void) /* Update ignoreDTIM and ListedInterval in CFG with default values */ ccmCfgSetInt(pHddCtx->hHal, WNI_CFG_IGNORE_DTIM, powerRequest.uIgnoreDTIM, NULL, eANI_BOOLEAN_FALSE); - ccmCfgSetInt(pHddCtx->hHal, WNI_CFG_LISTEN_INTERVAL, powerRequest.uListenInterval, + ccmCfgSetInt(pHddCtx->hHal, WNI_CFG_LISTEN_INTERVAL, powerRequest.uListenInterval, NULL, eANI_BOOLEAN_FALSE); - VOS_TRACE(VOS_MODULE_ID_HDD, VOS_TRACE_LEVEL_INFO, + VOS_TRACE(VOS_MODULE_ID_HDD, VOS_TRACE_LEVEL_INFO, "Switch to DTIM%d \n",powerRequest.uListenInterval); sme_SetPowerParams( WLAN_HDD_GET_HAL_CTX(pAdapter), &powerRequest, FALSE); @@ -1382,25 +1382,25 @@ void hdd_resume_wlan(void) pAdapterNode = pNext; } -#ifdef SUPPORT_EARLY_SUSPEND_STANDBY_DEEPSLEEP - if(pHddCtx->hdd_ps_state == eHDD_SUSPEND_STANDBY) +#ifdef SUPPORT_EARLY_SUSPEND_STANDBY_DEEPSLEEP + if(pHddCtx->hdd_ps_state == eHDD_SUSPEND_STANDBY) { hdd_exit_standby(pHddCtx); - } + } #endif return; } -VOS_STATUS hdd_wlan_reset_initialization(void) +VOS_STATUS hdd_wlan_reset_initialization(void) { v_CONTEXT_t pVosContext = NULL; - hddLog(VOS_TRACE_LEVEL_FATAL, "%s: WLAN being reset",__func__); + hddLog(VOS_TRACE_LEVEL_FATAL, "%s: WLAN being reset",__func__); //Get the global VOSS context. pVosContext = vos_get_global_context(VOS_MODULE_ID_SYS, NULL); - if(!pVosContext) + if(!pVosContext) { hddLog(VOS_TRACE_LEVEL_FATAL,"%s: Global VOS context is Null", __func__); return VOS_STATUS_E_FAILURE; diff --git a/CORE/HDD/src/wlan_hdd_main.c b/CORE/HDD/src/wlan_hdd_main.c index a23c6f612b56..47b0999bd012 100644 --- a/CORE/HDD/src/wlan_hdd_main.c +++ b/CORE/HDD/src/wlan_hdd_main.c @@ -317,7 +317,7 @@ static int hdd_netdev_notifier_call(struct notifier_block * nb, case NETDEV_GOING_DOWN: if( pAdapter->scan_info.mScanPending != FALSE ) - { + { int result; INIT_COMPLETION(pAdapter->scan_info.abortscan_event_var); hdd_abort_mac_scan(pAdapter->pHddCtx, pAdapter->sessionId); @@ -381,7 +381,7 @@ static int con_mode; * con_mode is changed by userspace to indicate a mode change which will * result in calling the module exit and init functions. The module * exit function will clean up based on the value of con_mode prior to it - * being changed by userspace. So curr_con_mode records the current con_mode + * being changed by userspace. So curr_con_mode records the current con_mode * for exit when con_mode becomes the next mode for init */ static int curr_con_mode; @@ -2321,13 +2321,13 @@ int hdd_ioctl(struct net_device *dev, struct ifreq *ifr, int cmd) VOS_TRACE( VOS_MODULE_ID_HDD, VOS_TRACE_LEVEL_FATAL, "%s: HDD adapter context is Null", __func__); ret = -ENODEV; - goto exit; + goto exit; } if ((!ifr) || (!ifr->ifr_data)) { ret = -EINVAL; - goto exit; + goto exit; } if ((WLAN_HDD_GET_CTX(pAdapter))->isLogpInProgress) @@ -5768,13 +5768,13 @@ int hdd_open (struct net_device *dev) VOS_STATUS status; v_BOOL_t in_standby = TRUE; - if (NULL == pAdapter) + if (NULL == pAdapter) { VOS_TRACE( VOS_MODULE_ID_HDD, VOS_TRACE_LEVEL_FATAL, "%s: HDD adapter context is Null", __func__); return -ENODEV; } - + pHddCtx = (hdd_context_t*)pAdapter->pHddCtx; if (NULL == pHddCtx) { @@ -5799,19 +5799,19 @@ int hdd_open (struct net_device *dev) pAdapterNode = pNext; } } - + if (TRUE == in_standby) { if (VOS_STATUS_SUCCESS != wlan_hdd_exit_lowpower(pHddCtx, pAdapter)) { - hddLog(VOS_TRACE_LEVEL_ERROR, "%s: Failed to bring " + hddLog(VOS_TRACE_LEVEL_ERROR, "%s: Failed to bring " "wlan out of power save", __func__); return -EINVAL; } } - + set_bit(DEVICE_IFACE_OPENED, &pAdapter->event_flags); - if (hdd_connIsConnected(WLAN_HDD_GET_STATION_CTX_PTR(pAdapter))) + if (hdd_connIsConnected(WLAN_HDD_GET_STATION_CTX_PTR(pAdapter))) { VOS_TRACE( VOS_MODULE_ID_HDD, VOS_TRACE_LEVEL_INFO, "%s: Enabling Tx Queues", __func__); @@ -5855,7 +5855,7 @@ int hdd_stop (struct net_device *dev) hdd_adapter_list_node_t *pAdapterNode = NULL, *pNext = NULL; VOS_STATUS status; v_BOOL_t enter_standby = TRUE; - + ENTER(); if (NULL == pAdapter) @@ -5911,7 +5911,7 @@ int hdd_stop (struct net_device *dev) if (TRUE == enter_standby) { - hddLog(VOS_TRACE_LEVEL_INFO, "%s: All Interfaces are Down " + hddLog(VOS_TRACE_LEVEL_INFO, "%s: All Interfaces are Down " "entering standby", __func__); if (VOS_STATUS_SUCCESS != wlan_hdd_enter_lowpower(pHddCtx)) { @@ -5920,7 +5920,7 @@ int hdd_stop (struct net_device *dev) "wlan in power save", __func__); } } - + EXIT(); return 0; } @@ -6005,7 +6005,7 @@ VOS_STATUS hdd_release_firmware(char *pFileName,v_VOID_t *pCtx) if (!strcmp(WLAN_FW_FILE, pFileName)) { - + hddLog(VOS_TRACE_LEVEL_INFO_HIGH,"%s: Loaded firmware file is %s",__func__,pFileName); if(pHddCtx->fw) { @@ -6253,7 +6253,7 @@ static int hdd_set_mac_address(struct net_device *dev, void *addr) memcpy(&pAdapter->macAddressCurrent, psta_mac_addr->sa_data, ETH_ALEN); -#ifdef HDD_SESSIONIZE +#ifdef HDD_SESSIONIZE // set the MAC address though the STA ID CFG. halStatus = ccmCfgSetStr( pAdapter->hHal, WNI_CFG_STA_ID, (v_U8_t *)&pAdapter->macAddressCurrent, @@ -6292,7 +6292,7 @@ void wlan_hdd_release_intf_addr(hdd_context_t* pHddCtx, tANI_U8* releaseAddr) { pHddCtx->cfg_ini->intfAddrMask &= ~(1 << i); break; - } + } } return; } @@ -6320,7 +6320,7 @@ void wlan_hdd_release_intf_addr(hdd_context_t* pHddCtx, tANI_U8* releaseAddr) .ndo_open = hdd_mon_open, .ndo_stop = hdd_stop, .ndo_uninit = hdd_uninit, - .ndo_start_xmit = hdd_mon_hard_start_xmit, + .ndo_start_xmit = hdd_mon_hard_start_xmit, .ndo_tx_timeout = hdd_tx_timeout, .ndo_get_stats = hdd_stats, .ndo_do_ioctl = hdd_ioctl, @@ -6355,9 +6355,9 @@ static hdd_adapter_t* hdd_alloc_station_adapter( hdd_context_t *pHddCtx, tSirMac hdd_adapter_t *pAdapter = NULL; /* * cfg80211 initialization and registration.... - */ + */ pWlanDev = alloc_netdev_mq(sizeof( hdd_adapter_t ), name, ether_setup, NUM_TX_QUEUES); - + if(pWlanDev != NULL) { @@ -6367,7 +6367,7 @@ static hdd_adapter_t* hdd_alloc_station_adapter( hdd_context_t *pHddCtx, tSirMac vos_mem_zero( pAdapter, sizeof( hdd_adapter_t ) ); pAdapter->dev = pWlanDev; - pAdapter->pHddCtx = pHddCtx; + pAdapter->pHddCtx = pHddCtx; pAdapter->magic = WLAN_HDD_ADAPTER_MAGIC; init_completion(&pAdapter->session_open_comp_var); @@ -6411,7 +6411,7 @@ static hdd_adapter_t* hdd_alloc_station_adapter( hdd_context_t *pHddCtx, tSirMac vos_event_init(&pAdapter->scan_info.scan_finished_event); pAdapter->scan_info.scan_pending_option = WEXT_SCAN_PENDING_GIVEUP; - pAdapter->isLinkUpSvcNeeded = FALSE; + pAdapter->isLinkUpSvcNeeded = FALSE; pAdapter->higherDtimTransition = eANI_BOOLEAN_TRUE; //Init the net_device structure strlcpy(pWlanDev->name, name, IFNAMSIZ); @@ -6434,7 +6434,7 @@ static hdd_adapter_t* hdd_alloc_station_adapter( hdd_context_t *pHddCtx, tSirMac pWlanDev->destructor = free_netdev; pWlanDev->ieee80211_ptr = &pAdapter->wdev ; - pAdapter->wdev.wiphy = pHddCtx->wiphy; + pAdapter->wdev.wiphy = pHddCtx->wiphy; pAdapter->wdev.netdev = pWlanDev; /* set pWlanDev's parent to underlying device */ SET_NETDEV_DEV(pWlanDev, pHddCtx->parent_dev); @@ -6456,13 +6456,13 @@ VOS_STATUS hdd_register_interface( hdd_adapter_t *pAdapter, tANI_U8 rtnl_lock_he if( dev_alloc_name(pWlanDev, pWlanDev->name) < 0 ) { hddLog(VOS_TRACE_LEVEL_ERROR,"%s:Failed:dev_alloc_name",__func__); - return VOS_STATUS_E_FAILURE; + return VOS_STATUS_E_FAILURE; } } if (register_netdevice(pWlanDev)) { hddLog(VOS_TRACE_LEVEL_ERROR,"%s:Failed:register_netdev",__func__); - return VOS_STATUS_E_FAILURE; + return VOS_STATUS_E_FAILURE; } } else @@ -6470,7 +6470,7 @@ VOS_STATUS hdd_register_interface( hdd_adapter_t *pAdapter, tANI_U8 rtnl_lock_he if(register_netdev(pWlanDev)) { hddLog(VOS_TRACE_LEVEL_ERROR,"%s: Failed:register_netdev",__func__); - return VOS_STATUS_E_FAILURE; + return VOS_STATUS_E_FAILURE; } } set_bit(NET_DEVICE_REGISTERED, &pAdapter->event_flags); @@ -6555,7 +6555,7 @@ VOS_STATUS hdd_init_station_mode( hdd_adapter_t *pAdapter ) status = VOS_STATUS_E_FAILURE; goto error_sme_open; } - + //Block on a completion variable. Can't wait forever though. rc = wait_for_completion_interruptible_timeout( &pAdapter->session_open_comp_var, @@ -6893,7 +6893,7 @@ VOS_STATUS hdd_enable_bmps_imps(hdd_context_t *pHddCtx) if(pHddCtx->cfg_ini->fIsAutoBmpsTimerEnabled) { - sme_StartAutoBmpsTimer(pHddCtx->hHal); + sme_StartAutoBmpsTimer(pHddCtx->hHal); } if (pHddCtx->cfg_ini->fIsImpsEnabled) @@ -6911,7 +6911,7 @@ VOS_STATUS hdd_disable_bmps_imps(hdd_context_t *pHddCtx, tANI_U8 session_type) VOS_STATUS status = VOS_STATUS_E_INVAL; v_BOOL_t disableBmps = FALSE; v_BOOL_t disableImps = FALSE; - + switch(session_type) { case WLAN_HDD_INFRA_STATION: @@ -7138,7 +7138,7 @@ hdd_adapter_t* hdd_open_adapter( hdd_context_t *pHddCtx, tANI_U8 session_type, if( NULL == pAdapter ) return NULL; - pAdapter->wdev.iftype = NL80211_IFTYPE_MONITOR; + pAdapter->wdev.iftype = NL80211_IFTYPE_MONITOR; pAdapter->device_mode = session_type; status = hdd_register_interface( pAdapter, rtnl_held ); #if LINUX_VERSION_CODE > KERNEL_VERSION(2,6,29) @@ -7150,11 +7150,11 @@ hdd_adapter_t* hdd_open_adapter( hdd_context_t *pHddCtx, tANI_U8 session_type, hdd_init_tx_rx( pAdapter ); set_bit(INIT_TX_RX_SUCCESS, &pAdapter->event_flags); //Set adapter to be used for data tx. It will use either GO or softap. - pAdapter->sessionCtx.monitor.pAdapterForTx = + pAdapter->sessionCtx.monitor.pAdapterForTx = hdd_get_adapter(pAdapter->pHddCtx, WLAN_HDD_SOFTAP); if (NULL == pAdapter->sessionCtx.monitor.pAdapterForTx) { - pAdapter->sessionCtx.monitor.pAdapterForTx = + pAdapter->sessionCtx.monitor.pAdapterForTx = hdd_get_adapter(pAdapter->pHddCtx, WLAN_HDD_P2P_GO); } /* This workqueue will be used to transmit management packet over @@ -7197,7 +7197,7 @@ hdd_adapter_t* hdd_open_adapter( hdd_context_t *pHddCtx, tANI_U8 session_type, if( VOS_STATUS_SUCCESS == status ) { - //Add it to the hdd's session list. + //Add it to the hdd's session list. pHddAdapterNode = vos_mem_malloc( sizeof( hdd_adapter_list_node_t ) ); if( NULL == pHddAdapterNode ) { @@ -7206,7 +7206,7 @@ hdd_adapter_t* hdd_open_adapter( hdd_context_t *pHddCtx, tANI_U8 session_type, else { pHddAdapterNode->pAdapter = pAdapter; - status = hdd_add_adapter_back ( pHddCtx, + status = hdd_add_adapter_back ( pHddCtx, pHddAdapterNode ); } } @@ -7216,7 +7216,7 @@ hdd_adapter_t* hdd_open_adapter( hdd_context_t *pHddCtx, tANI_U8 session_type, if( NULL != pAdapter ) { hdd_cleanup_adapter( pHddCtx, pAdapter, rtnl_held ); - pAdapter = NULL; + pAdapter = NULL; } if( NULL != pHddAdapterNode ) { @@ -7317,8 +7317,8 @@ VOS_STATUS hdd_close_adapter( hdd_context_t *pHddCtx, hdd_adapter_t *pAdapter, return VOS_STATUS_SUCCESS; /* If there is a single session of STA/P2P client, re-enable BMPS */ - if ((!vos_concurrent_sessions_running()) && - ((pHddCtx->no_of_sessions[VOS_STA_MODE] >= 1) || + if ((!vos_concurrent_sessions_running()) && + ((pHddCtx->no_of_sessions[VOS_STA_MODE] >= 1) || (pHddCtx->no_of_sessions[VOS_P2P_CLIENT_MODE] >= 1))) { if (pHddCtx->hdd_wlan_suspended) @@ -7350,7 +7350,7 @@ VOS_STATUS hdd_close_all_adapters( hdd_context_t *pHddCtx ) vos_mem_free( pHddAdapterNode ); } }while( NULL != pHddAdapterNode && VOS_STATUS_E_EMPTY != status ); - + EXIT(); return VOS_STATUS_SUCCESS; @@ -7406,7 +7406,7 @@ VOS_STATUS hdd_stop_adapter( hdd_context_t *pHddCtx, hdd_adapter_t *pAdapter ) eCSR_DISCONNECT_REASON_IBSS_LEAVE); else halStatus = sme_RoamDisconnect(pHddCtx->hHal, - pAdapter->sessionId, + pAdapter->sessionId, eCSR_DISCONNECT_REASON_UNSPECIFIED); //success implies disconnect command got queued up successfully if(halStatus == eHAL_STATUS_SUCCESS) @@ -7424,16 +7424,16 @@ VOS_STATUS hdd_stop_adapter( hdd_context_t *pHddCtx, hdd_adapter_t *pAdapter ) hdd_abort_mac_scan(pHddCtx, pAdapter->sessionId); } - if (test_bit(SME_SESSION_OPENED, &pAdapter->event_flags)) + if (test_bit(SME_SESSION_OPENED, &pAdapter->event_flags)) { INIT_COMPLETION(pAdapter->session_close_comp_var); if (eHAL_STATUS_SUCCESS == - sme_CloseSession(pHddCtx->hHal, pAdapter->sessionId, + sme_CloseSession(pHddCtx->hHal, pAdapter->sessionId, hdd_smeCloseSessionCallback, pAdapter)) { //Block on a completion variable. Can't wait forever though. wait_for_completion_timeout( - &pAdapter->session_close_comp_var, + &pAdapter->session_close_comp_var, msecs_to_jiffies(WLAN_WAIT_TIME_SESSIONOPENCLOSE)); } } @@ -7444,7 +7444,7 @@ VOS_STATUS hdd_stop_adapter( hdd_context_t *pHddCtx, hdd_adapter_t *pAdapter ) case WLAN_HDD_P2P_GO: //Any softap specific cleanup here... mutex_lock(&pHddCtx->sap_lock); - if (test_bit(SOFTAP_BSS_STARTED, &pAdapter->event_flags)) + if (test_bit(SOFTAP_BSS_STARTED, &pAdapter->event_flags)) { VOS_STATUS status; hdd_context_t *pHddCtx = WLAN_HDD_GET_CTX(pAdapter); @@ -7453,11 +7453,11 @@ VOS_STATUS hdd_stop_adapter( hdd_context_t *pHddCtx, hdd_adapter_t *pAdapter ) status = WLANSAP_StopBss(pHddCtx->pvosContext); if (VOS_IS_STATUS_SUCCESS(status)) { - hdd_hostapd_state_t *pHostapdState = + hdd_hostapd_state_t *pHostapdState = WLAN_HDD_GET_HOSTAP_STATE_PTR(pAdapter); status = vos_wait_single_event(&pHostapdState->vosEvent, 10000); - + if (!VOS_IS_STATUS_SUCCESS(status)) { hddLog(LOGE, "%s: failure waiting for WLANSAP_StopBss", @@ -7643,7 +7643,7 @@ VOS_STATUS hdd_start_all_adapters( hdd_context_t *pHddCtx ) hdd_init_station_mode(pAdapter); /* Open the gates for HDD to receive Wext commands */ - pAdapter->isLinkUpSvcNeeded = FALSE; + pAdapter->isLinkUpSvcNeeded = FALSE; pAdapter->scan_info.mScanPending = FALSE; pAdapter->scan_info.waitScanResult = FALSE; @@ -7663,7 +7663,7 @@ VOS_STATUS hdd_start_all_adapters( hdd_context_t *pHddCtx ) /* indicate disconnected event to nl80211 */ cfg80211_disconnected(pAdapter->dev, WLAN_REASON_UNSPECIFIED, - NULL, 0, GFP_KERNEL); + NULL, 0, GFP_KERNEL); } else if (eConnectionState_Connecting == connState) { @@ -7742,11 +7742,11 @@ VOS_STATUS hdd_reconnect_all_adapters( hdd_context_t *pHddCtx ) &pAdapter->disconnect_comp_var, msecs_to_jiffies(WLAN_WAIT_TIME_DISCONNECT)); - pWextState->roamProfile.csrPersona = pAdapter->device_mode; + pWextState->roamProfile.csrPersona = pAdapter->device_mode; pHddCtx->isAmpAllowed = VOS_FALSE; sme_RoamConnect(pHddCtx->hHal, pAdapter->sessionId, &(pWextState->roamProfile), - &roamId); + &roamId); } status = hdd_get_next_adapter ( pHddCtx, pAdapterNode, &pNext ); @@ -7943,7 +7943,7 @@ hdd_adapter_t * hdd_get_adapter_by_macaddr( hdd_context_t *pHddCtx, return NULL; -} +} hdd_adapter_t * hdd_get_adapter_by_name( hdd_context_t *pHddCtx, tANI_U8 *name ) { @@ -7968,7 +7968,7 @@ hdd_adapter_t * hdd_get_adapter_by_name( hdd_context_t *pHddCtx, tANI_U8 *name ) return NULL; -} +} hdd_adapter_t * hdd_get_adapter( hdd_context_t *pHddCtx, device_mode_t mode ) { @@ -7992,7 +7992,7 @@ hdd_adapter_t * hdd_get_adapter( hdd_context_t *pHddCtx, device_mode_t mode ) return NULL; -} +} //Remove this function later hdd_adapter_t * hdd_get_mon_adapter( hdd_context_t *pHddCtx ) @@ -8018,18 +8018,18 @@ hdd_adapter_t * hdd_get_mon_adapter( hdd_context_t *pHddCtx ) return NULL; -} +} /**--------------------------------------------------------------------------- - - \brief hdd_set_monitor_tx_adapter() - + + \brief hdd_set_monitor_tx_adapter() - This API initializes the adapter to be used while transmitting on monitor - adapter. - + adapter. + \param - pHddCtx - Pointer to the HDD context. pAdapter - Adapter that will used for TX. This can be NULL. - \return - None. + \return - None. --------------------------------------------------------------------------*/ void wlan_hdd_set_monitor_tx_adapter( hdd_context_t *pHddCtx, hdd_adapter_t *pAdapter ) { @@ -8043,16 +8043,16 @@ void wlan_hdd_set_monitor_tx_adapter( hdd_context_t *pHddCtx, hdd_adapter_t *pAd } } /**--------------------------------------------------------------------------- - - \brief hdd_select_queue() - - This API returns the operating channel of the requested device mode - + \brief hdd_select_queue() - + + This API returns the operating channel of the requested device mode + \param - pHddCtx - Pointer to the HDD context. - mode - Device mode for which operating channel is required suported modes - WLAN_HDD_INFRA_STATION, WLAN_HDD_P2P_CLIENT WLAN_HDD_SOFTAP, WLAN_HDD_P2P_GO. - \return - channel number. "0" id the requested device is not found OR it is not connected. + \return - channel number. "0" id the requested device is not found OR it is not connected. --------------------------------------------------------------------------*/ v_U8_t hdd_get_operating_channel( hdd_context_t *pHddCtx, device_mode_t mode ) { @@ -8072,14 +8072,14 @@ v_U8_t hdd_get_operating_channel( hdd_context_t *pHddCtx, device_mode_t mode ) switch(pAdapter->device_mode) { case WLAN_HDD_INFRA_STATION: - case WLAN_HDD_P2P_CLIENT: + case WLAN_HDD_P2P_CLIENT: if( hdd_connIsConnected( WLAN_HDD_GET_STATION_CTX_PTR( pAdapter )) ) operatingChannel = (WLAN_HDD_GET_STATION_CTX_PTR(pAdapter))->conn_info.operationChannel; break; case WLAN_HDD_SOFTAP: case WLAN_HDD_P2P_GO: /*softap connection info */ - if(test_bit(SOFTAP_BSS_STARTED, &pAdapter->event_flags)) + if(test_bit(SOFTAP_BSS_STARTED, &pAdapter->event_flags)) operatingChannel = (WLAN_HDD_GET_AP_CTX_PTR(pAdapter))->operatingChannel; break; default: @@ -8098,13 +8098,13 @@ v_U8_t hdd_get_operating_channel( hdd_context_t *pHddCtx, device_mode_t mode ) #ifdef WLAN_FEATURE_PACKET_FILTERING /**--------------------------------------------------------------------------- - \brief hdd_set_multicast_list() - + \brief hdd_set_multicast_list() - This used to set the multicast address list. \param - dev - Pointer to the WLAN device. - skb - Pointer to OS packet (sk_buff). - \return - success/fail + \return - success/fail --------------------------------------------------------------------------*/ static void hdd_set_multicast_list(struct net_device *dev) @@ -8127,7 +8127,7 @@ static void hdd_set_multicast_list(struct net_device *dev) "%s: allow all multicast frames", __func__); pAdapter->mc_addr_list.mc_cnt = 0; } - else + else { mc_count = netdev_mc_count(dev); hddLog(VOS_TRACE_LEVEL_INFO, @@ -8148,7 +8148,7 @@ static void hdd_set_multicast_list(struct net_device *dev) memset(&(pAdapter->mc_addr_list.addr[i][0]), 0, ETH_ALEN); memcpy(&(pAdapter->mc_addr_list.addr[i][0]), ha->addr, ETH_ALEN); hddLog(VOS_TRACE_LEVEL_INFO, "\n%s: mlist[%d] = "MAC_ADDRESS_STR, - __func__, i, + __func__, i, MAC_ADDR_ARRAY(pAdapter->mc_addr_list.addr[i])); i++; } @@ -8158,16 +8158,16 @@ static void hdd_set_multicast_list(struct net_device *dev) #endif /**--------------------------------------------------------------------------- - - \brief hdd_select_queue() - + + \brief hdd_select_queue() - This function is registered with the Linux OS for network core to decide which queue to use first. - + \param - dev - Pointer to the WLAN device. - skb - Pointer to OS packet (sk_buff). - \return - ac, Queue Index/access category corresponding to UP in IP header - + \return - ac, Queue Index/access category corresponding to UP in IP header + --------------------------------------------------------------------------*/ v_U16_t hdd_select_queue(struct net_device *dev, struct sk_buff *skb) @@ -8492,7 +8492,7 @@ void hdd_wlan_exit(hdd_context_t *pHddCtx) // Unregister the Net Device Notifier unregister_netdevice_notifier(&hdd_netdev_notifier); - + hdd_stop_all_adapters( pHddCtx ); #ifdef WLAN_BTAMP_FEATURE @@ -8526,8 +8526,8 @@ void hdd_wlan_exit(hdd_context_t *pHddCtx) //This requires pMac access, Call this before vos_close(). hdd_unregister_mcast_bcast_filter(pHddCtx); - //Close the scheduler before calling vos_close to make sure no thread is - // scheduled after the each module close is called i.e after all the data + //Close the scheduler before calling vos_close to make sure no thread is + // scheduled after the each module close is called i.e after all the data // structures are freed. vosStatus = vos_sched_close( pVosContext ); if (!VOS_IS_STATUS_SUCCESS(vosStatus)) { @@ -8558,7 +8558,8 @@ void hdd_wlan_exit(hdd_context_t *pHddCtx) nl_srv_exit(); #endif /* WLAN_KD_READY_NOTIFIER */ - /* Cancel the vote for XO Core ON. + + /* Cancel the vote for XO Core ON. * This is done here to ensure there is no race condition since MC, TX and WD threads have * exited at this point */ @@ -8566,10 +8567,10 @@ void hdd_wlan_exit(hdd_context_t *pHddCtx) " when WLAN is turned OFF\n"); if (vos_chipVoteXOCore(NULL, NULL, NULL, VOS_FALSE) != VOS_STATUS_SUCCESS) { - hddLog(VOS_TRACE_LEVEL_ERROR, "Could not cancel the vote for XO Core ON." + hddLog(VOS_TRACE_LEVEL_ERROR, "Could not cancel the vote for XO Core ON." " Not returning failure." " Power consumed will be high\n"); - } + } hdd_close_all_adapters( pHddCtx ); @@ -8706,7 +8707,7 @@ static VOS_STATUS hdd_update_config_from_nv(hdd_context_t* pHddCtx) return VOS_STATUS_E_FAILURE; } - if (itemIsValid == VOS_TRUE) + if (itemIsValid == VOS_TRUE) { hddLog(VOS_TRACE_LEVEL_INFO_HIGH," Reading the Macaddress from NV\n "); status = vos_nv_readMultiMacAddress((v_U8_t *)&macFromNV[0].bytes[0], @@ -8917,19 +8918,19 @@ void hdd_exchange_version_and_caps(hdd_context_t *pHddCtx) pr_info("%s: WCNSS hardware version %s\n", WLAN_MODULE_NAME, versionString); - /* 1.Check if FW version is greater than 0.1.1.0. Only then send host-FW capability exchange message - 2.Host-FW capability exchange message is only present on riva 1.1 so + /* 1.Check if FW version is greater than 0.1.1.0. Only then send host-FW capability exchange message + 2.Host-FW capability exchange message is only present on riva 1.1 so send the message only if it the riva is 1.1 minor numbers for different riva branches: 0 -> (1.0)Mainline Build 1 -> (1.1)Mainline Build 2->(1.04) Stability Build */ - if (((versionReported.major>0) || (versionReported.minor>1) || + if (((versionReported.major>0) || (versionReported.minor>1) || ((versionReported.minor>=1) && (versionReported.version>=1))) && ((versionReported.major == 1) && (versionReported.minor >= 1))) fwFeatCapsMsgSupported = 1; - + if (fwFeatCapsMsgSupported) { #ifdef WLAN_ACTIVEMODE_OFFLOAD_FEATURE @@ -9206,7 +9207,7 @@ int hdd_wlan_startup(struct device *dev, v_VOID_t *hif_sc) */ if (0 < wlan_hdd_cfg80211_init(dev, wiphy, pHddCtx->cfg_ini)) { - hddLog(VOS_TRACE_LEVEL_FATAL, + hddLog(VOS_TRACE_LEVEL_FATAL, "%s: wlan_hdd_cfg80211_init return failure", __func__); goto err_config; } @@ -9455,7 +9456,7 @@ int hdd_wlan_startup(struct device *dev, v_VOID_t *hif_sc) halStatus = cfgSetStr( pHddCtx->hHal, WNI_CFG_STA_ID, (v_U8_t *)&pHddCtx->cfg_ini->intfMacAddr[0], sizeof( pHddCtx->cfg_ini->intfMacAddr[0]) ); - + if (!HAL_STATUS_SUCCESS( halStatus )) { hddLog(VOS_TRACE_LEVEL_ERROR,"%s: Failed to set MAC Address. " @@ -9484,7 +9485,7 @@ int hdd_wlan_startup(struct device *dev, v_VOID_t *hif_sc) status = hdd_post_voss_start_config( pHddCtx ); if ( !VOS_IS_STATUS_SUCCESS( status ) ) { - hddLog(VOS_TRACE_LEVEL_FATAL,"%s: hdd_post_voss_start_config failed", + hddLog(VOS_TRACE_LEVEL_FATAL,"%s: hdd_post_voss_start_config failed", __func__); goto err_vosstop; } @@ -9538,7 +9539,7 @@ int hdd_wlan_startup(struct device *dev, v_VOID_t *hif_sc) if (VOS_STA_SAP_MODE == hdd_get_conparam()) { - pAdapter = hdd_open_adapter( pHddCtx, WLAN_HDD_SOFTAP, "softap.%d", + pAdapter = hdd_open_adapter( pHddCtx, WLAN_HDD_SOFTAP, "softap.%d", wlan_hdd_get_intf_addr(pHddCtx), FALSE ); } else @@ -9683,7 +9684,7 @@ int hdd_wlan_startup(struct device *dev, v_VOID_t *hif_sc) #endif #ifdef FEATURE_WLAN_SCAN_PNO /*SME must send channel update configuration to RIVA*/ - sme_UpdateChannelConfig(pHddCtx->hHal); + sme_UpdateChannelConfig(pHddCtx->hHal); #endif /* Register with platform driver as client for Suspend/Resume */ @@ -9694,7 +9695,7 @@ int hdd_wlan_startup(struct device *dev, v_VOID_t *hif_sc) #ifdef WLAN_BTAMP_FEATURE goto err_bap_stop; #else - goto err_close_adapter; + goto err_close_adapter; #endif //WLAN_BTAMP_FEATURE } @@ -9773,7 +9774,7 @@ int hdd_wlan_startup(struct device *dev, v_VOID_t *hif_sc) if (VOS_STA_SAP_MODE != hdd_get_conparam()) { /* Action frame registered in one adapter which will - * applicable to all interfaces + * applicable to all interfaces */ wlan_hdd_cfg80211_post_voss_start(pAdapter); } @@ -10503,7 +10504,7 @@ tVOS_CONCURRENCY_MODE hdd_get_concurrency_mode ( void ) return VOS_STA; } -/* Decide whether to allow/not the apps power collapse. +/* Decide whether to allow/not the apps power collapse. * Allow apps power collapse if we are in connected state. * if not, allow only if we are in IMPS */ v_BOOL_t hdd_is_apps_power_collapse_allowed(hdd_context_t* pHddCtx) @@ -10512,8 +10513,8 @@ v_BOOL_t hdd_is_apps_power_collapse_allowed(hdd_context_t* pHddCtx) tANI_BOOLEAN scanRspPending = csrNeighborRoamScanRspPending(pHddCtx->hHal); tANI_BOOLEAN inMiddleOfRoaming = csrNeighborMiddleOfRoaming(pHddCtx->hHal); hdd_config_t *pConfig = pHddCtx->cfg_ini; - hdd_adapter_list_node_t *pAdapterNode = NULL, *pNext = NULL; - hdd_adapter_t *pAdapter = NULL; + hdd_adapter_list_node_t *pAdapterNode = NULL, *pNext = NULL; + hdd_adapter_t *pAdapter = NULL; VOS_STATUS status; tVOS_CONCURRENCY_MODE concurrent_state = 0; @@ -10523,8 +10524,8 @@ v_BOOL_t hdd_is_apps_power_collapse_allowed(hdd_context_t* pHddCtx) concurrent_state = hdd_get_concurrency_mode(); #ifdef WLAN_ACTIVEMODE_OFFLOAD_FEATURE - if(((concurrent_state == (VOS_STA | VOS_P2P_CLIENT)) || - (concurrent_state == (VOS_STA | VOS_P2P_GO))) && + if(((concurrent_state == (VOS_STA | VOS_P2P_CLIENT)) || + (concurrent_state == (VOS_STA | VOS_P2P_GO))) && (IS_ACTIVEMODE_OFFLOAD_FEATURE_ENABLE)) return TRUE; #endif @@ -10617,7 +10618,7 @@ void wlan_hdd_clear_concurrency_mode(hdd_context_t *pHddCtx, tVOS_CON_MODE mode) * \param - pHddCtx * * \return - None - * + * * --------------------------------------------------------------------------*/ static void wlan_hdd_restart_init(hdd_context_t *pHddCtx) @@ -10625,8 +10626,8 @@ static void wlan_hdd_restart_init(hdd_context_t *pHddCtx) /* Initialize */ pHddCtx->hdd_restart_retries = 0; atomic_set(&pHddCtx->isRestartInProgress, 0); - vos_timer_init(&pHddCtx->hdd_restart_timer, - VOS_TIMER_TYPE_SW, + vos_timer_init(&pHddCtx->hdd_restart_timer, + VOS_TIMER_TYPE_SW, wlan_hdd_restart_timer_cb, pHddCtx); } @@ -10639,12 +10640,12 @@ static void wlan_hdd_restart_init(hdd_context_t *pHddCtx) * \param - pHddCtx * * \return - None - * + * * --------------------------------------------------------------------------*/ static void wlan_hdd_restart_deinit(hdd_context_t* pHddCtx) { - + VOS_STATUS vos_status; /* Block any further calls */ atomic_set(&pHddCtx->isRestartInProgress, 1); @@ -10676,18 +10677,18 @@ static void wlan_hdd_restart_deinit(hdd_context_t* pHddCtx) * --------------------------------------------------------------------------*/ -static VOS_STATUS wlan_hdd_framework_restart(hdd_context_t *pHddCtx) +static VOS_STATUS wlan_hdd_framework_restart(hdd_context_t *pHddCtx) { VOS_STATUS status = VOS_STATUS_SUCCESS; hdd_adapter_list_node_t *pAdapterNode = NULL, *pNext = NULL; int len = (sizeof (struct ieee80211_mgmt)); - struct ieee80211_mgmt *mgmt = NULL; - + struct ieee80211_mgmt *mgmt = NULL; + /* Prepare the DEAUTH managment frame with reason code */ mgmt = kzalloc(len, GFP_KERNEL); - if(mgmt == NULL) + if(mgmt == NULL) { - VOS_TRACE(VOS_MODULE_ID_HDD, VOS_TRACE_LEVEL_FATAL, + VOS_TRACE(VOS_MODULE_ID_HDD, VOS_TRACE_LEVEL_FATAL, "%s: memory allocation failed (%d bytes)", __func__, len); return VOS_STATUS_E_NOMEM; } @@ -10695,30 +10696,30 @@ static VOS_STATUS wlan_hdd_framework_restart(hdd_context_t *pHddCtx) /* Iterate over all adapters/devices */ status = hdd_get_front_adapter ( pHddCtx, &pAdapterNode ); - do + do { - if( (status == VOS_STATUS_SUCCESS) && - pAdapterNode && + if( (status == VOS_STATUS_SUCCESS) && + pAdapterNode && pAdapterNode->pAdapter) { - VOS_TRACE(VOS_MODULE_ID_HDD, VOS_TRACE_LEVEL_FATAL, + VOS_TRACE(VOS_MODULE_ID_HDD, VOS_TRACE_LEVEL_FATAL, "restarting the driver(intf:\'%s\' mode:%d :try %d)", pAdapterNode->pAdapter->dev->name, pAdapterNode->pAdapter->device_mode, pHddCtx->hdd_restart_retries + 1); - /* + /* * CFG80211 event to restart the driver - * - * 'cfg80211_send_unprot_deauth' sends a - * NL80211_CMD_UNPROT_DEAUTHENTICATE event to supplicant at any state + * + * 'cfg80211_send_unprot_deauth' sends a + * NL80211_CMD_UNPROT_DEAUTHENTICATE event to supplicant at any state * of SME(Linux Kernel) state machine. * * Reason code WLAN_REASON_DISASSOC_LOW_ACK is currently used to restart * the driver. * */ - - cfg80211_send_unprot_deauth(pAdapterNode->pAdapter->dev, (u_int8_t*)mgmt, len ); + + cfg80211_send_unprot_deauth(pAdapterNode->pAdapter->dev, (u_int8_t*)mgmt, len ); } status = hdd_get_next_adapter ( pHddCtx, pAdapterNode, &pNext ); pAdapterNode = pNext; @@ -10729,7 +10730,7 @@ static VOS_STATUS wlan_hdd_framework_restart(hdd_context_t *pHddCtx) kfree(mgmt); /* Retry until we unload or reach max count */ - if(++pHddCtx->hdd_restart_retries < WLAN_HDD_RESTART_RETRY_MAX_CNT) + if(++pHddCtx->hdd_restart_retries < WLAN_HDD_RESTART_RETRY_MAX_CNT) vos_timer_start(&pHddCtx->hdd_restart_timer, WLAN_HDD_RESTART_RETRY_DELAY_MS); return status; @@ -10744,7 +10745,7 @@ static VOS_STATUS wlan_hdd_framework_restart(hdd_context_t *pHddCtx) * \param - User data: * * \return - None - * + * * --------------------------------------------------------------------------*/ void wlan_hdd_restart_timer_cb(v_PVOID_t usrDataForCallback) @@ -10760,8 +10761,8 @@ void wlan_hdd_restart_timer_cb(v_PVOID_t usrDataForCallback) * * \brief wlan_hdd_restart_driver * - * This function sends an event to supplicant to restart the WLAN driver. - * + * This function sends an event to supplicant to restart the WLAN driver. + * * This function is called from vos_wlanRestart. * * \param - pHddCtx @@ -10771,14 +10772,14 @@ void wlan_hdd_restart_timer_cb(v_PVOID_t usrDataForCallback) * VOS_STATUS_E_ALREADY: Request already in progress * --------------------------------------------------------------------------*/ -VOS_STATUS wlan_hdd_restart_driver(hdd_context_t *pHddCtx) +VOS_STATUS wlan_hdd_restart_driver(hdd_context_t *pHddCtx) { VOS_STATUS status = VOS_STATUS_SUCCESS; /* A tight check to make sure reentrancy */ if(atomic_xchg(&pHddCtx->isRestartInProgress, 1)) { - VOS_TRACE(VOS_MODULE_ID_HDD, VOS_TRACE_LEVEL_WARN, + VOS_TRACE(VOS_MODULE_ID_HDD, VOS_TRACE_LEVEL_WARN, "%s: WLAN restart is already in progress", __func__); return VOS_STATUS_E_ALREADY; @@ -10787,7 +10788,7 @@ VOS_STATUS wlan_hdd_restart_driver(hdd_context_t *pHddCtx) #ifdef HAVE_WCNSS_RESET_INTR wcnss_reset_intr(); #endif - + return status; } diff --git a/CORE/HDD/src/wlan_hdd_mib.c b/CORE/HDD/src/wlan_hdd_mib.c index 0ba779319172..2c161ec6b03f 100644 --- a/CORE/HDD/src/wlan_hdd_mib.c +++ b/CORE/HDD/src/wlan_hdd_mib.c @@ -41,19 +41,19 @@ static inline VOS_STATUS mibSetDot11DesiredBssType( hdd_adapter_t *pAdapter, eMi v_BOOL_t mibIsDot11DesiredBssTypeInfrastructure( hdd_adapter_t *pAdapter ) { - eMib_dot11DesiredBssType mibDot11DesiredBssType; + eMib_dot11DesiredBssType mibDot11DesiredBssType; mibGetDot11DesiredBssType( pAdapter, &mibDot11DesiredBssType ); - - return( eMib_dot11DesiredBssType_infrastructure == mibDot11DesiredBssType ); + + return( eMib_dot11DesiredBssType_infrastructure == mibDot11DesiredBssType ); } static inline v_BOOL_t mibIsDot11DesiredBssTypeIndependent( hdd_adapter_t *pAdapter ) { - eMib_dot11DesiredBssType mibDot11DesiredBssType; + eMib_dot11DesiredBssType mibDot11DesiredBssType; mibGetDot11DesiredBssType( pAdapter, &mibDot11DesiredBssType ); - - return( eMib_dot11DesiredBssType_independent == mibDot11DesiredBssType ); + + return( eMib_dot11DesiredBssType_independent == mibDot11DesiredBssType ); } static inline v_VOID_t mibGetDot11IbssJoinOnly( hdd_adapter_t *pAdapter, v_BOOL_t *pdot11IbssJoinOnly ) @@ -73,7 +73,7 @@ static inline VOS_STATUS mibSetDot11NICPowerState( hdd_adapter_t *pAdapter, eMib VOS_STATUS status = VOS_STATUS_SUCCESS; pAdapter->hdd_mib.mibDot11NICPowerState = *pMibDot11NICPowerState; - + return( status ); } @@ -86,7 +86,7 @@ static inline VOS_STATUS mibSetDot11NICPowerStateOff( hdd_adapter_t *pAdapter ) static inline void mibGetDot11NICPowerState( hdd_adapter_t *pAdapter, eMib_dot11NICPowerState *pMibDot11NICPowerState ) { *pMibDot11NICPowerState = pAdapter->hdd_mib.mibDot11NICPowerState; - + return; } @@ -95,7 +95,7 @@ static inline v_BOOL_t mibIsDot11NICPowerStateOn( hdd_adapter_t *pAdapter ) eMib_dot11NICPowerState dot11NICPowerState; mibGetDot11NICPowerState( pAdapter, &dot11NICPowerState ); - + return( eMib_dot11NICPowerState_ON == dot11NICPowerState ); } @@ -107,18 +107,18 @@ static inline v_BOOL_t mibIsDot11NICPowerStateOff( hdd_adapter_t *pAdapter ) static inline VOS_STATUS mibSetDot11DesiredSsidList( hdd_adapter_t *pAdapter, sMib_dot11DesiredSsidList *pDot11DesiredSsidList ) { VOS_STATUS status = VOS_STATUS_SUCCESS; - + if ( pDot11DesiredSsidList->cEntries > MIB_DOT11_DESIRED_SSID_LIST_MAX_COUNT ) pAdapter->hdd_mib.mibDot11DesiredSsidList = *pDot11DesiredSsidList ; - + return( status ); } static inline VOS_STATUS mibSetDot11DesiredBssidList( hdd_adapter_t *pAdapter, sMib_dot11DesiredBssidList *pDot11DesiredBssidList ) -{ +{ pAdapter->hdd_mib.mibDot11DesiredBssidList = *pDot11DesiredBssidList; - + return( VOS_STATUS_SUCCESS ); } @@ -126,7 +126,7 @@ static inline VOS_STATUS mibSetDot11DesiredBssidList( hdd_adapter_t *pAdapter, s static inline v_VOID_t mibGetDot11DesiredBssidList( hdd_adapter_t *pAdapter, sMib_dot11DesiredBssidList *pMibDot11DesiredBssidList ) { *pMibDot11DesiredBssidList = pAdapter->hdd_mib.mibDot11DesiredBssidList; - + return; } @@ -134,7 +134,7 @@ static inline v_VOID_t mibGetDot11DesiredBssidList( hdd_adapter_t *pAdapter, sMi static inline v_VOID_t mibGetDot11DesiredSsidList( hdd_adapter_t *pAdapter, sMib_dot11DesiredSsidList *pMibDot11DesiredSsidList ) { *pMibDot11DesiredSsidList = pAdapter->hdd_mib.mibDot11DesiredSsidList; - + return; } @@ -144,7 +144,7 @@ static inline VOS_STATUS mibSetDot11AutoConfigEnabled( hdd_adapter_t *pAdapter, VOS_STATUS status = VOS_STATUS_SUCCESS; pAdapter->hdd_mib.mibDot11AutoConfigEnabled = *pMibDot11AutoConfigEnabled; - + return( status ); } @@ -152,14 +152,14 @@ static inline VOS_STATUS mibSetDot11AutoConfigEnabled( hdd_adapter_t *pAdapter, static inline v_VOID_t mibGetDot11AutoConfigEnabled( hdd_adapter_t *pAdapter, eMib_dot11AutoConfigEnabled *pMibDot11AutoConfigEnabled ) { *pMibDot11AutoConfigEnabled = pAdapter->hdd_mib.mibDot11AutoConfigEnabled; - + return; } static inline VOS_STATUS mibSetDot11MacExcludeList( hdd_adapter_t *pAdapter, sMib_dot11MacExcludeList *pDot11MacExcludeList ) { pAdapter->hdd_mib.mibDot11MacExcludeList = *pDot11MacExcludeList; - + return( VOS_STATUS_SUCCESS ); } @@ -178,9 +178,9 @@ static inline void mibSetDefaultDot11MacExcludeList( hdd_adapter_t *pAdapter ) static inline VOS_STATUS mibSetDot11HardwarePHYState( hdd_adapter_t *pAdapter, eMib_dot11HardwarePHYState *pMibDot11HardwarePHYState ) { VOS_STATUS status = VOS_STATUS_SUCCESS; - + pAdapter->hdd_mib.mibDot11HardwarePHYState = *pMibDot11HardwarePHYState; - + return( status ); } @@ -188,7 +188,7 @@ static inline VOS_STATUS mibSetDot11HardwarePHYState( hdd_adapter_t *pAdapter, e static inline void mibGetDot11HardwarePHYState( hdd_adapter_t *pAdapter, eMib_dot11HardwarePHYState *pMibDot11HardwarePHYState ) { *pMibDot11HardwarePHYState = pAdapter->hdd_mib.mibDot11HardwarePHYState; - + return; } @@ -201,7 +201,7 @@ static inline void mibSetDefaultDot11PrivacyExemptionList( hdd_adapter_t *pAdapt static inline void mibGetDot11PowerSavingLevel( hdd_adapter_t *pAdapter, eMib_dot11PowerSavingLevel *pMibDot11PowerSavingLevel ) { *pMibDot11PowerSavingLevel = pAdapter->hdd_mib.mibDot11PowerSavingLevel; - + return; } @@ -212,5 +212,3 @@ static inline void mibGetDevicePowerState( hdd_adapter_t *pAdapter, eMib_DeviceP return; } - - diff --git a/CORE/HDD/src/wlan_hdd_oemdata.c b/CORE/HDD/src/wlan_hdd_oemdata.c index 089307978239..b414b70c9fc9 100644 --- a/CORE/HDD/src/wlan_hdd_oemdata.c +++ b/CORE/HDD/src/wlan_hdd_oemdata.c @@ -27,11 +27,11 @@ #ifdef FEATURE_OEM_DATA_SUPPORT -/*================================================================================ +/*================================================================================ \file wlan_hdd_oemdata.c - + \brief Linux Wireless Extensions for oem data req/rsp - + $Id: wlan_hdd_oemdata.c,v 1.34 2010/04/15 01:49:23 -- VINAY ================================================================================*/ @@ -52,14 +52,14 @@ static struct hdd_context_s *pHddCtx; /*--------------------------------------------------------------------------------------------- - \brief hdd_OemDataReqCallback() - + \brief hdd_OemDataReqCallback() - This function also reports the results to the user space \return - 0 for success, non zero for failure -----------------------------------------------------------------------------------------------*/ -static eHalStatus hdd_OemDataReqCallback(tHalHandle hHal, +static eHalStatus hdd_OemDataReqCallback(tHalHandle hHal, void *pContext, tANI_U32 oemDataReqID, eOemDataReqStatus oemDataReqStatus) @@ -90,10 +90,10 @@ static eHalStatus hdd_OemDataReqCallback(tHalHandle hHal, snprintf(buffer, IW_CUSTOM_MAX, "QCOM: OEM-DATA-REQ-SUCCESS"); //everything went alright } - + wrqu.data.pointer = buffer; wrqu.data.length = strlen(buffer); - + wireless_send_event(dev, IWEVCUSTOM, &wrqu, buffer); return status; @@ -101,11 +101,11 @@ static eHalStatus hdd_OemDataReqCallback(tHalHandle hHal, /**-------------------------------------------------------------------------------------------- - \brief iw_get_oem_data_rsp() - + \brief iw_get_oem_data_rsp() - This function gets the oem data response. This invokes - the respective sme functionality. Function for handling the oem data rsp - IOCTL + the respective sme functionality. Function for handling the oem data rsp + IOCTL \param - dev - Pointer to the net device - info - Pointer to the iw_oem_data_req @@ -116,7 +116,7 @@ static eHalStatus hdd_OemDataReqCallback(tHalHandle hHal, -----------------------------------------------------------------------------------------------*/ int iw_get_oem_data_rsp( - struct net_device *dev, + struct net_device *dev, struct iw_request_info *info, union iwreq_data *wrqu, char *extra) @@ -148,7 +148,7 @@ int iw_get_oem_data_rsp( if(pSmeOemDataRsp != NULL) { pHddOemDataRsp = (struct iw_oem_data_rsp*)(extra); - vos_mem_copy(pHddOemDataRsp->oemDataRsp, pSmeOemDataRsp->oemDataRsp, OEM_DATA_RSP_SIZE); + vos_mem_copy(pHddOemDataRsp->oemDataRsp, pSmeOemDataRsp->oemDataRsp, OEM_DATA_RSP_SIZE); } else { @@ -167,7 +167,7 @@ int iw_get_oem_data_rsp( \brief iw_set_oem_data_req() This function sets the oem data req configuration. This invokes - the respective sme oem data req functionality. Function for + the respective sme oem data req functionality. Function for handling the set IOCTL for the oem data req configuration \param - dev - Pointer to the net device @@ -179,7 +179,7 @@ int iw_get_oem_data_rsp( -----------------------------------------------------------------------------------------------*/ int iw_set_oem_data_req( - struct net_device *dev, + struct net_device *dev, struct iw_request_info *info, union iwreq_data *wrqu, char *extra) @@ -224,18 +224,18 @@ int iw_set_oem_data_req( return -EFAULT; } - status = sme_OemDataReq(WLAN_HDD_GET_HAL_CTX(pAdapter), + status = sme_OemDataReq(WLAN_HDD_GET_HAL_CTX(pAdapter), pAdapter->sessionId, - &oemDataReqConfig, - &oemDataReqID, - &hdd_OemDataReqCallback, + &oemDataReqConfig, + &oemDataReqID, + &hdd_OemDataReqCallback, dev); - + pwextBuf->oemDataReqID = oemDataReqID; pwextBuf->oemDataReqInProgress = TRUE; } while(0); - + return status; } diff --git a/CORE/HDD/src/wlan_hdd_p2p.c b/CORE/HDD/src/wlan_hdd_p2p.c index 642a067d1fab..0fd41dca1fb1 100644 --- a/CORE/HDD/src/wlan_hdd_p2p.c +++ b/CORE/HDD/src/wlan_hdd_p2p.c @@ -97,7 +97,7 @@ static void hdd_wlan_tx_complete( hdd_adapter_t* pAdapter, tANI_BOOLEAN actionSendSuccess ); static void hdd_sendMgmtFrameOverMonitorIface( hdd_adapter_t *pMonAdapter, - tANI_U32 nFrameLength, + tANI_U32 nFrameLength, tANI_U8* pbFrames, tANI_U8 frameType ); @@ -160,7 +160,7 @@ eHalStatus wlan_hdd_remain_on_channel_callback( tHalHandle hHal, void* pCtx, { if( cfgState->buf ) { - hddLog( LOGP, + hddLog( LOGP, "%s: We need to receive yet an ack from one of tx packet", __func__); } @@ -217,22 +217,22 @@ void wlan_hdd_cancel_existing_remain_on_channel(hdd_adapter_t *pAdapter) { hddLog( LOG1, "Cancel Existing Remain on Channel"); - /* Wait till remain on channel ready indication before issuing cancel - * remain on channel request, otherwise if remain on channel not - * received and if the driver issues cancel remain on channel then lim + /* Wait till remain on channel ready indication before issuing cancel + * remain on channel request, otherwise if remain on channel not + * received and if the driver issues cancel remain on channel then lim * will be in unknown state. */ status = wait_for_completion_interruptible_timeout(&pAdapter->rem_on_chan_ready_event, msecs_to_jiffies(WAIT_REM_CHAN_READY)); if (!status) { - hddLog( LOGE, + hddLog( LOGE, "%s: timeout waiting for remain on channel ready indication", __func__); } INIT_COMPLETION(pAdapter->cancel_rem_on_chan_var); - + /* Issue abort remain on chan request to sme. * The remain on channel callback will make sure the remain_on_chan * expired event is sent. @@ -258,7 +258,7 @@ void wlan_hdd_cancel_existing_remain_on_channel(hdd_adapter_t *pAdapter) if (!status) { - hddLog( LOGE, + hddLog( LOGE, "%s: timeout waiting for cancel remain on channel ready indication", __func__); } @@ -359,7 +359,7 @@ static int wlan_hdd_request_remain_on_channel( struct wiphy *wiphy, pRemainChanCtx->rem_on_chan_request = request_type; cfgState->remain_on_chan_ctx = pRemainChanCtx; cfgState->current_freq = chan->center_freq; - + INIT_COMPLETION(pAdapter->rem_on_chan_ready_event); //call sme API to start remain on channel. @@ -532,7 +532,7 @@ int wlan_hdd_cfg80211_cancel_remain_on_channel( struct wiphy *wiphy, msecs_to_jiffies(WAIT_REM_CHAN_READY)); if (!status) { - hddLog( LOGE, + hddLog( LOGE, "%s: timeout waiting for remain on channel ready indication", __func__); } @@ -546,7 +546,7 @@ int wlan_hdd_cfg80211_cancel_remain_on_channel( struct wiphy *wiphy, ( WLAN_HDD_P2P_DEVICE == pAdapter->device_mode ) ) { - tANI_U8 sessionId = pAdapter->sessionId; + tANI_U8 sessionId = pAdapter->sessionId; sme_CancelRemainOnChannel( WLAN_HDD_GET_HAL_CTX( pAdapter ), sessionId ); } @@ -557,7 +557,7 @@ int wlan_hdd_cfg80211_cancel_remain_on_channel( struct wiphy *wiphy, WLANSAP_CancelRemainOnChannel( (WLAN_HDD_GET_CTX(pAdapter))->pvosContext); } - else + else { hddLog(VOS_TRACE_LEVEL_ERROR, "%s: Invalid device_mode = %d", __func__, pAdapter->device_mode); @@ -685,9 +685,9 @@ int wlan_hdd_action( struct wiphy *wiphy, struct net_device *dev, { if (subType == SIR_MAC_MGMT_PROBE_RSP) { - /* Drop Probe response recieved from supplicant, as for GO and + /* Drop Probe response recieved from supplicant, as for GO and SAP PE itself sends probe response - */ + */ goto err_rem_channel; } else if ((subType == SIR_MAC_MGMT_DISASSOC) || @@ -883,7 +883,7 @@ int wlan_hdd_action( struct wiphy *wiphy, struct net_device *dev, #if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,38)) } #endif - } + } if ( (WLAN_HDD_INFRA_STATION == pAdapter->device_mode) || (WLAN_HDD_P2P_CLIENT == pAdapter->device_mode) || @@ -1041,11 +1041,11 @@ void hdd_sendActionCnf( hdd_adapter_t *pAdapter, tANI_BOOLEAN actionSendSuccess * hdd_setP2pNoa * *FUNCTION: - * This function is called from hdd_hostapd_ioctl function when Driver + * This function is called from hdd_hostapd_ioctl function when Driver * get P2P_SET_NOA comand from wpa_supplicant using private ioctl * *LOGIC: - * Fill NoA Struct According to P2P Power save Option and Pass it to SME layer + * Fill NoA Struct According to P2P Power save Option and Pass it to SME layer * *ASSUMPTIONS: * @@ -1053,7 +1053,7 @@ void hdd_sendActionCnf( hdd_adapter_t *pAdapter, tANI_BOOLEAN actionSendSuccess *NOTE: * * @param dev Pointer to net device structure - * @param command Pointer to command + * @param command Pointer to command * * @return Status */ @@ -1101,8 +1101,8 @@ int hdd_setP2pNoa( struct net_device *dev, tANI_U8 *command ) VOS_TRACE( VOS_MODULE_ID_HDD, VOS_TRACE_LEVEL_INFO, "%s: P2P_PS_ATTR:oppPS %d ctWindow %d duration %d " "interval %d count %d single noa duration %d " - "PsSelection %x \n", __func__, NoA.opp_ps, - NoA.ctWindow, NoA.duration, NoA.interval, + "PsSelection %x \n", __func__, NoA.opp_ps, + NoA.ctWindow, NoA.duration, NoA.interval, NoA.count, NoA.single_noa_duration, NoA.psSelection); @@ -1155,23 +1155,23 @@ int hdd_setP2pOpps( struct net_device *dev, tANI_U8 *command ) /* From wpa_cli user need to use separate command to set ctWindow and Opps * When user want to set ctWindow during that time other parameters - * values are coming from wpa_supplicant as -1. - * Example : User want to set ctWindow with 30 then wpa_cli command : - * P2P_SET ctwindow 30 - * Command Received at hdd_hostapd_ioctl is as below: + * values are coming from wpa_supplicant as -1. + * Example : User want to set ctWindow with 30 then wpa_cli command : + * P2P_SET ctwindow 30 + * Command Received at hdd_hostapd_ioctl is as below: * P2P_SET_PS -1 -1 30 (legacy_ps = -1, opp_ps = -1, ctwindow = 30) - */ + */ if (ctwindow != -1) { VOS_TRACE(VOS_MODULE_ID_HDD, VOS_TRACE_LEVEL_INFO, - "Opportunistic Power Save is %s \n", + "Opportunistic Power Save is %s \n", (TRUE == pAdapter->ops) ? "Enable" : "Disable" ); if (ctwindow != pAdapter->ctw) { pAdapter->ctw = ctwindow; - + if(pAdapter->ops) { NoA.opp_ps = pAdapter->ops; @@ -1182,12 +1182,12 @@ int hdd_setP2pOpps( struct net_device *dev, tANI_U8 *command ) NoA.count = 0; NoA.psSelection = P2P_POWER_SAVE_TYPE_OPPORTUNISTIC; NoA.sessionid = pAdapter->sessionId; - + VOS_TRACE( VOS_MODULE_ID_HDD, VOS_TRACE_LEVEL_INFO, "%s: P2P_PS_ATTR:oppPS %d ctWindow %d duration %d " "interval %d count %d single noa duration %d " - "PsSelection %x \n", __func__, NoA.opp_ps, - NoA.ctWindow, NoA.duration, NoA.interval, + "PsSelection %x \n", __func__, NoA.opp_ps, + NoA.ctWindow, NoA.duration, NoA.interval, NoA.count, NoA.single_noa_duration, NoA.psSelection); @@ -1201,7 +1201,7 @@ int hdd_setP2pOpps( struct net_device *dev, tANI_U8 *command ) { pAdapter->ops = opp_ps; - if ((opp_ps != -1) && (pAdapter->ctw)) + if ((opp_ps != -1) && (pAdapter->ctw)) { NoA.opp_ps = opp_ps; NoA.ctWindow = pAdapter->ctw; @@ -1215,8 +1215,8 @@ int hdd_setP2pOpps( struct net_device *dev, tANI_U8 *command ) VOS_TRACE( VOS_MODULE_ID_HDD, VOS_TRACE_LEVEL_INFO, "%s: P2P_PS_ATTR:oppPS %d ctWindow %d duration %d " "interval %d count %d single noa duration %d " - "PsSelection %x \n", __func__, NoA.opp_ps, - NoA.ctWindow, NoA.duration, NoA.interval, + "PsSelection %x \n", __func__, NoA.opp_ps, + NoA.ctWindow, NoA.duration, NoA.interval, NoA.count, NoA.single_noa_duration, NoA.psSelection); @@ -1333,7 +1333,7 @@ int wlan_hdd_add_virtual_intf( struct wiphy *wiphy, char *name, */ v_MACADDR_t p2pDeviceAddress = pHddCtx->p2pDeviceAddress; p2pDeviceAddress.bytes[4] ^= 0x80; - pAdapter = hdd_open_adapter( pHddCtx, + pAdapter = hdd_open_adapter( pHddCtx, wlan_hdd_get_session_type(type), name, p2pDeviceAddress.bytes, VOS_TRUE ); @@ -1401,7 +1401,7 @@ int wlan_hdd_del_virtual_intf( struct wiphy *wiphy, struct net_device *dev ) void hdd_sendMgmtFrameOverMonitorIface( hdd_adapter_t *pMonAdapter, tANI_U32 nFrameLength, tANI_U8* pbFrames, - tANI_U8 frameType ) + tANI_U8 frameType ) { //Indicate a Frame over Monitor Intf. int rxstat; @@ -1468,13 +1468,13 @@ void hdd_sendMgmtFrameOverMonitorIface( hdd_adapter_t *pMonAdapter, hddLog( LOG1, FL("Success")); } else - hddLog( LOGE, FL("Failed %d"), rxstat); + hddLog( LOGE, FL("Failed %d"), rxstat); return ; } void hdd_indicateMgmtFrame( hdd_adapter_t *pAdapter, - tANI_U32 nFrameLength, + tANI_U32 nFrameLength, tANI_U8* pbFrames, tANI_U8 frameType, tANI_U32 rxChan, @@ -1572,8 +1572,8 @@ void hdd_indicateMgmtFrame( hdd_adapter_t *pAdapter, } cfgState = WLAN_HDD_GET_CFG_STATE_PTR( pAdapter ); - - if ((type == SIR_MAC_MGMT_FRAME) && + + if ((type == SIR_MAC_MGMT_FRAME) && (subType == SIR_MAC_MGMT_ACTION)) { if(pbFrames[WLAN_HDD_PUBLIC_ACTION_FRAME_OFFSET] == WLAN_HDD_PUBLIC_ACTION_FRAME) @@ -1710,7 +1710,7 @@ static int hdd_wlan_add_rx_radiotap_hdr ( pos++; put_unaligned_le16(rx_flags, pos); pos += 2; - + // actually push the data memcpy(skb_push(skb, rtap_len), &rtap_temp[0], rtap_len); @@ -1799,4 +1799,3 @@ static void hdd_wlan_tx_complete( hdd_adapter_t* pAdapter, netif_tx_start_all_queues( pAdapter->dev ); } - diff --git a/CORE/HDD/src/wlan_hdd_scan.c b/CORE/HDD/src/wlan_hdd_scan.c index b61c2f610772..9057af150524 100644 --- a/CORE/HDD/src/wlan_hdd_scan.c +++ b/CORE/HDD/src/wlan_hdd_scan.c @@ -482,11 +482,11 @@ static eHalStatus hdd_IndicateScanResult(hdd_scan_info_t *scanInfo, tCsrScanResu event.u.qual.noise = descriptor->sinr; /*To keep the rssi icon of the connected AP in the scan window - *and the rssi icon of the wireless networks in sync */ - if (( eConnectionState_Associated == + *and the rssi icon of the wireless networks in sync */ + if (( eConnectionState_Associated == pAdapter->sessionCtx.station.conn_info.connState ) && - ( VOS_TRUE == vos_mem_compare(descriptor->bssId, - pAdapter->sessionCtx.station.conn_info.bssId, + ( VOS_TRUE == vos_mem_compare(descriptor->bssId, + pAdapter->sessionCtx.station.conn_info.bssId, WNI_CFG_BSSID_LEN))) { event.u.qual.level = pAdapter->rssi; @@ -495,7 +495,7 @@ static eHalStatus hdd_IndicateScanResult(hdd_scan_info_t *scanInfo, tCsrScanResu { event.u.qual.level = VOS_MIN ((descriptor->rssi + descriptor->sinr), 0); } - + event.u.qual.updated = IW_QUAL_ALL_UPDATED; current_event = iwe_stream_add_event(scanInfo->info,current_event, @@ -550,7 +550,7 @@ static eHalStatus hdd_ScanRequestCallback(tHalHandle halHandle, void *pContext, union iwreq_data wrqu; int we_event; char *msg; - + ENTER(); hddLog(LOGW,"%s called with halHandle = %p, pContext = %p, scanID = %d," @@ -624,7 +624,7 @@ int iw_set_scan(struct net_device *dev, struct iw_request_info *info, #ifdef WLAN_BTAMP_FEATURE //Scan not supported when AMP traffic is on. - if( VOS_TRUE == WLANBAP_AmpSessionOn() ) + if( VOS_TRUE == WLANBAP_AmpSessionOn() ) { VOS_TRACE(VOS_MODULE_ID_HDD, VOS_TRACE_LEVEL_ERROR, "%s: No scanning when AMP is on",__func__); return eHAL_STATUS_SUCCESS; @@ -718,7 +718,7 @@ int iw_set_scan(struct net_device *dev, struct iw_request_info *info, pwextBuf->roamProfile.pAddIEScan = pAdapter->scan_info.scanAddIE.addIEdata; pwextBuf->roamProfile.nAddIEScanLength = pAdapter->scan_info.scanAddIE.length; - + /* clear previous genIE after use it */ memset( &pwextBuf->genIE, 0, sizeof(pwextBuf->genIE) ); } @@ -731,7 +731,7 @@ int iw_set_scan(struct net_device *dev, struct iw_request_info *info, scanRequest.pIEField = pAdapter->scan_info.scanAddIE.addIEdata; } - status = sme_ScanRequest( (WLAN_HDD_GET_CTX(pAdapter))->hHal, pAdapter->sessionId,&scanRequest, &scanId, &hdd_ScanRequestCallback, dev ); + status = sme_ScanRequest( (WLAN_HDD_GET_CTX(pAdapter))->hHal, pAdapter->sessionId,&scanRequest, &scanId, &hdd_ScanRequestCallback, dev ); if (!HAL_STATUS_SUCCESS(status)) { VOS_TRACE(VOS_MODULE_ID_HDD, VOS_TRACE_LEVEL_FATAL, "%s:sme_ScanRequest fail %d!!!",__func__, status); @@ -940,7 +940,7 @@ int iw_set_cscan(struct net_device *dev, struct iw_request_info *info, if(WEXT_SCAN_PENDING_GIVEUP == scanPendingOption) { pAdapter->scan_info.waitScanResult = FALSE; - return eHAL_STATUS_SUCCESS; + return eHAL_STATUS_SUCCESS; } /* If any scan pending, wait till finish current scan, and try this scan request when previous scan finish */ @@ -952,34 +952,34 @@ int iw_set_cscan(struct net_device *dev, struct iw_request_info *info, WEXT_CSCAN_SCAN_DONE_WAIT_TIME)) { hddLog(LOG1,"%s: Previous SCAN does not finished on time",__func__); - return eHAL_STATUS_SUCCESS; + return eHAL_STATUS_SUCCESS; } } /* Piggyback previous scan result */ else if(WEXT_SCAN_PENDING_PIGGYBACK == scanPendingOption) { pAdapter->scan_info.waitScanResult = TRUE; - return eHAL_STATUS_SUCCESS; + return eHAL_STATUS_SUCCESS; } } pAdapter->scan_info.waitScanResult = FALSE; /* Check for scan IE */ - while( WEXT_CSCAN_SSID_SECTION == str_ptr[i] ) + while( WEXT_CSCAN_SSID_SECTION == str_ptr[i] ) { /* ssid_len */ - if(str_ptr[++i] != WEXT_CSCAN_CHANNEL_SECTION) + if(str_ptr[++i] != WEXT_CSCAN_CHANNEL_SECTION) { /* total number of ssid's */ num_ssid++; /* increment length filed */ i += str_ptr[i] + 1; - } + } /* i should be saved and it will be pointing to 'C' */ } VOS_TRACE(VOS_MODULE_ID_HDD, VOS_TRACE_LEVEL_INFO, "%s: numSsid %d !!!",__func__, num_ssid); - if( num_ssid ) + if( num_ssid ) { /* To be fixed in SME and PE: override the number of ssid with 1, * as SME and PE does not handle multiple SSID in scan request @@ -1011,9 +1011,9 @@ int iw_set_cscan(struct net_device *dev, struct iw_request_info *info, } /* Check for Channel IE */ - if ( WEXT_CSCAN_CHANNEL_SECTION == str_ptr[i]) + if ( WEXT_CSCAN_CHANNEL_SECTION == str_ptr[i]) { - if( str_ptr[++i] == 0 ) + if( str_ptr[++i] == 0 ) { scanRequest.ChannelInfo.numOfChannels = 0; scanRequest.ChannelInfo.ChannelList = NULL; @@ -1026,7 +1026,7 @@ int iw_set_cscan(struct net_device *dev, struct iw_request_info *info, /* store temp channel list */ /* SME expects 1 byte channel content */ scanRequest.ChannelInfo.ChannelList = vos_mem_malloc(scanRequest.ChannelInfo.numOfChannels * sizeof(v_U8_t)); - if(NULL == scanRequest.ChannelInfo.ChannelList) + if(NULL == scanRequest.ChannelInfo.ChannelList) { hddLog(VOS_TRACE_LEVEL_INFO_HIGH, "memory alloc failed for channel list creation"); status = -ENOMEM; @@ -1050,7 +1050,7 @@ int iw_set_cscan(struct net_device *dev, struct iw_request_info *info, /* Now i is pointing to passive dwell dwell time */ /* 'P',min dwell time, max dwell time */ /* next two offsets contain min and max channel time */ - if( WEXT_CSCAN_PASV_DWELL_SECTION == (str_ptr[i]) ) + if( WEXT_CSCAN_PASV_DWELL_SECTION == (str_ptr[i]) ) { /* No SSID specified, num_ssid == 0, then start paasive scan */ if (!num_ssid || (eSIR_PASSIVE_SCAN == pAdapter->scan_info.scan_mode)) @@ -1063,11 +1063,11 @@ int iw_set_cscan(struct net_device *dev, struct iw_request_info *info, else { i += 3; - } - } + } + } /* H indicates active channel time */ - if( WEXT_CSCAN_HOME_DWELL_SECTION == (str_ptr[i]) ) + if( WEXT_CSCAN_HOME_DWELL_SECTION == (str_ptr[i]) ) { if (num_ssid || (eSIR_ACTIVE_SCAN == pAdapter->scan_info.scan_mode)) { @@ -1109,8 +1109,8 @@ int iw_set_cscan(struct net_device *dev, struct iw_request_info *info, scanRequest.pIEField = pAdapter->scan_info.scanAddIE.addIEdata; } - status = sme_ScanRequest( (WLAN_HDD_GET_CTX(pAdapter))->hHal, - pAdapter->sessionId,&scanRequest, &scanId, &hdd_ScanRequestCallback, dev ); + status = sme_ScanRequest( (WLAN_HDD_GET_CTX(pAdapter))->hHal, + pAdapter->sessionId,&scanRequest, &scanId, &hdd_ScanRequestCallback, dev ); if( !HAL_STATUS_SUCCESS(status) ) { VOS_TRACE(VOS_MODULE_ID_HDD, VOS_TRACE_LEVEL_FATAL, "%s: SME scan fail status %d !!!",__func__, status); @@ -1129,7 +1129,7 @@ int iw_set_cscan(struct net_device *dev, struct iw_request_info *info, exit_point: /* free ssidlist */ - if (scanRequest.SSIDs.SSIDList) + if (scanRequest.SSIDs.SSIDList) { vos_mem_free(scanRequest.SSIDs.SSIDList); } @@ -1149,4 +1149,3 @@ void hdd_abort_mac_scan(hdd_context_t* pHddCtx, tANI_U8 sessionId) { sme_AbortMacScan(pHddCtx->hHal, sessionId); } - diff --git a/CORE/HDD/src/wlan_hdd_softap_tx_rx.c b/CORE/HDD/src/wlan_hdd_softap_tx_rx.c index 163d8db62ff2..aef32724a97a 100644 --- a/CORE/HDD/src/wlan_hdd_softap_tx_rx.c +++ b/CORE/HDD/src/wlan_hdd_softap_tx_rx.c @@ -53,17 +53,17 @@ #ifdef IPA_OFFLOAD #include <wlan_hdd_ipa.h> #endif -/*--------------------------------------------------------------------------- +/*--------------------------------------------------------------------------- Preprocessor definitions and constants - -------------------------------------------------------------------------*/ + -------------------------------------------------------------------------*/ -/*--------------------------------------------------------------------------- +/*--------------------------------------------------------------------------- Type declarations - -------------------------------------------------------------------------*/ + -------------------------------------------------------------------------*/ -/*--------------------------------------------------------------------------- +/*--------------------------------------------------------------------------- Function definitions and documenation - -------------------------------------------------------------------------*/ + -------------------------------------------------------------------------*/ #if 0 static void hdd_softap_dump_sk_buff(struct sk_buff * skb) { @@ -75,12 +75,12 @@ static void hdd_softap_dump_sk_buff(struct sk_buff * skb) VOS_TRACE( VOS_MODULE_ID_HDD_SOFTAP, VOS_TRACE_LEVEL_ERROR,"%s: data_len = %d ", __func__, skb->data_len); VOS_TRACE( VOS_MODULE_ID_HDD_SOFTAP, VOS_TRACE_LEVEL_ERROR,"%s: mac_len = %d\n", __func__, skb->mac_len); - VOS_TRACE( VOS_MODULE_ID_HDD_SOFTAP, VOS_TRACE_LEVEL_ERROR,"0x%x 0x%x 0x%x 0x%x 0x%x 0x%x 0x%x 0x%x ", - skb->data[0], skb->data[1], skb->data[2], skb->data[3], skb->data[4], - skb->data[5], skb->data[6], skb->data[7]); - VOS_TRACE( VOS_MODULE_ID_HDD_SOFTAP, VOS_TRACE_LEVEL_ERROR,"0x%x 0x%x 0x%x 0x%x 0x%x 0x%x 0x%x 0x%x \n", + VOS_TRACE( VOS_MODULE_ID_HDD_SOFTAP, VOS_TRACE_LEVEL_ERROR,"0x%x 0x%x 0x%x 0x%x 0x%x 0x%x 0x%x 0x%x ", + skb->data[0], skb->data[1], skb->data[2], skb->data[3], skb->data[4], + skb->data[5], skb->data[6], skb->data[7]); + VOS_TRACE( VOS_MODULE_ID_HDD_SOFTAP, VOS_TRACE_LEVEL_ERROR,"0x%x 0x%x 0x%x 0x%x 0x%x 0x%x 0x%x 0x%x \n", skb->data[8], skb->data[9], skb->data[10], skb->data[11], skb->data[12], - skb->data[13], skb->data[14], skb->data[15]); + skb->data[13], skb->data[14], skb->data[15]); } #endif @@ -200,8 +200,8 @@ VOS_STATUS hdd_stop_trafficMonitor( hdd_adapter_t *pAdapter ) /**============================================================================ @brief hdd_softap_flush_tx_queues() - Utility function to flush the TX queues - @param pAdapter : [in] pointer to adapter context - @return : VOS_STATUS_E_FAILURE if any errors encountered + @param pAdapter : [in] pointer to adapter context + @return : VOS_STATUS_E_FAILURE if any errors encountered : VOS_STATUS_SUCCESS otherwise ===========================================================================*/ static VOS_STATUS hdd_softap_flush_tx_queues( hdd_adapter_t *pAdapter ) @@ -224,7 +224,7 @@ static VOS_STATUS hdd_softap_flush_tx_queues( hdd_adapter_t *pAdapter ) for (i = 0; i < NUM_TX_QUEUES; i ++) { spin_lock_bh(&pAdapter->aStaInfo[STAId].wmm_tx_queue[i].lock); - while (true) + while (true) { status = hdd_list_remove_front ( &pAdapter->aStaInfo[STAId].wmm_tx_queue[i], &anchor); @@ -255,14 +255,14 @@ static VOS_STATUS hdd_softap_flush_tx_queues( hdd_adapter_t *pAdapter ) } #ifndef QCA_WIFI_2_0 /**============================================================================ - @brief hdd_softap_hard_start_xmit() - Function registered with the Linux OS for + @brief hdd_softap_hard_start_xmit() - Function registered with the Linux OS for transmitting packets. There are 2 versions of this function. One that uses locked queue and other that uses lockless queues. Both have been retained to do some performance testing @param skb : [in] pointer to OS packet (sk_buff) @param dev : [in] pointer to Libra network device - + @return : NET_XMIT_DROP if packets are dropped : NET_XMIT_SUCCESS if packet is enqueued succesfully ===========================================================================*/ @@ -275,15 +275,15 @@ int hdd_softap_hard_start_xmit(struct sk_buff *skb, struct net_device *dev) v_SIZE_t pktListSize = 0; v_BOOL_t txSuspended = VOS_FALSE; hdd_adapter_t *pAdapter = (hdd_adapter_t *)netdev_priv(dev); - hdd_ap_ctx_t *pHddApCtx = WLAN_HDD_GET_AP_CTX_PTR(pAdapter); + hdd_ap_ctx_t *pHddApCtx = WLAN_HDD_GET_AP_CTX_PTR(pAdapter); vos_list_node_t *anchor = NULL; v_U8_t STAId = WLAN_MAX_STA_COUNT; //Extract the destination address from ethernet frame v_MACADDR_t *pDestMacAddress = (v_MACADDR_t*)skb->data; - int os_status = NETDEV_TX_OK; + int os_status = NETDEV_TX_OK; pDestMacAddress = (v_MACADDR_t*)skb->data; - + ++pAdapter->hdd_stats.hddTxRxStats.txXmitCalled; VOS_TRACE( VOS_MODULE_ID_HDD_SOFTAP, VOS_TRACE_LEVEL_INFO, @@ -292,10 +292,10 @@ int hdd_softap_hard_start_xmit(struct sk_buff *skb, struct net_device *dev) spin_lock_bh( &pAdapter->staInfo_lock ); if (vos_is_macaddr_broadcast( pDestMacAddress ) || vos_is_macaddr_group(pDestMacAddress)) { - //The BC/MC station ID is assigned during BSS starting phase. SAP will return the station + //The BC/MC station ID is assigned during BSS starting phase. SAP will return the station //ID used for BC/MC traffic. The station id is registered to TL as well. STAId = pHddApCtx->uBCStaId; - + /* Setting priority for broadcast packets which doesn't go to select_queue function */ skb->priority = SME_QOS_WMM_UP_BE; skb->queue_mapping = HDD_LINUX_AC_BE; @@ -324,7 +324,7 @@ int hdd_softap_hard_start_xmit(struct sk_buff *skb, struct net_device *dev) goto xmit_done; } - if ( (WLANTL_STA_CONNECTED != pAdapter->aStaInfo[STAId].tlSTAState) && + if ( (WLANTL_STA_CONNECTED != pAdapter->aStaInfo[STAId].tlSTAState) && (WLANTL_STA_AUTHENTICATED != pAdapter->aStaInfo[STAId].tlSTAState) ) { VOS_TRACE( VOS_MODULE_ID_HDD_SOFTAP, VOS_TRACE_LEVEL_WARN, @@ -350,7 +350,7 @@ int hdd_softap_hard_start_xmit(struct sk_buff *skb, struct net_device *dev) //Get TL AC corresponding to Qdisc queue index/AC. ac = hdd_QdiscAcToTlAC[skb->queue_mapping]; - //user priority from IP header, which is already extracted and set from + //user priority from IP header, which is already extracted and set from //select_queue call back function up = skb->priority; ++pAdapter->hdd_stats.hddTxRxStats.txXmitClassifiedAC[ac]; @@ -358,14 +358,14 @@ int hdd_softap_hard_start_xmit(struct sk_buff *skb, struct net_device *dev) VOS_TRACE( VOS_MODULE_ID_HDD_SOFTAP, VOS_TRACE_LEVEL_INFO, "%s: Classified as ac %d up %d", __func__, ac, up); - // If the memory differentiation mode is enabled, the memory limit of each queue will be + // If the memory differentiation mode is enabled, the memory limit of each queue will be // checked. Over-limit packets will be dropped. spin_lock_bh(&pAdapter->aStaInfo[STAId].wmm_tx_queue[ac].lock); hdd_list_size(&pAdapter->aStaInfo[STAId].wmm_tx_queue[ac], &pktListSize); if(pktListSize >= pAdapter->aTxQueueLimit[ac]) { VOS_TRACE( VOS_MODULE_ID_HDD_SOFTAP, VOS_TRACE_LEVEL_WARN, - "%s: station %d ac %d queue over limit %d \n", __func__, STAId, ac, pktListSize); + "%s: station %d ac %d queue over limit %d \n", __func__, STAId, ac, pktListSize); pAdapter->aStaInfo[STAId].txSuspended[ac] = VOS_TRUE; netif_stop_subqueue(dev, skb_get_queue_mapping(skb)); txSuspended = VOS_TRUE; @@ -390,10 +390,10 @@ int hdd_softap_hard_start_xmit(struct sk_buff *skb, struct net_device *dev) if (VOS_TRUE == txSuspended) { - VOS_TRACE( VOS_MODULE_ID_HDD, VOS_TRACE_LEVEL_WARN, - "%s: TX queue full for AC=%d Disable OS TX queue", + VOS_TRACE( VOS_MODULE_ID_HDD, VOS_TRACE_LEVEL_WARN, + "%s: TX queue full for AC=%d Disable OS TX queue", __func__, ac ); - os_status = NETDEV_TX_BUSY; + os_status = NETDEV_TX_BUSY; goto xmit_done; } @@ -403,7 +403,7 @@ int hdd_softap_hard_start_xmit(struct sk_buff *skb, struct net_device *dev) //Stick the OS packet inside this node. pktNode->skb = skb; - //Stick the User Priority inside this node + //Stick the User Priority inside this node pktNode->userPriority = up; INIT_LIST_HEAD(&pktNode->anchor); @@ -428,11 +428,11 @@ int hdd_softap_hard_start_xmit(struct sk_buff *skb, struct net_device *dev) if (1 == pktListSize) { //Let TL know we have a packet to send for this AC - status = WLANTL_STAPktPending( (WLAN_HDD_GET_CTX(pAdapter))->pvosContext, STAId, ac ); + status = WLANTL_STAPktPending( (WLAN_HDD_GET_CTX(pAdapter))->pvosContext, STAId, ac ); if ( !VOS_IS_STATUS_SUCCESS( status ) ) { - VOS_TRACE( VOS_MODULE_ID_HDD_SOFTAP, VOS_TRACE_LEVEL_WARN, "%s: Failed to signal TL for AC=%d STAId =%d", + VOS_TRACE( VOS_MODULE_ID_HDD_SOFTAP, VOS_TRACE_LEVEL_WARN, "%s: Failed to signal TL for AC=%d STAId =%d", __func__, ac, STAId ); //Remove the packet from queue. It must be at the back of the queue, as TX thread cannot preempt us in the middle @@ -590,17 +590,17 @@ drop_pkt: @param skb : [in] pointer to packet (sk_buff) @param dev : [in] pointer to Libra network device @param STAId : [in] Station Id of Destination Station - @param up : [in] User Priority - + @param up : [in] User Priority + @return : NET_XMIT_DROP if packets are dropped : NET_XMIT_SUCCESS if packet is enqueued succesfully ===========================================================================*/ -VOS_STATUS hdd_softap_sta_2_sta_xmit(struct sk_buff *skb, +VOS_STATUS hdd_softap_sta_2_sta_xmit(struct sk_buff *skb, struct net_device *dev, - v_U8_t STAId, + v_U8_t STAId, v_U8_t up) { - VOS_STATUS status = VOS_STATUS_SUCCESS; + VOS_STATUS status = VOS_STATUS_SUCCESS; skb_list_node_t *pktNode = NULL; v_SIZE_t pktListSize = 0; hdd_adapter_t *pAdapter = (hdd_adapter_t *)netdev_priv(dev); @@ -639,7 +639,7 @@ VOS_STATUS hdd_softap_sta_2_sta_xmit(struct sk_buff *skb, //Stick the OS packet inside this node. pktNode->skb = skb; - //Stick the User Priority inside this node + //Stick the User Priority inside this node pktNode->userPriority = up; INIT_LIST_HEAD(&pktNode->anchor); @@ -650,9 +650,9 @@ VOS_STATUS hdd_softap_sta_2_sta_xmit(struct sk_buff *skb, pktListSize >= pAdapter->aTxQueueLimit[ac]) { VOS_TRACE( VOS_MODULE_ID_HDD_SOFTAP, VOS_TRACE_LEVEL_WARN, - "%s: station %d ac %d queue over limit %d \n", __func__, STAId, ac, pktListSize); + "%s: station %d ac %d queue over limit %d \n", __func__, STAId, ac, pktListSize); /* TODO:Rx Flowchart should be trigerred here to SUPEND SSC on RX side. - * SUSPEND should be done based on Threshold. RESUME would be + * SUSPEND should be done based on Threshold. RESUME would be * triggered in fetch cbk after recovery. */ kfree_skb(skb); @@ -681,11 +681,11 @@ VOS_STATUS hdd_softap_sta_2_sta_xmit(struct sk_buff *skb, { //Let TL know we have a packet to send for this AC //VOS_TRACE( VOS_MODULE_ID_HDD_SOFTAP, VOS_TRACE_LEVEL_ERROR,"%s:Indicating Packet to TL", __func__); - status = WLANTL_STAPktPending( (WLAN_HDD_GET_CTX(pAdapter))->pvosContext, STAId, ac ); + status = WLANTL_STAPktPending( (WLAN_HDD_GET_CTX(pAdapter))->pvosContext, STAId, ac ); if ( !VOS_IS_STATUS_SUCCESS( status ) ) { - VOS_TRACE( VOS_MODULE_ID_HDD_SOFTAP, VOS_TRACE_LEVEL_WARN, "%s: Failed to signal TL for AC=%d STAId =%d", + VOS_TRACE( VOS_MODULE_ID_HDD_SOFTAP, VOS_TRACE_LEVEL_WARN, "%s: Failed to signal TL for AC=%d STAId =%d", __func__, ac, STAId ); //Remove the packet from queue. It must be at the back of the queue, as TX thread cannot preempt us in the middle @@ -721,19 +721,19 @@ void hdd_softap_tx_timeout(struct net_device *dev) { VOS_TRACE( VOS_MODULE_ID_HDD_SOFTAP, VOS_TRACE_LEVEL_ERROR, "%s: Transmission timeout occurred", __func__); - //Getting here implies we disabled the TX queues for too long. Queues are + //Getting here implies we disabled the TX queues for too long. Queues are //disabled either because of disassociation or low resource scenarios. In //case of disassociation it is ok to ignore this. But if associated, we have //do possible recovery here -} +} /**============================================================================ - @brief hdd_softap_stats() - Function registered with the Linux OS for + @brief hdd_softap_stats() - Function registered with the Linux OS for device TX/RX statistic @param dev : [in] pointer to Libra network device - + @return : pointer to net_device_stats structure ===========================================================================*/ struct net_device_stats* hdd_softap_stats(struct net_device *dev) @@ -747,8 +747,8 @@ struct net_device_stats* hdd_softap_stats(struct net_device *dev) @brief hdd_softap_init_tx_rx() - Init function to initialize Tx/RX modules in HDD - @param pAdapter : [in] pointer to adapter context - @return : VOS_STATUS_E_FAILURE if any errors encountered + @param pAdapter : [in] pointer to adapter context + @return : VOS_STATUS_E_FAILURE if any errors encountered : VOS_STATUS_SUCCESS otherwise ===========================================================================*/ VOS_STATUS hdd_softap_init_tx_rx( hdd_adapter_t *pAdapter ) @@ -760,9 +760,9 @@ VOS_STATUS hdd_softap_init_tx_rx( hdd_adapter_t *pAdapter ) v_U8_t STAId = 0; v_U8_t pACWeights[] = { - HDD_SOFTAP_BK_WEIGHT_DEFAULT, - HDD_SOFTAP_BE_WEIGHT_DEFAULT, - HDD_SOFTAP_VI_WEIGHT_DEFAULT, + HDD_SOFTAP_BK_WEIGHT_DEFAULT, + HDD_SOFTAP_BE_WEIGHT_DEFAULT, + HDD_SOFTAP_VI_WEIGHT_DEFAULT, HDD_SOFTAP_VO_WEIGHT_DEFAULT }; @@ -771,7 +771,7 @@ VOS_STATUS hdd_softap_init_tx_rx( hdd_adapter_t *pAdapter ) vos_mem_zero(&pAdapter->stats, sizeof(struct net_device_stats)); - while (++i != NUM_TX_QUEUES) + while (++i != NUM_TX_QUEUES) hdd_list_init( &pAdapter->wmm_tx_queue[i], HDD_TX_QUEUE_MAX_LEN); /* Initial HDD buffer control / flow control fields*/ @@ -809,8 +809,8 @@ VOS_STATUS hdd_softap_init_tx_rx( hdd_adapter_t *pAdapter ) @brief hdd_softap_deinit_tx_rx() - Deinit function to clean up Tx/RX modules in HDD - @param pAdapter : [in] pointer to adapter context - @return : VOS_STATUS_E_FAILURE if any errors encountered + @param pAdapter : [in] pointer to adapter context + @return : VOS_STATUS_E_FAILURE if any errors encountered : VOS_STATUS_SUCCESS otherwise ===========================================================================*/ VOS_STATUS hdd_softap_deinit_tx_rx( hdd_adapter_t *pAdapter ) @@ -833,8 +833,8 @@ VOS_STATUS hdd_softap_deinit_tx_rx( hdd_adapter_t *pAdapter ) @brief hdd_softap_flush_tx_queues_sta() - Utility function to flush the TX queues of a station @param pAdapter : [in] pointer to adapter context - @param STAId : [in] Station ID to deinit - @return : VOS_STATUS_E_FAILURE if any errors encountered + @param STAId : [in] Station ID to deinit + @return : VOS_STATUS_E_FAILURE if any errors encountered : VOS_STATUS_SUCCESS otherwise ===========================================================================*/ static VOS_STATUS hdd_softap_flush_tx_queues_sta( hdd_adapter_t *pAdapter, v_U8_t STAId ) @@ -855,7 +855,7 @@ static VOS_STATUS hdd_softap_flush_tx_queues_sta( hdd_adapter_t *pAdapter, v_U8_ for (i = 0; i < NUM_TX_QUEUES; i ++) { spin_lock_bh(&pAdapter->aStaInfo[STAId].wmm_tx_queue[i].lock); - while (true) + while (true) { status = hdd_list_remove_front ( &pAdapter->aStaInfo[STAId].wmm_tx_queue[i], &anchor); if (VOS_STATUS_E_EMPTY != status) @@ -885,8 +885,8 @@ static VOS_STATUS hdd_softap_flush_tx_queues_sta( hdd_adapter_t *pAdapter, v_U8_ @param pAdapter : [in] pointer to adapter context @param STAId : [in] Station ID to deinit - @param pmacAddrSTA : [in] pointer to the MAC address of the station - @return : VOS_STATUS_E_FAILURE if any errors encountered + @param pmacAddrSTA : [in] pointer to the MAC address of the station + @return : VOS_STATUS_E_FAILURE if any errors encountered : VOS_STATUS_SUCCESS otherwise ===========================================================================*/ VOS_STATUS hdd_softap_init_tx_rx_sta( hdd_adapter_t *pAdapter, v_U8_t STAId, v_MACADDR_t *pmacAddrSTA) @@ -919,8 +919,8 @@ VOS_STATUS hdd_softap_init_tx_rx_sta( hdd_adapter_t *pAdapter, v_U8_t STAId, v_M modules in HDD @param pAdapter : [in] pointer to adapter context - @param STAId : [in] Station ID to deinit - @return : VOS_STATUS_E_FAILURE if any errors encountered + @param STAId : [in] Station ID to deinit + @return : VOS_STATUS_E_FAILURE if any errors encountered : VOS_STATUS_SUCCESS otherwise ===========================================================================*/ VOS_STATUS hdd_softap_deinit_tx_rx_sta ( hdd_adapter_t *pAdapter, v_U8_t STAId ) @@ -996,8 +996,8 @@ VOS_STATUS hdd_softap_deinit_tx_rx_sta ( hdd_adapter_t *pAdapter, v_U8_t STAId ) @brief hdd_softap_disconnect_tx_rx() - Disconnect function to clean up Tx/RX modules in HDD - @param pAdapter : [in] pointer to adapter context - @return : VOS_STATUS_E_FAILURE if any errors encountered + @param pAdapter : [in] pointer to adapter context + @return : VOS_STATUS_E_FAILURE if any errors encountered : VOS_STATUS_SUCCESS otherwise ===========================================================================*/ VOS_STATUS hdd_softap_disconnect_tx_rx( hdd_adapter_t *pAdapter ) @@ -1010,25 +1010,25 @@ VOS_STATUS hdd_softap_disconnect_tx_rx( hdd_adapter_t *pAdapter ) to indicate that a packet has been transmitted across the bus succesfully. OS packet resources can be released after this cbk. - @param vosContext : [in] pointer to VOS context - @param pVosPacket : [in] pointer to VOS packet (containing skb) - @param vosStatusIn : [in] status of the transmission + @param vosContext : [in] pointer to VOS context + @param pVosPacket : [in] pointer to VOS packet (containing skb) + @param vosStatusIn : [in] status of the transmission - @return : VOS_STATUS_E_FAILURE if any errors encountered + @return : VOS_STATUS_E_FAILURE if any errors encountered : VOS_STATUS_SUCCESS otherwise ===========================================================================*/ -VOS_STATUS hdd_softap_tx_complete_cbk( v_VOID_t *vosContext, - vos_pkt_t *pVosPacket, +VOS_STATUS hdd_softap_tx_complete_cbk( v_VOID_t *vosContext, + vos_pkt_t *pVosPacket, VOS_STATUS vosStatusIn ) { VOS_STATUS status = VOS_STATUS_SUCCESS; - hdd_adapter_t *pAdapter = NULL; + hdd_adapter_t *pAdapter = NULL; void* pOsPkt = NULL; - + if( ( NULL == vosContext ) || ( NULL == pVosPacket ) ) { VOS_TRACE( VOS_MODULE_ID_HDD_SOFTAP, VOS_TRACE_LEVEL_ERROR,"%s: Null params being passed", __func__); - return VOS_STATUS_E_FAILURE; + return VOS_STATUS_E_FAILURE; } //Return the skb to the OS @@ -1052,7 +1052,7 @@ VOS_STATUS hdd_softap_tx_complete_cbk( v_VOID_t *vosContext, ++pAdapter->hdd_stats.hddTxRxStats.txCompleted; } - kfree_skb((struct sk_buff *)pOsPkt); + kfree_skb((struct sk_buff *)pOsPkt); //Return the VOS packet resources. status = vos_pkt_return_packet( pVosPacket ); @@ -1066,17 +1066,17 @@ VOS_STATUS hdd_softap_tx_complete_cbk( v_VOID_t *vosContext, /**============================================================================ - @brief hdd_softap_tx_fetch_packet_cbk() - Callback function invoked by TL to + @brief hdd_softap_tx_fetch_packet_cbk() - Callback function invoked by TL to fetch a packet for transmission. - @param vosContext : [in] pointer to VOS context + @param vosContext : [in] pointer to VOS context @param staId : [in] Station for which TL is requesting a pkt @param ac : [in] access category requested by TL @param pVosPacket : [out] pointer to VOS packet packet pointer - @param pPktMetaInfo : [out] pointer to meta info for the pkt - + @param pPktMetaInfo : [out] pointer to meta info for the pkt + @return : VOS_STATUS_E_EMPTY if no packets to transmit - : VOS_STATUS_E_FAILURE if any errors encountered + : VOS_STATUS_E_FAILURE if any errors encountered : VOS_STATUS_SUCCESS otherwise ===========================================================================*/ VOS_STATUS hdd_softap_tx_fetch_packet_cbk( v_VOID_t *vosContext, @@ -1094,19 +1094,19 @@ VOS_STATUS hdd_softap_tx_fetch_packet_cbk( v_VOID_t *vosContext, v_MACADDR_t* pDestMacAddress = NULL; v_TIME_t timestamp; v_SIZE_t size = 0; - v_U8_t STAId = WLAN_MAX_STA_COUNT; + v_U8_t STAId = WLAN_MAX_STA_COUNT; hdd_context_t *pHddCtx = NULL; //Sanity check on inputs - if ( ( NULL == vosContext ) || - ( NULL == pStaId ) || + if ( ( NULL == vosContext ) || + ( NULL == pStaId ) || ( NULL == ppVosPacket ) || ( NULL == pPktMetaInfo ) ) { VOS_TRACE( VOS_MODULE_ID_HDD_SOFTAP, VOS_TRACE_LEVEL_ERROR,"%s: Null Params being passed", __func__); return VOS_STATUS_E_FAILURE; } - + //Get the HDD context. pHddCtx = (hdd_context_t *)vos_get_context( VOS_MODULE_ID_HDD, vosContext ); if ( NULL == pHddCtx ) @@ -1129,7 +1129,7 @@ VOS_STATUS hdd_softap_tx_fetch_packet_cbk( v_VOID_t *vosContext, VOS_ASSERT(0); return VOS_STATUS_E_FAILURE; } - + if (FALSE == pAdapter->aStaInfo[STAId].isUsed ) { VOS_TRACE( VOS_MODULE_ID_HDD_SOFTAP, VOS_TRACE_LEVEL_ERROR, @@ -1174,12 +1174,12 @@ VOS_STATUS hdd_softap_tx_fetch_packet_cbk( v_VOID_t *vosContext, VOS_TRACE( VOS_MODULE_ID_HDD_SOFTAP, VOS_TRACE_LEVEL_INFO, "%s: AC %d passed by TL", __func__, ac); - //Get the vos packet. I don't want to dequeue and enqueue again if we are out of VOS resources + //Get the vos packet. I don't want to dequeue and enqueue again if we are out of VOS resources //This simplifies the locking and unlocking of Tx queue - status = vos_pkt_wrap_data_packet( &pVosPacket, - VOS_PKT_TYPE_TX_802_3_DATA, + status = vos_pkt_wrap_data_packet( &pVosPacket, + VOS_PKT_TYPE_TX_802_3_DATA, NULL, //OS Pkt is not being passed - hdd_softap_tx_low_resource_cbk, + hdd_softap_tx_low_resource_cbk, pAdapter ); if (status == VOS_STATUS_E_ALREADY || status == VOS_STATUS_E_RESOURCES) @@ -1270,7 +1270,7 @@ VOS_STATUS hdd_softap_tx_fetch_packet_cbk( v_VOID_t *vosContext, pPktMetaInfo->ucIsEapol = 0; - if(pAdapter->aStaInfo[STAId].tlSTAState != WLANTL_STA_AUTHENTICATED) + if(pAdapter->aStaInfo[STAId].tlSTAState != WLANTL_STA_AUTHENTICATED) { if (TRUE == hdd_IsEAPOLPacket( pVosPacket )) { @@ -1279,7 +1279,7 @@ VOS_STATUS hdd_softap_tx_fetch_packet_cbk( v_VOID_t *vosContext, pPktMetaInfo->ucIsEapol = 1; } } - + //xg: @@@@: temporarily disble these. will revisit later { pPktMetaInfo->ucUP = pktNode->userPriority; @@ -1303,7 +1303,7 @@ VOS_STATUS hdd_softap_tx_fetch_packet_cbk( v_VOID_t *vosContext, "%s: TX queue re-enabled", __func__); pAdapter->aStaInfo[STAId].txSuspended[ac] = VOS_FALSE; netif_wake_subqueue(pAdapter->dev, skb_get_queue_mapping(skb)); - } + } // We're giving the packet to TL so consider it transmitted from // a statistics perspective. We account for it here instead of @@ -1327,18 +1327,18 @@ VOS_STATUS hdd_softap_tx_fetch_packet_cbk( v_VOID_t *vosContext, /**============================================================================ - @brief hdd_softap_tx_low_resource_cbk() - Callback function invoked in the - case where VOS packets are not available at the time of the call to get - packets. This callback function is invoked by VOS when packets are + @brief hdd_softap_tx_low_resource_cbk() - Callback function invoked in the + case where VOS packets are not available at the time of the call to get + packets. This callback function is invoked by VOS when packets are available. - @param pVosPacket : [in] pointer to VOS packet - @param userData : [in] opaque user data that was passed initially - - @return : VOS_STATUS_E_FAILURE if any errors encountered, + @param pVosPacket : [in] pointer to VOS packet + @param userData : [in] opaque user data that was passed initially + + @return : VOS_STATUS_E_FAILURE if any errors encountered, : VOS_STATUS_SUCCESS otherwise =============================================================================*/ -VOS_STATUS hdd_softap_tx_low_resource_cbk( vos_pkt_t *pVosPacket, +VOS_STATUS hdd_softap_tx_low_resource_cbk( vos_pkt_t *pVosPacket, v_VOID_t *userData ) { VOS_STATUS status; @@ -1346,7 +1346,7 @@ VOS_STATUS hdd_softap_tx_low_resource_cbk( vos_pkt_t *pVosPacket, v_SIZE_t size = 0; hdd_adapter_t* pAdapter = (hdd_adapter_t *)userData; v_U8_t STAId = WLAN_MAX_STA_COUNT; - + if(pAdapter == NULL) { VOS_TRACE( VOS_MODULE_ID_HDD_SOFTAP, VOS_TRACE_LEVEL_ERROR,"%s: HDD adapter context is Null", __func__); @@ -1354,12 +1354,12 @@ VOS_STATUS hdd_softap_tx_low_resource_cbk( vos_pkt_t *pVosPacket, } //Return the packet to VOS. We just needed to know that VOS is out of low resource - //situation. Here we will only signal TL that there is a pending data for a STA. + //situation. Here we will only signal TL that there is a pending data for a STA. //VOS packet will be requested (if needed) when TL comes back to fetch data. vos_pkt_return_packet( pVosPacket ); pAdapter->isVosOutOfResource = VOS_FALSE; - + // Indicate to TL that there is pending data if a queue is non empty. // This Code wasnt included in earlier version which resulted in // Traffic stalling @@ -1374,17 +1374,17 @@ VOS_STATUS hdd_softap_tx_low_resource_cbk( vos_pkt_t *pVosPacket, hdd_list_size(&pAdapter->aStaInfo[STAId].wmm_tx_queue[i], &size); if ( size > 0 ) { - status = WLANTL_STAPktPending( (WLAN_HDD_GET_CTX(pAdapter))->pvosContext, - STAId, + status = WLANTL_STAPktPending( (WLAN_HDD_GET_CTX(pAdapter))->pvosContext, + STAId, (WLANTL_ACEnumType)i ); if( !VOS_IS_STATUS_SUCCESS( status ) ) { - VOS_TRACE( VOS_MODULE_ID_HDD_SOFTAP, VOS_TRACE_LEVEL_ERROR,"%s: Failure in indicating pkt to TL for ac=%d", __func__,i); + VOS_TRACE( VOS_MODULE_ID_HDD_SOFTAP, VOS_TRACE_LEVEL_ERROR,"%s: Failure in indicating pkt to TL for ac=%d", __func__,i); } } } } - } + } return VOS_STATUS_SUCCESS; } @@ -1395,15 +1395,15 @@ VOS_STATUS hdd_softap_tx_low_resource_cbk( vos_pkt_t *pVosPacket, TL will call this to notify the HDD when one or more packets were received for a registered STA. - @param vosContext : [in] pointer to VOS context + @param vosContext : [in] pointer to VOS context @param pVosPacketChain : [in] pointer to VOS packet chain @param staId : [in] Station Id (Adress 1 Index) @param pRxMetaInfo : [in] pointer to meta info for the received pkt(s). - @return : VOS_STATUS_E_FAILURE if any errors encountered, + @return : VOS_STATUS_E_FAILURE if any errors encountered, : VOS_STATUS_SUCCESS otherwise ===========================================================================*/ -VOS_STATUS hdd_softap_rx_packet_cbk( v_VOID_t *vosContext, +VOS_STATUS hdd_softap_rx_packet_cbk( v_VOID_t *vosContext, vos_pkt_t *pVosPacketChain, v_U8_t staId, WLANTL_RxMetaInfoType* pRxMetaInfo ) @@ -1413,18 +1413,18 @@ VOS_STATUS hdd_softap_rx_packet_cbk( v_VOID_t *vosContext, int rxstat; struct sk_buff *skb = NULL; vos_pkt_t* pVosPacket; - vos_pkt_t* pNextVosPacket; - hdd_context_t *pHddCtx = NULL; + vos_pkt_t* pNextVosPacket; + hdd_context_t *pHddCtx = NULL; //Sanity check on inputs - if ( ( NULL == vosContext ) || + if ( ( NULL == vosContext ) || ( NULL == pVosPacketChain ) || ( NULL == pRxMetaInfo ) ) { VOS_TRACE( VOS_MODULE_ID_HDD_SOFTAP, VOS_TRACE_LEVEL_ERROR,"%s: Null params being passed", __func__); return VOS_STATUS_E_FAILURE; } - + pHddCtx = (hdd_context_t *)vos_get_context( VOS_MODULE_ID_HDD, vosContext ); if ( NULL == pHddCtx ) { @@ -1486,13 +1486,13 @@ VOS_STATUS hdd_softap_rx_packet_cbk( v_VOID_t *vosContext, VOS_TRACE( VOS_MODULE_ID_HDD_SOFTAP, VOS_TRACE_LEVEL_ERROR,"%s: Failure extracting skb from vos pkt", __func__); return VOS_STATUS_E_FAILURE; } - + //hdd_softap_dump_sk_buff(skb); skb->dev = pAdapter->dev; - + if(skb->dev == NULL) { - + hddLog(VOS_TRACE_LEVEL_FATAL, "ERROR!!Invalid netdevice\n"); return VOS_STATUS_E_FAILURE; } @@ -1524,7 +1524,7 @@ VOS_STATUS hdd_softap_rx_packet_cbk( v_VOID_t *vosContext, } //(WLAN_RX_BCMC_STA_ID == staId) - if ((WLAN_RX_BCMC_STA_ID == pRxMetaInfo->ucDesSTAId) || + if ((WLAN_RX_BCMC_STA_ID == pRxMetaInfo->ucDesSTAId) || (WLAN_RX_SAP_SELF_STA_ID == pRxMetaInfo->ucDesSTAId)) { VOS_TRACE( VOS_MODULE_ID_HDD_SOFTAP, VOS_TRACE_LEVEL_INFO_LOW, @@ -1549,8 +1549,8 @@ VOS_STATUS hdd_softap_rx_packet_cbk( v_VOID_t *vosContext, } else if ((WLAN_HDD_GET_AP_CTX_PTR(pAdapter))->apDisableIntraBssFwd) { - kfree_skb(skb); - } + kfree_skb(skb); + } else { //loopback traffic @@ -1569,10 +1569,10 @@ VOS_STATUS hdd_softap_rx_packet_cbk( v_VOID_t *vosContext, { VOS_TRACE( VOS_MODULE_ID_HDD_SOFTAP, VOS_TRACE_LEVEL_ERROR,"%s: Failure returning vos pkt", __func__); } - + pAdapter->dev->last_rx = jiffies; - return status; + return status; } #else @@ -1719,12 +1719,12 @@ VOS_STATUS hdd_softap_DeregisterSTA( hdd_adapter_t *pAdapter, tANI_U8 staId ) } pHddCtx = (hdd_context_t*)(pAdapter->pHddCtx); - //Clear station in TL and then update HDD data structures. This helps + //Clear station in TL and then update HDD data structures. This helps //to block RX frames from other station to this station. vosStatus = WLANTL_ClearSTAClient( pHddCtx->pvosContext, staId ); if ( !VOS_IS_STATUS_SUCCESS( vosStatus ) ) { - VOS_TRACE( VOS_MODULE_ID_HDD_SOFTAP, VOS_TRACE_LEVEL_ERROR, + VOS_TRACE( VOS_MODULE_ID_HDD_SOFTAP, VOS_TRACE_LEVEL_ERROR, "WLANTL_ClearSTAClient() failed to for staID %d. " "Status= %d [0x%08X]", staId, vosStatus, vosStatus ); @@ -1771,13 +1771,13 @@ VOS_STATUS hdd_softap_RegisterSTA( hdd_adapter_t *pAdapter, v_BOOL_t fWmmEnabled ) { VOS_STATUS vosStatus = VOS_STATUS_E_FAILURE; - WLAN_STADescType staDesc = {0}; + WLAN_STADescType staDesc = {0}; hdd_context_t *pHddCtx = pAdapter->pHddCtx; hdd_adapter_t *pmonAdapter = NULL; //eCsrEncryptionType connectedCipherAlgo; //v_BOOL_t fConnected; - + /* * Clean up old entry if it is not cleaned up properly */ @@ -1789,9 +1789,9 @@ VOS_STATUS hdd_softap_RegisterSTA( hdd_adapter_t *pAdapter, } // Get the Station ID from the one saved during the assocation. - + staDesc.ucSTAId = staId; - + /*Save the pAdapter Pointer for this staId*/ pHddCtx->sta_to_adapter[staId] = pAdapter; @@ -1837,7 +1837,7 @@ VOS_STATUS hdd_softap_RegisterSTA( hdd_adapter_t *pAdapter, staDesc.ucIsReplayCheckValid = VOS_FALSE; - // Register the Station with TL... + // Register the Station with TL... #ifdef IPA_OFFLOAD if (hdd_ipa_is_enabled(pHddCtx)) { vosStatus = WLANTL_RegisterSTAClient( (WLAN_HDD_GET_CTX(pAdapter))->pvosContext, @@ -1851,17 +1851,17 @@ VOS_STATUS hdd_softap_RegisterSTA( hdd_adapter_t *pAdapter, hdd_softap_tx_fetch_packet_cbk, &staDesc, 0 ); } #else - vosStatus = WLANTL_RegisterSTAClient( (WLAN_HDD_GET_CTX(pAdapter))->pvosContext, - hdd_softap_rx_packet_cbk, - hdd_softap_tx_complete_cbk, + vosStatus = WLANTL_RegisterSTAClient( (WLAN_HDD_GET_CTX(pAdapter))->pvosContext, + hdd_softap_rx_packet_cbk, + hdd_softap_tx_complete_cbk, hdd_softap_tx_fetch_packet_cbk, &staDesc, 0 ); #endif if ( !VOS_IS_STATUS_SUCCESS( vosStatus ) ) { - VOS_TRACE( VOS_MODULE_ID_HDD_SOFTAP, VOS_TRACE_LEVEL_ERROR, + VOS_TRACE( VOS_MODULE_ID_HDD_SOFTAP, VOS_TRACE_LEVEL_ERROR, "SOFTAP WLANTL_RegisterSTAClient() failed to register. Status= %d [0x%08X]", vosStatus, vosStatus ); - return vosStatus; + return vosStatus; } //Timer value should be in milliseconds @@ -1873,11 +1873,11 @@ VOS_STATUS hdd_softap_RegisterSTA( hdd_adapter_t *pAdapter, pHddCtx->cfg_ini->trafficMntrTmrForSplitScan); } - // if ( WPA ), tell TL to go to 'connected' and after keys come to the driver, - // then go to 'authenticated'. For all other authentication types (those that do + // if ( WPA ), tell TL to go to 'connected' and after keys come to the driver, + // then go to 'authenticated'. For all other authentication types (those that do // not require upper layer authentication) we can put TL directly into 'authenticated' // state. - + //VOS_ASSERT( fConnected ); pAdapter->aStaInfo[staId].ucSTAId = staId; pAdapter->aStaInfo[staId].isQosEnabled = fWmmEnabled; @@ -1886,30 +1886,30 @@ VOS_STATUS hdd_softap_RegisterSTA( hdd_adapter_t *pAdapter, { VOS_TRACE( VOS_MODULE_ID_HDD_SOFTAP, VOS_TRACE_LEVEL_INFO, "open/shared auth StaId= %d. Changing TL state to AUTHENTICATED at Join time", pAdapter->aStaInfo[staId].ucSTAId ); - + // Connections that do not need Upper layer auth, transition TL directly - // to 'Authenticated' state. - vosStatus = WLANTL_ChangeSTAState( (WLAN_HDD_GET_CTX(pAdapter))->pvosContext, staDesc.ucSTAId, + // to 'Authenticated' state. + vosStatus = WLANTL_ChangeSTAState( (WLAN_HDD_GET_CTX(pAdapter))->pvosContext, staDesc.ucSTAId, WLANTL_STA_AUTHENTICATED ); - + pAdapter->aStaInfo[staId].tlSTAState = WLANTL_STA_AUTHENTICATED; pAdapter->sessionCtx.ap.uIsAuthenticated = VOS_TRUE; - } + } else { VOS_TRACE( VOS_MODULE_ID_HDD_SOFTAP, VOS_TRACE_LEVEL_INFO, "ULA auth StaId= %d. Changing TL state to CONNECTED at Join time", pAdapter->aStaInfo[staId].ucSTAId ); - - vosStatus = WLANTL_ChangeSTAState( (WLAN_HDD_GET_CTX(pAdapter))->pvosContext, staDesc.ucSTAId, + + vosStatus = WLANTL_ChangeSTAState( (WLAN_HDD_GET_CTX(pAdapter))->pvosContext, staDesc.ucSTAId, WLANTL_STA_CONNECTED ); pAdapter->aStaInfo[staId].tlSTAState = WLANTL_STA_CONNECTED; pAdapter->sessionCtx.ap.uIsAuthenticated = VOS_FALSE; - } + } pmonAdapter= hdd_get_mon_adapter( pAdapter->pHddCtx); - if(pmonAdapter) + if(pmonAdapter) { hddLog(VOS_TRACE_LEVEL_INFO_HIGH, "Turn on Monitor the carrier\n"); netif_carrier_on(pmonAdapter->dev); @@ -1928,8 +1928,8 @@ VOS_STATUS hdd_softap_Register_BC_STA( hdd_adapter_t *pAdapter, v_BOOL_t fPrivac VOS_STATUS vosStatus = VOS_STATUS_E_FAILURE; hdd_context_t *pHddCtx = WLAN_HDD_GET_CTX(pAdapter); v_MACADDR_t broadcastMacAddr = VOS_MAC_ADDR_BROADCAST_INITIALIZER; - - + + pHddCtx->sta_to_adapter[WLAN_RX_BCMC_STA_ID] = pAdapter; pHddCtx->sta_to_adapter[WLAN_RX_SAP_SELF_STA_ID] = pAdapter; vosStatus = hdd_softap_RegisterSTA( pAdapter, VOS_FALSE, fPrivacyBit, (WLAN_HDD_GET_AP_CTX_PTR(pAdapter))->uBCStaId, 0, 1, &broadcastMacAddr,0); diff --git a/CORE/HDD/src/wlan_hdd_tx_rx.c b/CORE/HDD/src/wlan_hdd_tx_rx.c index a3a7208bc1f7..ec66d29e7e83 100644 --- a/CORE/HDD/src/wlan_hdd_tx_rx.c +++ b/CORE/HDD/src/wlan_hdd_tx_rx.c @@ -58,9 +58,9 @@ #include <wlan_hdd_ipa.h> #endif -/*--------------------------------------------------------------------------- +/*--------------------------------------------------------------------------- Preprocessor definitions and constants - -------------------------------------------------------------------------*/ + -------------------------------------------------------------------------*/ const v_U8_t hddWmmAcToHighestUp[] = { SME_QOS_WMM_UP_RESV, @@ -79,13 +79,13 @@ const v_U8_t hdd_QdiscAcToTlAC[] = { static struct sk_buff* hdd_mon_tx_fetch_pkt(hdd_adapter_t* pAdapter); -/*--------------------------------------------------------------------------- +/*--------------------------------------------------------------------------- Type declarations - -------------------------------------------------------------------------*/ - -/*--------------------------------------------------------------------------- + -------------------------------------------------------------------------*/ + +/*--------------------------------------------------------------------------- Function definitions and documenation - -------------------------------------------------------------------------*/ + -------------------------------------------------------------------------*/ #ifdef DATA_PATH_UNIT_TEST //Utility function to dump an sk_buff @@ -99,12 +99,12 @@ static void dump_sk_buff(struct sk_buff * skb) VOS_TRACE( VOS_MODULE_ID_HDD, VOS_TRACE_LEVEL_ERROR,"%s: data_len = %d ", __func__, skb->data_len); VOS_TRACE( VOS_MODULE_ID_HDD, VOS_TRACE_LEVEL_ERROR,"%s: mac_len = %d\n", __func__, skb->mac_len); - VOS_TRACE( VOS_MODULE_ID_HDD, VOS_TRACE_LEVEL_ERROR,"0x%x 0x%x 0x%x 0x%x 0x%x 0x%x 0x%x 0x%x ", - skb->data[0], skb->data[1], skb->data[2], skb->data[3], skb->data[4], - skb->data[5], skb->data[6], skb->data[7]); - VOS_TRACE( VOS_MODULE_ID_HDD, VOS_TRACE_LEVEL_ERROR,"0x%x 0x%x 0x%x 0x%x 0x%x 0x%x 0x%x 0x%x \n", + VOS_TRACE( VOS_MODULE_ID_HDD, VOS_TRACE_LEVEL_ERROR,"0x%x 0x%x 0x%x 0x%x 0x%x 0x%x 0x%x 0x%x ", + skb->data[0], skb->data[1], skb->data[2], skb->data[3], skb->data[4], + skb->data[5], skb->data[6], skb->data[7]); + VOS_TRACE( VOS_MODULE_ID_HDD, VOS_TRACE_LEVEL_ERROR,"0x%x 0x%x 0x%x 0x%x 0x%x 0x%x 0x%x 0x%x \n", skb->data[8], skb->data[9], skb->data[10], skb->data[11], skb->data[12], - skb->data[13], skb->data[14], skb->data[15]); + skb->data[13], skb->data[14], skb->data[15]); } //Function for Unit Test only @@ -139,7 +139,7 @@ static void transport_thread(hdd_adapter_t *pAdapter) VOS_TRACE( VOS_MODULE_ID_HDD, VOS_TRACE_LEVEL_ERROR,"%s: Test FAIL hdd_tx_low_resource_cbk", __func__); else VOS_TRACE( VOS_MODULE_ID_HDD, VOS_TRACE_LEVEL_ERROR,"%s: Test PASS hdd_tx_low_resource_cbk", __func__); - + status = hdd_rx_packet_cbk( pAdapter->pvosContext, &dummyPacket, staId, @@ -156,8 +156,8 @@ static void transport_thread(hdd_adapter_t *pAdapter) /**============================================================================ @brief hdd_flush_tx_queues() - Utility function to flush the TX queues - @param pAdapter : [in] pointer to adapter context - @return : VOS_STATUS_E_FAILURE if any errors encountered + @param pAdapter : [in] pointer to adapter context + @return : VOS_STATUS_E_FAILURE if any errors encountered : VOS_STATUS_SUCCESS otherwise ===========================================================================*/ static VOS_STATUS hdd_flush_tx_queues( hdd_adapter_t *pAdapter ) @@ -170,11 +170,11 @@ static VOS_STATUS hdd_flush_tx_queues( hdd_adapter_t *pAdapter ) pAdapter->isVosLowResource = VOS_FALSE; - while (++i != NUM_TX_QUEUES) + while (++i != NUM_TX_QUEUES) { //Free up any packets in the Tx queue spin_lock_bh(&pAdapter->wmm_tx_queue[i].lock); - while (true) + while (true) { status = hdd_list_remove_front( &pAdapter->wmm_tx_queue[i], &anchor ); if(VOS_STATUS_E_EMPTY != status) @@ -182,7 +182,7 @@ static VOS_STATUS hdd_flush_tx_queues( hdd_adapter_t *pAdapter ) pktNode = list_entry(anchor, skb_list_node_t, anchor); skb = pktNode->skb; //TODO - //++pAdapter->stats.tx_dropped; + //++pAdapter->stats.tx_dropped; ++pAdapter->hdd_stats.hddTxRxStats.txFlushed; ++pAdapter->hdd_stats.hddTxRxStats.txFlushedAC[i]; kfree_skb(skb); @@ -283,7 +283,7 @@ static struct sk_buff* hdd_mon_tx_fetch_pkt(hdd_adapter_t* pAdapter) } // do we have any packets pending in this AC? - hdd_list_size( &pAdapter->wmm_tx_queue[ac], &size ); + hdd_list_size( &pAdapter->wmm_tx_queue[ac], &size ); if( size == 0 ) { VOS_TRACE( VOS_MODULE_ID_HDD, VOS_TRACE_LEVEL_ERROR, @@ -317,9 +317,9 @@ static struct sk_buff* hdd_mon_tx_fetch_pkt(hdd_adapter_t* pAdapter) { VOS_TRACE( VOS_MODULE_ID_HDD, VOS_TRACE_LEVEL_WARN, "%s: TX queue[%d] re-enabled", __func__, ac); - pAdapter->isTxSuspended[ac] = VOS_FALSE; + pAdapter->isTxSuspended[ac] = VOS_FALSE; /* Enable Queues which we have disabled earlier */ - netif_tx_start_all_queues( pAdapter->dev ); + netif_tx_start_all_queues( pAdapter->dev ); } return skb; @@ -381,20 +381,20 @@ void hdd_mon_tx_mgmt_pkt(hdd_adapter_t* pAdapter) if( (hdr->frame_control & HDD_FRAME_SUBTYPE_MASK) == HDD_FRAME_SUBTYPE_DEAUTH ) { - hdd_softap_sta_deauth( pAdapter, hdr->addr1 ); + hdd_softap_sta_deauth( pAdapter, hdr->addr1 ); goto mgmt_handled; } - else if( (hdr->frame_control & HDD_FRAME_SUBTYPE_MASK) + else if( (hdr->frame_control & HDD_FRAME_SUBTYPE_MASK) == HDD_FRAME_SUBTYPE_DISASSOC ) { - hdd_softap_sta_disassoc( pAdapter, hdr->addr1 ); + hdd_softap_sta_disassoc( pAdapter, hdr->addr1 ); goto mgmt_handled; } } VOS_TRACE( VOS_MODULE_ID_HDD, VOS_TRACE_LEVEL_INFO, "%s: Sending action frame to SAP to TX, Len %d", __func__, skb->len); - if (VOS_STATUS_SUCCESS != + if (VOS_STATUS_SUCCESS != WLANSAP_SendAction( (WLAN_HDD_GET_CTX(pAdapter))->pvosContext, skb->data, skb->len, 0) ) { @@ -428,7 +428,7 @@ int hdd_mon_hard_start_xmit(struct sk_buff *skb, struct net_device *dev) (struct ieee80211_radiotap_header *)skb->data; /*Supplicant sends the EAPOL packet on monitor interface*/ - pPgBkAdapter = pAdapter->sessionCtx.monitor.pAdapterForTx; + pPgBkAdapter = pAdapter->sessionCtx.monitor.pAdapterForTx; if(pPgBkAdapter == NULL) { VOS_TRACE( VOS_MODULE_ID_HDD, VOS_TRACE_LEVEL_FATAL, @@ -436,23 +436,23 @@ int hdd_mon_hard_start_xmit(struct sk_buff *skb, struct net_device *dev) __func__); goto fail; /* too short to be possibly valid */ } - + /* check if toal skb length is greater then radio tab header length of not */ if (unlikely(skb->len < sizeof(struct ieee80211_radiotap_header))) goto fail; /* too short to be possibly valid */ - + /* check if radio tap header version is correct or not */ if (unlikely(rtap_hdr->it_version)) goto fail; /* only version 0 is supported */ - + /*Strip off the radio tap header*/ rt_hdr_len = ieee80211_get_radiotap_len(skb->data); - + /* check if skb length if greator then total radio tap header length ot not*/ if (unlikely(skb->len < rt_hdr_len)) goto fail; - - /* Update the trans_start for this netdev */ + + /* Update the trans_start for this netdev */ dev->trans_start = jiffies; /* * fix up the pointers accounting for the radiotap @@ -460,46 +460,46 @@ int hdd_mon_hard_start_xmit(struct sk_buff *skb, struct net_device *dev) */ skb_set_mac_header(skb, rt_hdr_len); skb_set_network_header(skb, rt_hdr_len); - skb_set_transport_header(skb, rt_hdr_len); + skb_set_transport_header(skb, rt_hdr_len); /* Pull rtap header out of the skb */ skb_pull(skb, rt_hdr_len); - - /*Supplicant adds: radiotap Hdr + radiotap data + 80211 Header. So after - * radio tap header and 802.11 header starts + + /*Supplicant adds: radiotap Hdr + radiotap data + 80211 Header. So after + * radio tap header and 802.11 header starts */ hdr = (struct ieee80211_hdr *)skb->data; - - /* Send data frames through the normal Data path. In this path we will + + /* Send data frames through the normal Data path. In this path we will * conver rcvd 802.11 packet to 802.3 packet */ if ( (hdr->frame_control & HDD_FRAME_TYPE_MASK) == HDD_FRAME_TYPE_DATA) - { + { v_U8_t da[6]; v_U8_t sa[6]; memcpy (da, hdr->addr1, VOS_MAC_ADDR_SIZE); memcpy (sa, hdr->addr2, VOS_MAC_ADDR_SIZE); - - /* Pull 802.11 MAC header */ + + /* Pull 802.11 MAC header */ skb_pull(skb, HDD_80211_HEADER_LEN); - - if ( HDD_FRAME_SUBTYPE_QOSDATA == + + if ( HDD_FRAME_SUBTYPE_QOSDATA == (hdr->frame_control & HDD_FRAME_SUBTYPE_MASK)) { skb_pull(skb, HDD_80211_HEADER_QOS_CTL); } - /* Pull LLC header */ + /* Pull LLC header */ skb_pull(skb, HDD_LLC_HDR_LEN); - /* Create space for Ethernet header */ + /* Create space for Ethernet header */ skb_push(skb, HDD_MAC_HDR_SIZE*2); memcpy(&skb->data[0], da, HDD_MAC_HDR_SIZE); memcpy(&skb->data[HDD_DEST_ADDR_OFFSET], sa, HDD_MAC_HDR_SIZE); - /* Only EAPOL Data packets are allowed through monitor interface */ + /* Only EAPOL Data packets are allowed through monitor interface */ if (vos_be16_to_cpu( - (*(unsigned short*)&skb->data[HDD_ETHERTYPE_802_1_X_FRAME_OFFSET]) ) + (*(unsigned short*)&skb->data[HDD_ETHERTYPE_802_1_X_FRAME_OFFSET]) ) != HDD_ETHERTYPE_802_1_X) { VOS_TRACE( VOS_MODULE_ID_HDD, VOS_TRACE_LEVEL_FATAL, @@ -510,7 +510,7 @@ int hdd_mon_hard_start_xmit(struct sk_buff *skb, struct net_device *dev) } skb->protocol = htons(HDD_ETHERTYPE_802_1_X); - + hdd_hostapd_select_queue(pPgBkAdapter->dev, skb); return hdd_softap_hard_start_xmit( skb, pPgBkAdapter->dev ); } @@ -529,10 +529,10 @@ int hdd_mon_hard_start_xmit(struct sk_buff *skb, struct net_device *dev) * and re-enable the queues once we get TX feedback for this packet */ netif_tx_stop_all_queues(pAdapter->dev); pAdapter->isTxSuspended[ac] = VOS_TRUE; - spin_unlock(&pAdapter->wmm_tx_queue[ac].lock); - return NETDEV_TX_BUSY; + spin_unlock(&pAdapter->wmm_tx_queue[ac].lock); + return NETDEV_TX_BUSY; } - spin_unlock(&pAdapter->wmm_tx_queue[ac].lock); + spin_unlock(&pAdapter->wmm_tx_queue[ac].lock); //Use the skb->cb field to hold the list node information pktNode = (skb_list_node_t *)&skb->cb; @@ -558,15 +558,15 @@ int hdd_mon_hard_start_xmit(struct sk_buff *skb, struct net_device *dev) if ( pktListSize == 1 ) { - /* In this context we cannot acquire any mutex etc. And to transmit + /* In this context we cannot acquire any mutex etc. And to transmit * this packet we need to call SME API. So to take care of this we will - * schedule a workqueue + * schedule a workqueue */ schedule_work(&pPgBkAdapter->monTxWorkQueue); } return NETDEV_TX_OK; } - + fail: VOS_TRACE( VOS_MODULE_ID_HDD, VOS_TRACE_LEVEL_WARN, "%s: Packet Rcvd at Monitor interface is not proper," @@ -1017,7 +1017,7 @@ void hdd_tx_timeout(struct net_device *dev) VOS_TRACE( VOS_MODULE_ID_HDD, VOS_TRACE_LEVEL_ERROR, "%s: Transmission timeout occurred", __func__); - //Getting here implies we disabled the TX queues for too long. Queues are + //Getting here implies we disabled the TX queues for too long. Queues are //disabled either because of disassociation or low resource scenarios. In //case of disassociation it is ok to ignore this. But if associated, we have //do possible recovery here @@ -1045,21 +1045,21 @@ void hdd_tx_timeout(struct net_device *dev) VOS_TRACE( VOS_MODULE_ID_HDD, VOS_TRACE_LEVEL_INFO, "carrier state: %d", netif_carrier_ok(dev)); -} +} /**============================================================================ - @brief hdd_stats() - Function registered with the Linux OS for + @brief hdd_stats() - Function registered with the Linux OS for device TX/RX statistic @param dev : [in] pointer to Libra network device - + @return : pointer to net_device_stats structure ===========================================================================*/ struct net_device_stats* hdd_stats(struct net_device *dev) { hdd_adapter_t *pAdapter = WLAN_HDD_GET_PRIV_PTR(dev); - + return &pAdapter->stats; } @@ -1068,8 +1068,8 @@ struct net_device_stats* hdd_stats(struct net_device *dev) @brief hdd_init_tx_rx() - Init function to initialize Tx/RX modules in HDD - @param pAdapter : [in] pointer to adapter context - @return : VOS_STATUS_E_FAILURE if any errors encountered + @param pAdapter : [in] pointer to adapter context + @return : VOS_STATUS_E_FAILURE if any errors encountered : VOS_STATUS_SUCCESS otherwise ===========================================================================*/ VOS_STATUS hdd_init_tx_rx( hdd_adapter_t *pAdapter ) @@ -1084,8 +1084,8 @@ VOS_STATUS hdd_init_tx_rx( hdd_adapter_t *pAdapter ) //Will be zeroed out during alloc while (++i != NUM_TX_QUEUES) - { - pAdapter->isTxSuspended[i] = VOS_FALSE; + { + pAdapter->isTxSuspended[i] = VOS_FALSE; hdd_list_init( &pAdapter->wmm_tx_queue[i], HDD_TX_QUEUE_MAX_LEN); } @@ -1097,8 +1097,8 @@ VOS_STATUS hdd_init_tx_rx( hdd_adapter_t *pAdapter ) @brief hdd_deinit_tx_rx() - Deinit function to clean up Tx/RX modules in HDD - @param pAdapter : [in] pointer to adapter context - @return : VOS_STATUS_E_FAILURE if any errors encountered + @param pAdapter : [in] pointer to adapter context + @return : VOS_STATUS_E_FAILURE if any errors encountered : VOS_STATUS_SUCCESS otherwise ===========================================================================*/ VOS_STATUS hdd_deinit_tx_rx( hdd_adapter_t *pAdapter ) @@ -1107,7 +1107,7 @@ VOS_STATUS hdd_deinit_tx_rx( hdd_adapter_t *pAdapter ) v_SINT_t i = -1; status = hdd_flush_tx_queues(pAdapter); - while (++i != NUM_TX_QUEUES) + while (++i != NUM_TX_QUEUES) { //Free up actual list elements in the Tx queue hdd_list_destroy( &pAdapter->wmm_tx_queue[i] ); @@ -1121,8 +1121,8 @@ VOS_STATUS hdd_deinit_tx_rx( hdd_adapter_t *pAdapter ) @brief hdd_disconnect_tx_rx() - Disconnect function to clean up Tx/RX modules in HDD - @param pAdapter : [in] pointer to adapter context - @return : VOS_STATUS_E_FAILURE if any errors encountered + @param pAdapter : [in] pointer to adapter context + @return : VOS_STATUS_E_FAILURE if any errors encountered : VOS_STATUS_SUCCESS otherwise ===========================================================================*/ VOS_STATUS hdd_disconnect_tx_rx( hdd_adapter_t *pAdapter ) @@ -1134,18 +1134,18 @@ VOS_STATUS hdd_disconnect_tx_rx( hdd_adapter_t *pAdapter ) /**============================================================================ @brief hdd_IsEAPOLPacket() - Checks the packet is EAPOL or not. - @param pVosPacket : [in] pointer to vos packet - @return : VOS_TRUE if the packet is EAPOL + @param pVosPacket : [in] pointer to vos packet + @return : VOS_TRUE if the packet is EAPOL : VOS_FALSE otherwise ===========================================================================*/ v_BOOL_t hdd_IsEAPOLPacket( vos_pkt_t *pVosPacket ) { VOS_STATUS vosStatus = VOS_STATUS_SUCCESS; - v_BOOL_t fEAPOL = VOS_FALSE; + v_BOOL_t fEAPOL = VOS_FALSE; void *pBuffer = NULL; - + vosStatus = vos_pkt_peek_data( pVosPacket, (v_SIZE_t)HDD_ETHERTYPE_802_1_X_FRAME_OFFSET, &pBuffer, HDD_ETHERTYPE_802_1_X_SIZE ); if (VOS_IS_STATUS_SUCCESS( vosStatus ) ) @@ -1154,8 +1154,8 @@ v_BOOL_t hdd_IsEAPOLPacket( vos_pkt_t *pVosPacket ) { fEAPOL = VOS_TRUE; } - } - + } + return fEAPOL; } @@ -1196,26 +1196,26 @@ v_BOOL_t hdd_IsWAIPacket( vos_pkt_t *pVosPacket ) to indicate that a packet has been transmitted across the SDIO bus succesfully. OS packet resources can be released after this cbk. - @param vosContext : [in] pointer to VOS context - @param pVosPacket : [in] pointer to VOS packet (containing skb) - @param vosStatusIn : [in] status of the transmission + @param vosContext : [in] pointer to VOS context + @param pVosPacket : [in] pointer to VOS packet (containing skb) + @param vosStatusIn : [in] status of the transmission - @return : VOS_STATUS_E_FAILURE if any errors encountered + @return : VOS_STATUS_E_FAILURE if any errors encountered : VOS_STATUS_SUCCESS otherwise ===========================================================================*/ -VOS_STATUS hdd_tx_complete_cbk( v_VOID_t *vosContext, - vos_pkt_t *pVosPacket, +VOS_STATUS hdd_tx_complete_cbk( v_VOID_t *vosContext, + vos_pkt_t *pVosPacket, VOS_STATUS vosStatusIn ) { VOS_STATUS status = VOS_STATUS_SUCCESS; - hdd_adapter_t *pAdapter = NULL; + hdd_adapter_t *pAdapter = NULL; hdd_context_t *pHddCtx = NULL; void* pOsPkt = NULL; - + if( ( NULL == vosContext ) || ( NULL == pVosPacket ) ) { VOS_TRACE( VOS_MODULE_ID_HDD, VOS_TRACE_LEVEL_ERROR,"%s: Null params being passed", __func__); - return VOS_STATUS_E_FAILURE; + return VOS_STATUS_E_FAILURE; } //Return the skb to the OS @@ -1227,7 +1227,7 @@ VOS_STATUS hdd_tx_complete_cbk( v_VOID_t *vosContext, vos_pkt_return_packet( pVosPacket ); return VOS_STATUS_E_FAILURE; } - + //Get the HDD context. pHddCtx = (hdd_context_t *)vos_get_context( VOS_MODULE_ID_HDD, vosContext ); //Get the Adapter context. @@ -1241,7 +1241,7 @@ VOS_STATUS hdd_tx_complete_cbk( v_VOID_t *vosContext, ++pAdapter->hdd_stats.hddTxRxStats.txCompleted; } - kfree_skb((struct sk_buff *)pOsPkt); + kfree_skb((struct sk_buff *)pOsPkt); //Return the VOS packet resources. status = vos_pkt_return_packet( pVosPacket ); @@ -1255,17 +1255,17 @@ VOS_STATUS hdd_tx_complete_cbk( v_VOID_t *vosContext, /**============================================================================ - @brief hdd_tx_fetch_packet_cbk() - Callback function invoked by TL to + @brief hdd_tx_fetch_packet_cbk() - Callback function invoked by TL to fetch a packet for transmission. - @param vosContext : [in] pointer to VOS context + @param vosContext : [in] pointer to VOS context @param staId : [in] Station for which TL is requesting a pkt @param ac : [in] access category requested by TL @param pVosPacket : [out] pointer to VOS packet packet pointer - @param pPktMetaInfo : [out] pointer to meta info for the pkt - + @param pPktMetaInfo : [out] pointer to meta info for the pkt + @return : VOS_STATUS_E_EMPTY if no packets to transmit - : VOS_STATUS_E_FAILURE if any errors encountered + : VOS_STATUS_E_FAILURE if any errors encountered : VOS_STATUS_SUCCESS otherwise ===========================================================================*/ VOS_STATUS hdd_tx_fetch_packet_cbk( v_VOID_t *vosContext, @@ -1288,8 +1288,8 @@ VOS_STATUS hdd_tx_fetch_packet_cbk( v_VOID_t *vosContext, tANI_U8 acAdmitted, i; //Sanity check on inputs - if ( ( NULL == vosContext ) || - ( NULL == pStaId ) || + if ( ( NULL == vosContext ) || + ( NULL == pStaId ) || ( NULL == ppVosPacket ) || ( NULL == pPktMetaInfo ) ) { @@ -1304,7 +1304,7 @@ VOS_STATUS hdd_tx_fetch_packet_cbk( v_VOID_t *vosContext, VOS_TRACE( VOS_MODULE_ID_HDD, VOS_TRACE_LEVEL_ERROR,"%s: HDD adapter context is Null", __func__); return VOS_STATUS_E_FAILURE; } - + pAdapter = pHddCtx->sta_to_adapter[*pStaId]; if ((NULL == pAdapter) || (WLAN_HDD_ADAPTER_MAGIC != pAdapter->magic)) { @@ -1333,7 +1333,7 @@ VOS_STATUS hdd_tx_fetch_packet_cbk( v_VOID_t *vosContext, // or we determine we have no more packets to send // HDD is not allowed to change AC. - // has this AC been admitted? or + // has this AC been admitted? or // To allow EAPOL packets when not authenticated if (unlikely((0==pAdapter->hddWmmStatus.wmmAcStatus[ac].wmmAcAccessAllowed) && (WLAN_HDD_GET_STATION_CTX_PTR(pAdapter))->conn_info.uIsAuthenticated)) @@ -1345,9 +1345,9 @@ VOS_STATUS hdd_tx_fetch_packet_cbk( v_VOID_t *vosContext, #endif // HDD_WMM_DEBUG return VOS_STATUS_E_FAILURE; } - + // do we have any packets pending in this AC? - hdd_list_size( &pAdapter->wmm_tx_queue[ac], &size ); + hdd_list_size( &pAdapter->wmm_tx_queue[ac], &size ); if( size > 0 ) { // yes, so process it @@ -1366,12 +1366,12 @@ VOS_STATUS hdd_tx_fetch_packet_cbk( v_VOID_t *vosContext, return VOS_STATUS_E_FAILURE; } - //Get the vos packet. I don't want to dequeue and enqueue again if we are out of VOS resources + //Get the vos packet. I don't want to dequeue and enqueue again if we are out of VOS resources //This simplifies the locking and unlocking of Tx queue - status = vos_pkt_wrap_data_packet( &pVosPacket, - VOS_PKT_TYPE_TX_802_3_DATA, + status = vos_pkt_wrap_data_packet( &pVosPacket, + VOS_PKT_TYPE_TX_802_3_DATA, NULL, //OS Pkt is not being passed - hdd_tx_low_resource_cbk, + hdd_tx_low_resource_cbk, pAdapter ); if (status == VOS_STATUS_E_ALREADY || status == VOS_STATUS_E_RESOURCES) @@ -1458,10 +1458,10 @@ VOS_STATUS hdd_tx_fetch_packet_cbk( v_VOID_t *vosContext, //FIXME This timestamp is really the time stamp of wrap_data_packet vos_pkt_get_timestamp( pVosPacket, ×tamp ); pPktMetaInfo->usTimeStamp = (v_U16_t)timestamp; - + if(pAdapter->sessionCtx.station.conn_info.uIsAuthenticated == VOS_TRUE) - pPktMetaInfo->ucIsEapol = 0; - else + pPktMetaInfo->ucIsEapol = 0; + else pPktMetaInfo->ucIsEapol = hdd_IsEAPOLPacket( pVosPacket ) ? 1 : 0; #ifdef FEATURE_WLAN_WAPI @@ -1478,8 +1478,8 @@ VOS_STATUS hdd_tx_fetch_packet_cbk( v_VOID_t *vosContext, } else { - /* 1. Check if ACM is set for this AC - * 2. If set, check if this AC had already admitted + /* 1. Check if ACM is set for this AC + * 2. If set, check if this AC had already admitted * 3. If not already admitted, downgrade the UP to next best UP */ if(!pAdapter->hddWmmStatus.wmmAcStatus[ac].wmmAcAccessRequired || pAdapter->hddWmmStatus.wmmAcStatus[ac].wmmAcTspecValid) @@ -1522,7 +1522,7 @@ VOS_STATUS hdd_tx_fetch_packet_cbk( v_VOID_t *vosContext, pPktMetaInfo->ucBcast = vos_is_macaddr_broadcast( pDestMacAddress ) ? 1 : 0; pPktMetaInfo->ucMcast = vos_is_macaddr_group( pDestMacAddress ) ? 1 : 0; - + // if we are in a backpressure situation see if we can turn the hose back on if ( (pAdapter->isTxSuspended[ac]) && @@ -1532,8 +1532,8 @@ VOS_STATUS hdd_tx_fetch_packet_cbk( v_VOID_t *vosContext, ++pAdapter->hdd_stats.hddTxRxStats.txFetchDePressuredAC[ac]; VOS_TRACE( VOS_MODULE_ID_HDD, VOS_TRACE_LEVEL_INFO, "%s: TX queue[%d] re-enabled", __func__, ac); - pAdapter->isTxSuspended[ac] = VOS_FALSE; - netif_tx_wake_queue(netdev_get_tx_queue(pAdapter->dev, + pAdapter->isTxSuspended[ac] = VOS_FALSE; + netif_tx_wake_queue(netdev_get_tx_queue(pAdapter->dev, skb_get_queue_mapping(skb) )); } @@ -1610,25 +1610,25 @@ VOS_STATUS hdd_tx_fetch_packet_cbk( v_VOID_t *vosContext, /**============================================================================ - @brief hdd_tx_low_resource_cbk() - Callback function invoked in the - case where VOS packets are not available at the time of the call to get - packets. This callback function is invoked by VOS when packets are + @brief hdd_tx_low_resource_cbk() - Callback function invoked in the + case where VOS packets are not available at the time of the call to get + packets. This callback function is invoked by VOS when packets are available. - @param pVosPacket : [in] pointer to VOS packet - @param userData : [in] opaque user data that was passed initially - - @return : VOS_STATUS_E_FAILURE if any errors encountered, + @param pVosPacket : [in] pointer to VOS packet + @param userData : [in] opaque user data that was passed initially + + @return : VOS_STATUS_E_FAILURE if any errors encountered, : VOS_STATUS_SUCCESS otherwise =============================================================================*/ -VOS_STATUS hdd_tx_low_resource_cbk( vos_pkt_t *pVosPacket, +VOS_STATUS hdd_tx_low_resource_cbk( vos_pkt_t *pVosPacket, v_VOID_t *userData ) { VOS_STATUS status; v_SINT_t i = 0; v_SIZE_t size = 0; hdd_adapter_t* pAdapter = (hdd_adapter_t *)userData; - + if(pAdapter == NULL) { VOS_TRACE( VOS_MODULE_ID_HDD, VOS_TRACE_LEVEL_ERROR,"%s: HDD adapter context is Null", __func__); @@ -1636,7 +1636,7 @@ VOS_STATUS hdd_tx_low_resource_cbk( vos_pkt_t *pVosPacket, } //Return the packet to VOS. We just needed to know that VOS is out of low resource - //situation. Here we will only signal TL that there is a pending data for a STA. + //situation. Here we will only signal TL that there is a pending data for a STA. //VOS packet will be requested (if needed) when TL comes back to fetch data. vos_pkt_return_packet( pVosPacket ); @@ -1649,12 +1649,12 @@ VOS_STATUS hdd_tx_low_resource_cbk( vos_pkt_t *pVosPacket, hdd_list_size( &pAdapter->wmm_tx_queue[i], &size ); if ( size > 0 ) { - status = WLANTL_STAPktPending( (WLAN_HDD_GET_CTX(pAdapter))->pvosContext, - (WLAN_HDD_GET_STATION_CTX_PTR(pAdapter))->conn_info.staId [0], + status = WLANTL_STAPktPending( (WLAN_HDD_GET_CTX(pAdapter))->pvosContext, + (WLAN_HDD_GET_STATION_CTX_PTR(pAdapter))->conn_info.staId [0], (WLANTL_ACEnumType)i ); if( !VOS_IS_STATUS_SUCCESS( status ) ) { - VOS_TRACE( VOS_MODULE_ID_HDD, VOS_TRACE_LEVEL_ERROR,"%s: Failure in indicating pkt to TL for ac=%d", __func__,i); + VOS_TRACE( VOS_MODULE_ID_HDD, VOS_TRACE_LEVEL_ERROR,"%s: Failure in indicating pkt to TL for ac=%d", __func__,i); } } } @@ -1669,15 +1669,15 @@ VOS_STATUS hdd_tx_low_resource_cbk( vos_pkt_t *pVosPacket, TL will call this to notify the HDD when one or more packets were received for a registered STA. - @param vosContext : [in] pointer to VOS context + @param vosContext : [in] pointer to VOS context @param pVosPacketChain : [in] pointer to VOS packet chain @param staId : [in] Station Id - @param pRxMetaInfo : [in] pointer to meta info for the received pkt(s) + @param pRxMetaInfo : [in] pointer to meta info for the received pkt(s) - @return : VOS_STATUS_E_FAILURE if any errors encountered, + @return : VOS_STATUS_E_FAILURE if any errors encountered, : VOS_STATUS_SUCCESS otherwise ===========================================================================*/ -VOS_STATUS hdd_rx_packet_cbk( v_VOID_t *vosContext, +VOS_STATUS hdd_rx_packet_cbk( v_VOID_t *vosContext, vos_pkt_t *pVosPacketChain, v_U8_t staId, WLANTL_RxMetaInfoType* pRxMetaInfo ) @@ -1691,7 +1691,7 @@ VOS_STATUS hdd_rx_packet_cbk( v_VOID_t *vosContext, vos_pkt_t* pNextVosPacket; //Sanity check on inputs - if ( ( NULL == vosContext ) || + if ( ( NULL == vosContext ) || ( NULL == pVosPacketChain ) || ( NULL == pRxMetaInfo ) ) { @@ -1813,10 +1813,10 @@ VOS_STATUS hdd_rx_packet_cbk( v_VOID_t *vosContext, { VOS_TRACE( VOS_MODULE_ID_HDD, VOS_TRACE_LEVEL_ERROR,"%s: Failure returning vos pkt", __func__); } - + pAdapter->dev->last_rx = jiffies; - return status; + return status; } /**============================================================================ @brief hdd_tx_rx_pkt_cnt_stat_timer_handler() - diff --git a/CORE/HDD/src/wlan_hdd_wext.c b/CORE/HDD/src/wlan_hdd_wext.c index ef9a1b66efba..a99d27643cab 100644 --- a/CORE/HDD/src/wlan_hdd_wext.c +++ b/CORE/HDD/src/wlan_hdd_wext.c @@ -532,7 +532,7 @@ int hdd_validate_mcc_config(hdd_adapter_t *pAdapter, v_UINT_t staId, v_UINT_t arg1, v_UINT_t arg2, v_UINT_t arg3); #ifdef WLAN_FEATURE_PACKET_FILTERING -int wlan_hdd_set_filter(hdd_context_t *pHddCtx, tpPacketFilterCfg pRequest, +int wlan_hdd_set_filter(hdd_context_t *pHddCtx, tpPacketFilterCfg pRequest, v_U8_t sessionId); #endif @@ -6819,7 +6819,7 @@ static int iw_get_char_setnone(struct net_device *dev, struct iw_request_info *i memset(&channel_list, 0, sizeof(channel_list)); status = iw_softap_get_channel_list(dev, info, wrqu, (char *)&channel_list); - if ( !VOS_IS_STATUS_SUCCESS( status ) ) + if ( !VOS_IS_STATUS_SUCCESS( status ) ) { hddLog(VOS_TRACE_LEVEL_ERROR, "%s GetChannelList Failed!!!\n",__func__); return -EINVAL; @@ -8029,7 +8029,7 @@ static int iw_set_dynamic_mcbc_filter(struct net_device *dev, return 0; } -static int iw_clear_dynamic_mcbc_filter(struct net_device *dev, +static int iw_clear_dynamic_mcbc_filter(struct net_device *dev, struct iw_request_info *info, union iwreq_data *wrqu, char *extra) { @@ -8205,7 +8205,7 @@ static int iw_set_keepalive_params(struct net_device *dev, struct iw_request_inf hddLog(VOS_TRACE_LEVEL_ERROR, "set Keep: TP before SME %d\n", keepaliveRequest.timePeriod); - if (eHAL_STATUS_SUCCESS != sme_SetKeepAlive(WLAN_HDD_GET_HAL_CTX(pAdapter), + if (eHAL_STATUS_SUCCESS != sme_SetKeepAlive(WLAN_HDD_GET_HAL_CTX(pAdapter), pAdapter->sessionId, &keepaliveRequest)) { hddLog(VOS_TRACE_LEVEL_ERROR, "%s: Failure to execute Keep Alive\n", @@ -8217,7 +8217,7 @@ static int iw_set_keepalive_params(struct net_device *dev, struct iw_request_inf } #ifdef WLAN_FEATURE_PACKET_FILTERING -int wlan_hdd_set_filter(hdd_context_t *pHddCtx, tpPacketFilterCfg pRequest, +int wlan_hdd_set_filter(hdd_context_t *pHddCtx, tpPacketFilterCfg pRequest, tANI_U8 sessionId) { tSirRcvPktFilterCfgType packetFilterSetReq = {0}; @@ -8734,9 +8734,9 @@ static int iw_get_statistics(struct net_device *dev, (char*) &(pStats->rx_error_cnt), tlen); - FILL_TLV(p, (tANI_U8)WLAN_STATS_TX_BYTE_CNT, + FILL_TLV(p, (tANI_U8)WLAN_STATS_TX_BYTE_CNT, (tANI_U8) sizeof (dStats->tx_uc_byte_cnt[0]), - (char*) &(dStats->tx_uc_byte_cnt[0]), + (char*) &(dStats->tx_uc_byte_cnt[0]), tlen); FILL_TLV(p, (tANI_U8)WLAN_STATS_RX_BYTE_CNT, @@ -8755,29 +8755,29 @@ static int iw_get_statistics(struct net_device *dev, (char*) &(aStats->tx_rate), tlen); - FILL_TLV(p, (tANI_U8)WLAN_STATS_RX_UC_BYTE_CNT, - (tANI_U8) sizeof (dStats->rx_uc_byte_cnt[0]), - (char*) &(dStats->rx_uc_byte_cnt[0]), + FILL_TLV(p, (tANI_U8)WLAN_STATS_RX_UC_BYTE_CNT, + (tANI_U8) sizeof (dStats->rx_uc_byte_cnt[0]), + (char*) &(dStats->rx_uc_byte_cnt[0]), tlen); - FILL_TLV(p, (tANI_U8)WLAN_STATS_RX_MC_BYTE_CNT, - (tANI_U8) sizeof (dStats->rx_mc_byte_cnt), - (char*) &(dStats->rx_mc_byte_cnt), + FILL_TLV(p, (tANI_U8)WLAN_STATS_RX_MC_BYTE_CNT, + (tANI_U8) sizeof (dStats->rx_mc_byte_cnt), + (char*) &(dStats->rx_mc_byte_cnt), tlen); - FILL_TLV(p, (tANI_U8)WLAN_STATS_RX_BC_BYTE_CNT, - (tANI_U8) sizeof (dStats->rx_bc_byte_cnt), - (char*) &(dStats->rx_bc_byte_cnt), + FILL_TLV(p, (tANI_U8)WLAN_STATS_RX_BC_BYTE_CNT, + (tANI_U8) sizeof (dStats->rx_bc_byte_cnt), + (char*) &(dStats->rx_bc_byte_cnt), tlen); - FILL_TLV(p, (tANI_U8)WLAN_STATS_TX_UC_BYTE_CNT, - (tANI_U8) sizeof (dStats->tx_uc_byte_cnt[0]), - (char*) &(dStats->tx_uc_byte_cnt[0]), + FILL_TLV(p, (tANI_U8)WLAN_STATS_TX_UC_BYTE_CNT, + (tANI_U8) sizeof (dStats->tx_uc_byte_cnt[0]), + (char*) &(dStats->tx_uc_byte_cnt[0]), tlen); - FILL_TLV(p, (tANI_U8)WLAN_STATS_TX_MC_BYTE_CNT, - (tANI_U8) sizeof (dStats->tx_mc_byte_cnt), - (char*) &(dStats->tx_mc_byte_cnt), + FILL_TLV(p, (tANI_U8)WLAN_STATS_TX_MC_BYTE_CNT, + (tANI_U8) sizeof (dStats->tx_mc_byte_cnt), + (char*) &(dStats->tx_mc_byte_cnt), tlen); - FILL_TLV(p, (tANI_U8)WLAN_STATS_TX_BC_BYTE_CNT, - (tANI_U8) sizeof (dStats->tx_bc_byte_cnt), - (char*) &(dStats->tx_bc_byte_cnt), + FILL_TLV(p, (tANI_U8)WLAN_STATS_TX_BC_BYTE_CNT, + (tANI_U8) sizeof (dStats->tx_bc_byte_cnt), + (char*) &(dStats->tx_bc_byte_cnt), tlen); wrqu->data.length = tlen; @@ -9453,12 +9453,12 @@ VOS_STATUS iw_set_power_params(struct net_device *dev, struct iw_request_info *i } uTotalSize -= nOffset; - VOS_TRACE(VOS_MODULE_ID_HDD, VOS_TRACE_LEVEL_INFO, - "Power request parameter %d Total size", + VOS_TRACE(VOS_MODULE_ID_HDD, VOS_TRACE_LEVEL_INFO, + "Power request parameter %d Total size", uTotalSize); ptr += nOffset; /* This is added for dynamic Tele LI enable (0xF1) /disable (0xF0)*/ - if(!(uTotalSize - nOffset) && + if(!(uTotalSize - nOffset) && (powerRequest.uListenInterval != SIR_NOCHANGE_POWER_VALUE)) { uTotalSize = 0; @@ -9712,7 +9712,7 @@ static const struct iw_priv_args we_private_args[] = { { WE_SET_TM_LEVEL, IW_PRIV_TYPE_INT | IW_PRIV_SIZE_FIXED | 1, - 0, + 0, "setTmLevel" }, #ifdef QCA_WIFI_2_0 @@ -10995,5 +10995,3 @@ int hdd_UnregisterWext(struct net_device *dev) dev->wireless_handlers = NULL; return 0; } - - diff --git a/CORE/HDD/src/wlan_hdd_wowl.c b/CORE/HDD/src/wlan_hdd_wowl.c index aecb27554c9f..3a7e92a4fe56 100644 --- a/CORE/HDD/src/wlan_hdd_wowl.c +++ b/CORE/HDD/src/wlan_hdd_wowl.c @@ -94,13 +94,13 @@ static void dump_hdd_wowl_ptrn(tSirWowlAddBcastPtrn *ptrn) { int i; - VOS_TRACE(VOS_MODULE_ID_HDD, VOS_TRACE_LEVEL_INFO, "%s: ucPatetrnId = 0x%x", __func__, + VOS_TRACE(VOS_MODULE_ID_HDD, VOS_TRACE_LEVEL_INFO, "%s: ucPatetrnId = 0x%x", __func__, ptrn->ucPatternId); - VOS_TRACE(VOS_MODULE_ID_HDD, VOS_TRACE_LEVEL_INFO, "%s: ucPatternByteOffset = 0x%x", __func__, + VOS_TRACE(VOS_MODULE_ID_HDD, VOS_TRACE_LEVEL_INFO, "%s: ucPatternByteOffset = 0x%x", __func__, ptrn->ucPatternByteOffset); - VOS_TRACE(VOS_MODULE_ID_HDD, VOS_TRACE_LEVEL_INFO, "%s: ucPatternSize = 0x%x", __func__, + VOS_TRACE(VOS_MODULE_ID_HDD, VOS_TRACE_LEVEL_INFO, "%s: ucPatternSize = 0x%x", __func__, ptrn->ucPatternSize); - VOS_TRACE(VOS_MODULE_ID_HDD, VOS_TRACE_LEVEL_INFO, "%s: ucPatternMaskSize = 0x%x", __func__, + VOS_TRACE(VOS_MODULE_ID_HDD, VOS_TRACE_LEVEL_INFO, "%s: ucPatternMaskSize = 0x%x", __func__, ptrn->ucPatternMaskSize); VOS_TRACE(VOS_MODULE_ID_HDD, VOS_TRACE_LEVEL_INFO, "%s: Pattern: ", __func__); for(i = 0; i < ptrn->ucPatternSize; i++) @@ -120,7 +120,7 @@ static void dump_hdd_wowl_ptrn(tSirWowlAddBcastPtrn *ptrn) @return : FALSE if any errors encountered : TRUE otherwise ===========================================================================*/ -v_BOOL_t hdd_add_wowl_ptrn (hdd_adapter_t *pAdapter, const char * ptrn) +v_BOOL_t hdd_add_wowl_ptrn (hdd_adapter_t *pAdapter, const char * ptrn) { tSirWowlAddBcastPtrn localPattern; int i, first_empty_slot, len, offset; @@ -134,7 +134,7 @@ v_BOOL_t hdd_add_wowl_ptrn (hdd_adapter_t *pAdapter, const char * ptrn) /* There has to have atleast 1 byte for each field (pattern size, mask size, * pattern, mask) e.g. PP:QQ:RR:SS ==> 11 chars */ - while ( len >= 11 ) + while ( len >= 11 ) { // Detect duplicate pattern for (i=0; i<pHddCtx->cfg_ini->maxWoWFilters; i++) @@ -165,45 +165,45 @@ v_BOOL_t hdd_add_wowl_ptrn (hdd_adapter_t *pAdapter, const char * ptrn) // Maximum number of patterns have been configured already if(first_empty_slot == -1) { - VOS_TRACE( VOS_MODULE_ID_HDD, VOS_TRACE_LEVEL_ERROR, + VOS_TRACE( VOS_MODULE_ID_HDD, VOS_TRACE_LEVEL_ERROR, "%s: Cannot add anymore patterns. No free slot!", __func__); return VOS_FALSE; } //Validate the pattern - if(ptrn[2] != WOWL_INTRA_PTRN_TOKENIZER || + if(ptrn[2] != WOWL_INTRA_PTRN_TOKENIZER || ptrn[5] != WOWL_INTRA_PTRN_TOKENIZER) { - VOS_TRACE( VOS_MODULE_ID_HDD, VOS_TRACE_LEVEL_ERROR, + VOS_TRACE( VOS_MODULE_ID_HDD, VOS_TRACE_LEVEL_ERROR, "%s: Malformed pattern string. Skip!\n", __func__); - ptrn += len; + ptrn += len; goto next_ptrn; } // Extract the pattern size - localPattern.ucPatternSize = + localPattern.ucPatternSize = ( hdd_parse_hex( ptrn[0] ) * 0x10 ) + hdd_parse_hex( ptrn[1] ); // Extract the pattern mask size - localPattern.ucPatternMaskSize = + localPattern.ucPatternMaskSize = ( hdd_parse_hex( ptrn[3] ) * 0x10 ) + hdd_parse_hex( ptrn[4] ); if(localPattern.ucPatternSize > SIR_WOWL_BCAST_PATTERN_MAX_SIZE || localPattern.ucPatternMaskSize > WOWL_PTRN_MASK_MAX_SIZE) { - VOS_TRACE( VOS_MODULE_ID_HDD, VOS_TRACE_LEVEL_ERROR, + VOS_TRACE( VOS_MODULE_ID_HDD, VOS_TRACE_LEVEL_ERROR, "%s: Invalid length specified. Skip!\n", __func__); - ptrn += len; + ptrn += len; goto next_ptrn; } //compute the offset of tokenizer after the pattern offset = 5 + 2*localPattern.ucPatternSize + 1; - if(offset >= len || ptrn[offset] != WOWL_INTRA_PTRN_TOKENIZER) + if(offset >= len || ptrn[offset] != WOWL_INTRA_PTRN_TOKENIZER) { - VOS_TRACE( VOS_MODULE_ID_HDD, VOS_TRACE_LEVEL_ERROR, + VOS_TRACE( VOS_MODULE_ID_HDD, VOS_TRACE_LEVEL_ERROR, "%s: Malformed pattern string..skip!\n", __func__); - ptrn += len; + ptrn += len; goto next_ptrn; } @@ -211,21 +211,21 @@ v_BOOL_t hdd_add_wowl_ptrn (hdd_adapter_t *pAdapter, const char * ptrn) offset = offset + 2*localPattern.ucPatternMaskSize; if(offset+1 != len) //offset begins with 0 { - VOS_TRACE( VOS_MODULE_ID_HDD, VOS_TRACE_LEVEL_ERROR, + VOS_TRACE( VOS_MODULE_ID_HDD, VOS_TRACE_LEVEL_ERROR, "%s: Malformed pattern string...skip!\n", __func__); - ptrn += len; + ptrn += len; goto next_ptrn; } temp = ptrn; - // Now advance to where pattern begins - ptrn += 6; + // Now advance to where pattern begins + ptrn += 6; // Extract the pattern for(i=0; i < localPattern.ucPatternSize; i++) { - localPattern.ucPattern[i] = + localPattern.ucPattern[i] = (hdd_parse_hex( ptrn[0] ) * 0x10 ) + hdd_parse_hex( ptrn[1] ); ptrn += 2; //skip to next byte } @@ -235,16 +235,16 @@ v_BOOL_t hdd_add_wowl_ptrn (hdd_adapter_t *pAdapter, const char * ptrn) // Extract the pattern Mask for(i=0; i < localPattern.ucPatternMaskSize; i++) { - localPattern.ucPatternMask[i] = + localPattern.ucPatternMask[i] = (hdd_parse_hex( ptrn[0] ) * 0x10 ) + hdd_parse_hex( ptrn[1] ); ptrn += 2; //skip to next byte } //All is good. Store the pattern locally - g_hdd_wowl_ptrns[first_empty_slot] = (char*) kmalloc(len+1, GFP_KERNEL); - if(g_hdd_wowl_ptrns[first_empty_slot] == NULL) + g_hdd_wowl_ptrns[first_empty_slot] = (char*) kmalloc(len+1, GFP_KERNEL); + if(g_hdd_wowl_ptrns[first_empty_slot] == NULL) { - VOS_TRACE( VOS_MODULE_ID_HDD, VOS_TRACE_LEVEL_ERROR, + VOS_TRACE( VOS_MODULE_ID_HDD, VOS_TRACE_LEVEL_ERROR, "%s: kmalloc failure", __func__); return VOS_FALSE; } @@ -260,14 +260,14 @@ v_BOOL_t hdd_add_wowl_ptrn (hdd_adapter_t *pAdapter, const char * ptrn) if ( !HAL_STATUS_SUCCESS( halStatus ) ) { // Add failed, so invalidate the local storage - VOS_TRACE( VOS_MODULE_ID_HDD, VOS_TRACE_LEVEL_ERROR, + VOS_TRACE( VOS_MODULE_ID_HDD, VOS_TRACE_LEVEL_ERROR, "sme_WowlAddBcastPattern failed with error code (%d)", halStatus ); kfree(g_hdd_wowl_ptrns[first_empty_slot]); g_hdd_wowl_ptrns[first_empty_slot] = NULL; } dump_hdd_wowl_ptrn(&localPattern); - + next_ptrn: if (*ptrn == WOWL_INTER_PTRN_TOKENIZER) { @@ -275,7 +275,7 @@ v_BOOL_t hdd_add_wowl_ptrn (hdd_adapter_t *pAdapter, const char * ptrn) len = find_ptrn_len(ptrn); continue; } - else + else break; } @@ -290,7 +290,7 @@ v_BOOL_t hdd_add_wowl_ptrn (hdd_adapter_t *pAdapter, const char * ptrn) @return : FALSE if any errors encountered : TRUE otherwise ===========================================================================*/ -v_BOOL_t hdd_del_wowl_ptrn (hdd_adapter_t *pAdapter, const char * ptrn) +v_BOOL_t hdd_del_wowl_ptrn (hdd_adapter_t *pAdapter, const char * ptrn) { tSirWowlDelBcastPtrn delPattern; unsigned char id; @@ -318,7 +318,7 @@ v_BOOL_t hdd_del_wowl_ptrn (hdd_adapter_t *pAdapter, const char * ptrn) if ( HAL_STATUS_SUCCESS( halStatus ) ) { // Remove from local storage as well - VOS_TRACE( VOS_MODULE_ID_HDD, VOS_TRACE_LEVEL_ERROR, + VOS_TRACE( VOS_MODULE_ID_HDD, VOS_TRACE_LEVEL_ERROR, "Deleted pattern with id %d [%s]", id, g_hdd_wowl_ptrns[id]); kfree(g_hdd_wowl_ptrns[id]); @@ -519,7 +519,7 @@ v_BOOL_t hdd_del_wowl_ptrn_debugfs(hdd_adapter_t *pAdapter, v_U8_t pattern_idx) @return : FALSE if any errors encountered : TRUE otherwise ===========================================================================*/ -v_BOOL_t hdd_enter_wowl (hdd_adapter_t *pAdapter, v_BOOL_t enable_mp, v_BOOL_t enable_pbm) +v_BOOL_t hdd_enter_wowl (hdd_adapter_t *pAdapter, v_BOOL_t enable_mp, v_BOOL_t enable_pbm) { tSirSmeWowlEnterParams wowParams; eHalStatus halStatus; @@ -535,7 +535,7 @@ v_BOOL_t hdd_enter_wowl (hdd_adapter_t *pAdapter, v_BOOL_t enable_mp, v_BOOL_t e } // Request to put Libra into WoWL - halStatus = sme_EnterWowl( hHal, hdd_wowl_callback, + halStatus = sme_EnterWowl( hHal, hdd_wowl_callback, pAdapter, #ifdef WLAN_WAKEUP_EVENTS hdd_wowl_wakeIndication_callback, @@ -548,7 +548,7 @@ v_BOOL_t hdd_enter_wowl (hdd_adapter_t *pAdapter, v_BOOL_t enable_mp, v_BOOL_t e if ( eHAL_STATUS_PMC_PENDING != halStatus ) { // We failed to enter WoWL - VOS_TRACE( VOS_MODULE_ID_HDD, VOS_TRACE_LEVEL_ERROR, + VOS_TRACE( VOS_MODULE_ID_HDD, VOS_TRACE_LEVEL_ERROR, "sme_EnterWowl failed with error code (%d)", halStatus ); return VOS_FALSE; } @@ -562,7 +562,7 @@ v_BOOL_t hdd_enter_wowl (hdd_adapter_t *pAdapter, v_BOOL_t enable_mp, v_BOOL_t e @return : FALSE if any errors encountered : TRUE otherwise ===========================================================================*/ -v_BOOL_t hdd_exit_wowl (hdd_adapter_t*pAdapter) +v_BOOL_t hdd_exit_wowl (hdd_adapter_t*pAdapter) { tSirSmeWowlExitParams wowParams; tHalHandle hHal = WLAN_HDD_GET_HAL_CTX(pAdapter); @@ -583,20 +583,20 @@ v_BOOL_t hdd_exit_wowl (hdd_adapter_t*pAdapter) /**============================================================================ @brief hdd_init_wowl() - Init function which will initialize the WoWL module - and perform any required intial configuration + and perform any required intial configuration @return : FALSE if any errors encountered : TRUE otherwise ===========================================================================*/ -v_BOOL_t hdd_init_wowl (hdd_adapter_t*pAdapter) +v_BOOL_t hdd_init_wowl (hdd_adapter_t*pAdapter) { hdd_context_t *pHddCtx = NULL; pHddCtx = pAdapter->pHddCtx; memset(g_hdd_wowl_ptrns, 0, sizeof(g_hdd_wowl_ptrns)); - //Add any statically configured patterns - hdd_add_wowl_ptrn(pAdapter, pHddCtx->cfg_ini->wowlPattern); + //Add any statically configured patterns + hdd_add_wowl_ptrn(pAdapter, pHddCtx->cfg_ini->wowlPattern); return VOS_TRUE; } |