diff --git a/core/mac/inc/ani_global.h b/core/mac/inc/ani_global.h
index 785b45fe2de2..02f01109c889 100644
--- a/core/mac/inc/ani_global.h
+++ b/core/mac/inc/ani_global.h
@@ -820,7 +820,7 @@ typedef struct sRrmContext {
 } tRrmContext, *tpRrmContext;
 
 typedef struct sHalMacStartParameters {
-	/* parametes for the Firmware */
+	/* parameters for the Firmware */
 	enum qdf_driver_type driverType;
 
 } tHalMacStartParameters;
diff --git a/core/mac/inc/qwlan_version.h b/core/mac/inc/qwlan_version.h
index 162475b7838d..e12cab6a5c20 100644
--- a/core/mac/inc/qwlan_version.h
+++ b/core/mac/inc/qwlan_version.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2012-2016 The Linux Foundation. All rights reserved.
+ * Copyright (c) 2012-2018 The Linux Foundation. All rights reserved.
  *
  * Permission to use, copy, modify, and/or distribute this software for
  * any purpose with or without fee is hereby granted, provided that the
@@ -25,7 +25,7 @@
 
    BRIEF DESCRIPTION:
    WLAN Host Version file.
-   Build number automaticly updated by build scripts.
+   Build number automatically updated by build scripts.
 
    ===========================================================================*/
 
diff --git a/core/mac/inc/sir_api.h b/core/mac/inc/sir_api.h
index c758d599b8f1..eae60bd1e6bf 100644
--- a/core/mac/inc/sir_api.h
+++ b/core/mac/inc/sir_api.h
@@ -1115,7 +1115,7 @@ typedef struct sSirSmeJoinReq {
 	 */
 } tSirSmeJoinReq, *tpSirSmeJoinReq;
 
-/* / Definition for reponse message to previously issued join request */
+/* / Definition for response message to previously issued join request */
 /* / MAC ---> */
 typedef struct sSirSmeJoinRsp {
 	uint16_t messageType;   /* eWNI_SME_JOIN_RSP */
diff --git a/core/mac/inc/sir_mac_prot_def.h b/core/mac/inc/sir_mac_prot_def.h
index 1b2b8581ee73..7122c86045b4 100644
--- a/core/mac/inc/sir_mac_prot_def.h
+++ b/core/mac/inc/sir_mac_prot_def.h
@@ -208,7 +208,7 @@
 #define SIR_MAC_DLP_RSP             1
 #define SIR_MAC_DLP_TEARDOWN        2
 
-/* block acknowledgement action frame types */
+/* block acknowledgment action frame types */
 #define SIR_MAC_ACTION_VENDOR_SPECIFIC 9
 #define SIR_MAC_ACTION_VENDOR_SPECIFIC_CATEGORY     0x7F
 #define SIR_MAC_ACTION_P2P_SUBTYPE_PRESENCE_RSP     2
diff --git a/core/mac/src/include/sir_params.h b/core/mac/src/include/sir_params.h
index 91d2dd897da5..38c41e5efa00 100644
--- a/core/mac/src/include/sir_params.h
+++ b/core/mac/src/include/sir_params.h
@@ -780,7 +780,7 @@ struct sir_mgmt_msg {
 
 /* ****************************************** *
 *                                            *
-*         EVENT TYPE Defintions              *
+*         EVENT TYPE Definitions              *
 *                                            *
 * ****************************************** */
 
diff --git a/core/mac/src/include/utils_api.h b/core/mac/src/include/utils_api.h
index 609b6ecad106..fa57368c8c4d 100644
--- a/core/mac/src/include/utils_api.h
+++ b/core/mac/src/include/utils_api.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2011-2017 The Linux Foundation. All rights reserved.
+ * Copyright (c) 2011-2018 The Linux Foundation. All rights reserved.
  *
  * Permission to use, copy, modify, and/or distribute this software for
  * any purpose with or without fee is hereby granted, provided that the
@@ -615,7 +615,7 @@ static inline int32_t hal_round_s32(int32_t p)
 	return k;
 }
 
-/* New functions for endianess conversion */
+/* New functions for endianness conversion */
 #ifdef ANI_LITTLE_BYTE_ENDIAN
 #define ani_cpu_to_be16(x) sir_swap_u16((x))
 #define ani_cpu_to_le16(x) (x)
diff --git a/core/mac/src/pe/include/lim_ft_defs.h b/core/mac/src/pe/include/lim_ft_defs.h
index 1602acf7e058..4311136d57c8 100644
--- a/core/mac/src/pe/include/lim_ft_defs.h
+++ b/core/mac/src/pe/include/lim_ft_defs.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013-2017 The Linux Foundation. All rights reserved.
+ * Copyright (c) 2013-2018 The Linux Foundation. All rights reserved.
  *
  * Permission to use, copy, modify, and/or distribute this software for
  * any purpose with or without fee is hereby granted, provided that the
@@ -113,7 +113,7 @@ typedef struct sFTPEContext {
 	uint32_t smeSessionId;
 
 	/* This flag is required to indicate on which session the preauth
-	 * has taken place, since the auth reponse for preauth will come
+	 * has taken place, since the auth response for preauth will come
 	 * for a new BSSID for which there is no session yet. This flag
 	 * will be used to extract the session from the session preauth
 	 * has been initiated
diff --git a/core/mac/src/pe/include/lim_session.h b/core/mac/src/pe/include/lim_session.h
index a17917e3e4b3..fd6b6fdfec8a 100644
--- a/core/mac/src/pe/include/lim_session.h
+++ b/core/mac/src/pe/include/lim_session.h
@@ -478,7 +478,7 @@ typedef struct sPESession       /* Added to Support BT-AMP */
 	tComebackTimerInfo pmfComebackTimerInfo;
 #endif /* WLAN_FEATURE_11W */
 	uint8_t  is_key_installed;
-	/* timer for reseting protection fileds at regular intervals */
+	/* timer for resetting protection fileds at regular intervals */
 	qdf_mc_timer_t protection_fields_reset_timer;
 	void *mac_ctx;
 	/*
diff --git a/core/mac/src/pe/lim/lim_api.c b/core/mac/src/pe/lim/lim_api.c
index 25f05f2b06bb..65292f11a144 100644
--- a/core/mac/src/pe/lim/lim_api.c
+++ b/core/mac/src/pe/lim/lim_api.c
@@ -202,7 +202,7 @@ static void __lim_init_vars(tpAniSirGlobal pMac)
 	/* Place holder for Measurement Req/Rsp/Ind related info */
 
 
-	/* Deferred Queue Paramters */
+	/* Deferred Queue Parameters */
 	qdf_mem_set(&pMac->lim.gLimDeferredMsgQ, sizeof(tSirAddtsReq), 0);
 
 	/* addts request if any - only one can be outstanding at any time */
diff --git a/core/mac/src/pe/lim/lim_assoc_utils.c b/core/mac/src/pe/lim/lim_assoc_utils.c
index 8dde797410cc..3fd610c10b32 100644
--- a/core/mac/src/pe/lim/lim_assoc_utils.c
+++ b/core/mac/src/pe/lim/lim_assoc_utils.c
@@ -3247,7 +3247,7 @@ lim_check_and_announce_join_success(tpAniSirGlobal mac_ctx,
 
 		/*
 		 * If MAX Noa exceeds 3 secs we will consider only 3 secs to
-		 * avoid arbitary values in noa duration field
+		 * avoid arbitrary values in noa duration field
 		 */
 		noa = noa > MAX_NOA_PERIOD_IN_MICROSECS ?
 				MAX_NOA_PERIOD_IN_MICROSECS : noa;
diff --git a/core/mac/src/pe/lim/lim_ft.c b/core/mac/src/pe/lim/lim_ft.c
index e68c6576b106..4daec260cdbd 100644
--- a/core/mac/src/pe/lim/lim_ft.c
+++ b/core/mac/src/pe/lim/lim_ft.c
@@ -1083,7 +1083,7 @@ tSirRetStatus lim_process_ft_aggr_qos_req(tpAniSirGlobal pMac, uint32_t *pMsgBuf
 #ifdef WLAN_FEATURE_ROAM_OFFLOAD
 	else {
 		/* Implies it is a LFR3.0 based 11r connection
-		 * so donot send add ts request to fimware since it
+		 * so donot send add ts request to firmware since it
 		 * already has the RIC IEs */
 
 		/* Send the Aggr QoS response to SME */
diff --git a/core/mac/src/pe/lim/lim_ibss_peer_mgmt.c b/core/mac/src/pe/lim/lim_ibss_peer_mgmt.c
index ea28b43d09ff..a61ca6ccc670 100644
--- a/core/mac/src/pe/lim/lim_ibss_peer_mgmt.c
+++ b/core/mac/src/pe/lim/lim_ibss_peer_mgmt.c
@@ -851,7 +851,7 @@ lim_ibss_decide_protection(tpAniSirGlobal pMac, tpDphHashNode pStaDs,
 		if ((phyMode == WNI_CFG_PHY_MODE_11G)
 		    || (psessionEntry->htCapability)) {
 			/* As we found in the past, it is possible that a 11n STA sends
-			 * Beacon with HT IE but not ERP IE.  So the absense of ERP IE
+			 * Beacon with HT IE but not ERP IE.  So the absence of ERP IE
 			 * in the Beacon is not enough to conclude that STA is 11b.
 			 */
 			if ((pStaDs->erpEnabled == eHAL_CLEAR) &&
diff --git a/core/mac/src/pe/lim/lim_process_action_frame.c b/core/mac/src/pe/lim/lim_process_action_frame.c
index be54bd90503e..12b30ab3db79 100644
--- a/core/mac/src/pe/lim/lim_process_action_frame.c
+++ b/core/mac/src/pe/lim/lim_process_action_frame.c
@@ -100,7 +100,7 @@ void lim_stop_tx_and_switch_channel(tpAniSirGlobal pMac, uint8_t sessionId)
 	}
 
 	pMac->lim.limTimers.gLimChannelSwitchTimer.sessionId = sessionId;
-	/* change the channel immediatly only if
+	/* change the channel immediately only if
 	 * the channel switch count is 0
 	 */
 	if (psessionEntry->gLimChannelSwitch.switchCount == 0) {
@@ -744,7 +744,7 @@ static void __lim_process_add_ts_rsp(tpAniSirGlobal mac_ctx,
 	}
 
 	/*
-	 * for successful addts reponse, try to add the classifier.
+	 * for successful addts response, try to add the classifier.
 	 * if this fails for any reason, we should send a delts request to the
 	 * ap for now, its ok not to send a delts since we are going to add
 	 * support for multiple tclas soon and until then we won't send any
@@ -1559,7 +1559,7 @@ static void __lim_process_sa_query_response_action_frame(tpAniSirGlobal pMac,
 	if (DPH_SA_QUERY_IN_PROGRESS != pSta->pmfSaQueryState)
 		return;
 
-	/* Extract 11w trsansId from SA query reponse action frame
+	/* Extract 11w trsansId from SA query response action frame
 	   In SA query response action frame:
 	   Category       : 1 byte
 	   Action         : 1 byte
@@ -1586,7 +1586,7 @@ static void __lim_process_sa_query_response_action_frame(tpAniSirGlobal pMac,
  *
  ***FUNCTION:
  * This function checks if an Action frame should be dropped since it is
- * a Robust Managment Frame, it is unprotected, and it is received on a
+ * a Robust Management Frame, it is unprotected, and it is received on a
  * connection where PMF is enabled.
  *
  ***LOGIC:
diff --git a/core/mac/src/pe/lim/lim_process_assoc_req_frame.c b/core/mac/src/pe/lim/lim_process_assoc_req_frame.c
index 8cc48ff342fc..802d19c5e926 100644
--- a/core/mac/src/pe/lim/lim_process_assoc_req_frame.c
+++ b/core/mac/src/pe/lim/lim_process_assoc_req_frame.c
@@ -671,7 +671,7 @@ lim_process_for_spectrum_mgmt(tpAniSirGlobal mac_ctx, tpSirMacMgmtHdr hdr,
 
 			/*
 			 * TODO: presently, this is not handled. In the current
-			 * implemetation, the AP would allow the station to
+			 * implementation, the AP would allow the station to
 			 * associate even if it doesn't support spectrum
 			 * management.
 			 */
diff --git a/core/mac/src/pe/lim/lim_process_assoc_rsp_frame.c b/core/mac/src/pe/lim/lim_process_assoc_rsp_frame.c
index 0aacc44b17e4..dae9a66dfe8b 100644
--- a/core/mac/src/pe/lim/lim_process_assoc_rsp_frame.c
+++ b/core/mac/src/pe/lim/lim_process_assoc_rsp_frame.c
@@ -565,7 +565,7 @@ lim_process_assoc_rsp_frame(tpAniSirGlobal mac_ctx,
 		eLIM_MLM_WT_FT_REASSOC_RSP_STATE)
 		))) {
 		/* Received unexpected Re/Association Response frame */
-		pe_debug("Recieved Re/Assoc rsp in unexpected state: %d on session: %d",
+		pe_debug("Received Re/Assoc rsp in unexpected state: %d on session: %d",
 			session_entry->limMlmState, session_entry->peSessionId);
 		if (!hdr->fc.retry) {
 			if (!(mac_ctx->lim.retry_packet_cnt & 0xf)) {
diff --git a/core/mac/src/pe/lim/lim_process_beacon_frame.c b/core/mac/src/pe/lim/lim_process_beacon_frame.c
index afbab777e71b..90938bd941a7 100644
--- a/core/mac/src/pe/lim/lim_process_beacon_frame.c
+++ b/core/mac/src/pe/lim/lim_process_beacon_frame.c
@@ -97,7 +97,7 @@ lim_process_beacon_frame(tpAniSirGlobal mac_ctx, uint8_t *rx_pkt_info,
 	/*
 	 * during scanning, when any session is active, and
 	 * beacon/Pr belongs to one of the session, fill up the
-	 * following, TBD - HB couter
+	 * following, TBD - HB counter
 	 */
 	if (sir_compare_mac_addr(session->bssId,
 				bcn_ptr->bssid)) {
diff --git a/core/mac/src/pe/lim/lim_process_message_queue.c b/core/mac/src/pe/lim/lim_process_message_queue.c
index fc21dc1e4aff..283ba2d8023c 100644
--- a/core/mac/src/pe/lim/lim_process_message_queue.c
+++ b/core/mac/src/pe/lim/lim_process_message_queue.c
@@ -437,7 +437,7 @@ uint8_t static def_msg_decision(tpAniSirGlobal pMac, struct scheduler_msg *limMs
 
 /* this function should not changed */
 	if (pMac->lim.gLimSmeState == eLIM_SME_OFFLINE_STATE) {
-		/* Defer processsing this message */
+		/* Defer processing this message */
 		if (lim_defer_msg(pMac, limMsg) != TX_SUCCESS) {
 			QDF_TRACE(QDF_MODULE_ID_PE, LOGE,
 					FL("Unable to Defer Msg"));
@@ -501,7 +501,7 @@ uint8_t static def_msg_decision(tpAniSirGlobal pMac, struct scheduler_msg *limMs
 			(mgmt_pkt_defer)) {
 			pe_debug("Defer the current message %s , gLimProcessDefdMsgs is false and system is not in scan/learn mode",
 				       lim_msg_str(limMsg->type));
-			/* Defer processsing this message */
+			/* Defer processing this message */
 			if (lim_defer_msg(pMac, limMsg) != TX_SUCCESS) {
 				QDF_TRACE(QDF_MODULE_ID_PE, LOGE,
 					FL("Unable to Defer Msg"));
@@ -1534,7 +1534,7 @@ static void lim_process_messages(tpAniSirGlobal mac_ctx,
 			break;
 		}
 		/* System is in DFS (Learn) mode.
-		 * Defer processsing this message
+		 * Defer processing this message
 		 */
 		if (lim_defer_msg(mac_ctx, msg) != TX_SUCCESS) {
 			if (!(mac_ctx->lim.deferredMsgCnt & 0xF))
@@ -2180,7 +2180,7 @@ static void lim_process_normal_hdd_msg(tpAniSirGlobal mac_ctx,
 		(lim_is_system_in_scan_state(mac_ctx))) && defer_msg) {
 		/*
 		 * System is in DFS (Learn) mode or awaiting addts response or
-		 * if radar is detected, Defer processsing this message
+		 * if radar is detected, Defer processing this message
 		 */
 		if (lim_defer_msg(mac_ctx, msg) != TX_SUCCESS) {
 #ifdef WLAN_DEBUG
diff --git a/core/mac/src/pe/lim/lim_process_mlm_req_messages.c b/core/mac/src/pe/lim/lim_process_mlm_req_messages.c
index 802d2fcb0d59..23c818be3258 100644
--- a/core/mac/src/pe/lim/lim_process_mlm_req_messages.c
+++ b/core/mac/src/pe/lim/lim_process_mlm_req_messages.c
@@ -239,7 +239,7 @@ lim_change_channel_with_callback(tpAniSirGlobal mac_ctx, uint8_t new_chan,
  * This function is called to get the list,
  * change the channel type and set again.
  * NOTE: If a channel is ACTIVE, this function will make it as PASSIVE
- *       If a channel is PASSIVE, this fucntion will make it as ACTIVE
+ *       If a channel is PASSIVE, this function will make it as ACTIVE
  *
  * Return: None
  */
diff --git a/core/mac/src/pe/lim/lim_process_sme_req_messages.c b/core/mac/src/pe/lim/lim_process_sme_req_messages.c
index c3b217539d56..4edf1f577940 100644
--- a/core/mac/src/pe/lim/lim_process_sme_req_messages.c
+++ b/core/mac/src/pe/lim/lim_process_sme_req_messages.c
@@ -2155,7 +2155,7 @@ static void __lim_process_sme_disassoc_req(tpAniSirGlobal pMac, uint32_t *pMsgBu
 			break;
 
 		case eLIM_SME_WT_DISASSOC_STATE:
-			/* PE Recieved a Disassoc frame. Normally it gets DISASSOC_CNF but it
+			/* PE Received a Disassoc frame. Normally it gets DISASSOC_CNF but it
 			 * received DISASSOC_REQ. Which means host is also trying to disconnect.
 			 * PE can continue processing DISASSOC_REQ and send the response instead
 			 * of failing the request. SME will anyway ignore DEAUTH_IND that was sent
@@ -2503,7 +2503,7 @@ static void __lim_process_sme_deauth_req(tpAniSirGlobal mac_ctx,
 		case eLIM_SME_WT_DEAUTH_STATE:
 		case eLIM_SME_WT_DISASSOC_STATE:
 			/*
-			 * PE Recieved a Deauth/Disassoc frame. Normally it get
+			 * PE Received a Deauth/Disassoc frame. Normally it get
 			 * DEAUTH_CNF/DISASSOC_CNF but it received DEAUTH_REQ.
 			 * Which means host is also trying to disconnect.
 			 * PE can continue processing DEAUTH_REQ and send
@@ -3984,7 +3984,7 @@ static void __lim_process_sme_set_ht2040_mode(tpAniSirGlobal pMac,
 				qdf_mem_free(pHtOpMode);
 				return;
 			}
-			pe_debug("Notifed FW about OP mode: %d for staId=%d",
+			pe_debug("Notified FW about OP mode: %d for staId=%d",
 				pHtOpMode->opMode, staId);
 
 		} else
diff --git a/core/mac/src/pe/lim/lim_process_tdls.c b/core/mac/src/pe/lim/lim_process_tdls.c
index 0f058e893232..cdb9c8309104 100644
--- a/core/mac/src/pe/lim/lim_process_tdls.c
+++ b/core/mac/src/pe/lim/lim_process_tdls.c
@@ -2822,7 +2822,7 @@ tSirRetStatus lim_process_sme_tdls_mgmt_send_req(tpAniSirGlobal mac_ctx,
 	uint8_t session_id;
 	tSirResultCodes result_code = eSIR_SME_INVALID_PARAMETERS;
 
-	pe_debug("Send Mgmt Recieved");
+	pe_debug("Send Mgmt Received");
 	session_entry = pe_find_session_by_bssid(mac_ctx,
 					 send_req->bssid.bytes, &session_id);
 	if (NULL == session_entry) {
@@ -2982,7 +2982,7 @@ tSirRetStatus lim_process_sme_tdls_add_sta_req(tpAniSirGlobal pMac,
 	tpPESession psessionEntry;
 	uint8_t sessionId;
 
-	pe_debug("TDLS Add STA Request Recieved");
+	pe_debug("TDLS Add STA Request Received");
 	psessionEntry =
 		pe_find_session_by_bssid(pMac, pAddStaReq->bssid.bytes,
 					 &sessionId);
@@ -3046,7 +3046,7 @@ tSirRetStatus lim_process_sme_tdls_del_sta_req(tpAniSirGlobal pMac,
 	uint8_t sessionId;
 	tSirRetStatus status = eSIR_FAILURE;
 
-	pe_debug("TDLS Delete STA Request Recieved");
+	pe_debug("TDLS Delete STA Request Received");
 	psessionEntry =
 		pe_find_session_by_bssid(pMac, pDelStaReq->bssid.bytes,
 					 &sessionId);
@@ -3100,7 +3100,7 @@ lim_tdls_del_sta_error:
 }
 
 /**
- * lim_check_aid_and_delete_peer() - Funtion to check aid and delete peer
+ * lim_check_aid_and_delete_peer() - Function to check aid and delete peer
  * @p_mac: pointer to mac context
  * @session_entry: pointer to PE session
  *
diff --git a/core/mac/src/pe/lim/lim_security_utils.c b/core/mac/src/pe/lim/lim_security_utils.c
index 63cdd0b562f7..365ddf08406a 100644
--- a/core/mac/src/pe/lim/lim_security_utils.c
+++ b/core/mac/src/pe/lim/lim_security_utils.c
@@ -303,7 +303,7 @@ void lim_add_pre_auth_node(tpAniSirGlobal pMac, struct tLimPreAuthNode *pAuthNod
  * lim_release_pre_auth_node
  *
  ***FUNCTION:
- * This function is called to realease the accquired
+ * This function is called to realease the acquired
  * pre auth node from list.
  *
  ***LOGIC:
diff --git a/core/mac/src/pe/lim/lim_send_management_frames.c b/core/mac/src/pe/lim/lim_send_management_frames.c
index 0a51399f8c8a..7f3138bdbca3 100644
--- a/core/mac/src/pe/lim/lim_send_management_frames.c
+++ b/core/mac/src/pe/lim/lim_send_management_frames.c
@@ -1712,7 +1712,7 @@ lim_send_assoc_req_mgmt_frame(tpAniSirGlobal mac_ctx,
 			extr_ext_flag = (extr_ext_cap.num_bytes > 0);
 		}
 	} else {
-		pe_debug("No addn IE or peer dosen't support addnIE for Assoc Req");
+		pe_debug("No addn IE or peer doesn't support addnIE for Assoc Req");
 		extr_ext_flag = false;
 	}
 
@@ -4601,7 +4601,7 @@ tSirRetStatus lim_send_sa_query_response_frame(tpAniSirGlobal pMac,
 					       tpPESession psessionEntry)
 {
 
-	tDot11fSaQueryRsp frm;  /* SA query reponse action frame */
+	tDot11fSaQueryRsp frm;  /* SA query response action frame */
 	uint8_t *pFrame;
 	tSirRetStatus nSirStatus;
 	tpSirMacMgmtHdr pMacHdr;
diff --git a/core/mac/src/pe/lim/lim_send_sme_rsp_messages.c b/core/mac/src/pe/lim/lim_send_sme_rsp_messages.c
index aa9a7e4361f9..410362953ee8 100644
--- a/core/mac/src/pe/lim/lim_send_sme_rsp_messages.c
+++ b/core/mac/src/pe/lim/lim_send_sme_rsp_messages.c
@@ -2453,7 +2453,7 @@ lim_handle_bss_color_change_ie(tpAniSirGlobal mac_ctx,
 
 /** -----------------------------------------------------------------
    \brief lim_process_beacon_tx_success_ind() - This function is used
-   explicitely to handle successful beacon transmission indication
+   explicitly to handle successful beacon transmission indication
    from the FW. This is a generic event generated by the FW afer the
    first beacon is sent out after the beacon template update by the
    host
diff --git a/core/mac/src/pe/lim/lim_ser_des_utils.h b/core/mac/src/pe/lim/lim_ser_des_utils.h
index 7fce33761ad7..92b8f08ce400 100644
--- a/core/mac/src/pe/lim/lim_ser_des_utils.h
+++ b/core/mac/src/pe/lim/lim_ser_des_utils.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2011-2015, 2016-2017 The Linux Foundation. All rights reserved.
+ * Copyright (c) 2011-2018 The Linux Foundation. All rights reserved.
  *
  * Permission to use, copy, modify, and/or distribute this software for
  * any purpose with or without fee is hereby granted, provided that the
@@ -48,7 +48,7 @@ static inline void lim_copy_u16(uint8_t *ptr, uint16_t u16Val)
 	*ptr++ = (uint8_t) (u16Val & 0xff);
 	*ptr = (uint8_t) ((u16Val >> 8) & 0xff);
 #else
-#error "Unknown combination of OS Type and endianess"
+#error "Unknown combination of OS Type and endianness"
 #endif
 }
 
@@ -58,7 +58,7 @@ static inline uint16_t lim_get_u16(uint8_t *ptr)
 	(defined(ANI_OS_TYPE_ANDROID) && defined(ANI_LITTLE_BYTE_ENDIAN)))
 	return ((uint16_t) (*(ptr + 1) << 8)) | ((uint16_t) (*ptr));
 #else
-#error "Unknown combination of OS Type and endianess"
+#error "Unknown combination of OS Type and endianness"
 #endif
 }
 
@@ -71,7 +71,7 @@ static inline void lim_copy_u32(uint8_t *ptr, uint32_t u32Val)
 	*ptr++ = (uint8_t) ((u32Val >> 16) & 0xff);
 	*ptr = (uint8_t) ((u32Val >> 24) & 0xff);
 #else
-#error "Unknown combination of OS Type and endianess"
+#error "Unknown combination of OS Type and endianness"
 #endif
 }
 
@@ -82,7 +82,7 @@ static inline uint32_t lim_get_u32(uint8_t *ptr)
 	return ((*(ptr + 3) << 24) |
 		(*(ptr + 2) << 16) | (*(ptr + 1) << 8) | (*(ptr)));
 #else
-#error "Unknown combination of OS Type and endianess"
+#error "Unknown combination of OS Type and endianness"
 #endif
 }
 
diff --git a/core/mac/src/pe/lim/lim_session.c b/core/mac/src/pe/lim/lim_session.c
index 9383c96ae36f..055ea7d64c7d 100644
--- a/core/mac/src/pe/lim/lim_session.c
+++ b/core/mac/src/pe/lim/lim_session.c
@@ -584,7 +584,7 @@ pe_create_session(tpAniSirGlobal pMac, uint8_t *bssid, uint8_t *sessionId,
 	if (bssType == eSIR_MONITOR_MODE)
 		sir_copy_mac_addr(pMac->lim.gpSession[i].selfMacAddr, bssid);
 	session_ptr->valid = true;
-	/* Intialize the SME and MLM states to IDLE */
+	/* Initialize the SME and MLM states to IDLE */
 	session_ptr->limMlmState = eLIM_MLM_IDLE_STATE;
 	session_ptr->limSmeState = eLIM_SME_IDLE_STATE;
 	session_ptr->limCurrentAuthType = eSIR_OPEN_SYSTEM;
diff --git a/core/mac/src/pe/lim/lim_sme_req_utils.h b/core/mac/src/pe/lim/lim_sme_req_utils.h
index 6f1356f018db..7bcf5b821463 100644
--- a/core/mac/src/pe/lim/lim_sme_req_utils.h
+++ b/core/mac/src/pe/lim/lim_sme_req_utils.h
@@ -19,7 +19,7 @@
 /*
  *
  * This file lim_sme_req_utils.h contains the utility definitions
- * LIM uses while processing SME request messsages.
+ * LIM uses while processing SME request messages.
  * Author:        Chandra Modumudi
  * Date:          02/13/02
  * History:-
diff --git a/core/mac/src/pe/lim/lim_trace.c b/core/mac/src/pe/lim/lim_trace.c
index 26a44cac3b81..63b865093b42 100644
--- a/core/mac/src/pe/lim/lim_trace.c
+++ b/core/mac/src/pe/lim/lim_trace.c
@@ -327,7 +327,7 @@ void mac_trace_msg_tx_new(tpAniSirGlobal pMac, uint8_t module, uint8_t session,
 }
 
 /*
- * bit31: Rx message defferred or not
+ * bit31: Rx message deferred or not
  * bit 0-15: message ID:
  */
 void mac_trace_msg_rx(tpAniSirGlobal pMac, uint8_t session, uint32_t data)
@@ -355,7 +355,7 @@ void mac_trace_msg_rx(tpAniSirGlobal pMac, uint8_t session, uint32_t data)
 }
 
 /*
- * bit31: Rx message defferred or not
+ * bit31: Rx message deferred or not
  * bit 0-15: message ID:
  */
 void mac_trace_msg_rx_new(tpAniSirGlobal pMac, uint8_t module, uint8_t session,
diff --git a/core/mac/src/pe/lim/lim_utils.c b/core/mac/src/pe/lim/lim_utils.c
index 8f58cd2e8941..c90994446e9a 100644
--- a/core/mac/src/pe/lim/lim_utils.c
+++ b/core/mac/src/pe/lim/lim_utils.c
@@ -873,7 +873,7 @@ uint8_t lim_write_deferred_msg_q(tpAniSirGlobal mac_ctx,
 	if (SIR_BB_XPORT_MGMT_MSG == lim_msg->type) {
 		lim_util_get_type_subtype(lim_msg->bodyptr,
 					&type, &subtype);
-		pe_debug(" Deferred managment type %d subtype %d ",
+		pe_debug(" Deferred management type %d subtype %d ",
 			type, subtype);
 	}
 
@@ -2935,7 +2935,7 @@ uint8_t lim_get_ht_capability(tpAniSirGlobal pMac,
  * @bcn_prms:   beacon parameters
  * @pe_session: pe session entry
  *
- * This fucntion updates protection params for enable 11a protection request
+ * This function updates protection params for enable 11a protection request
  *
  * @Return: void
  */
@@ -2996,7 +2996,7 @@ lim_enable_11a_protection(tpAniSirGlobal mac_ctx,
  * @bcn_prms:   beacon parameters
  * @pe_session: pe session entry
  *
- * This fucntion updates protection params for disable 11a protection request
+ * This function updates protection params for disable 11a protection request
  *
  * @Return: void
  */
@@ -8171,7 +8171,7 @@ QDF_STATUS lim_util_get_type_subtype(void *pkt, uint8_t *type,
 		*type = hdr->fc.type;
 		*subtype = hdr->fc.subType;
 	} else {
-		pe_err("Not a managment packet type %d", hdr->fc.type);
+		pe_err("Not a management packet type %d", hdr->fc.type);
 		return QDF_STATUS_E_INVAL;
 	}
 	return QDF_STATUS_SUCCESS;
diff --git a/core/mac/src/pe/nan/nan_datapath.h b/core/mac/src/pe/nan/nan_datapath.h
index 0d3a85534828..b13a4fd84bb3 100644
--- a/core/mac/src/pe/nan/nan_datapath.h
+++ b/core/mac/src/pe/nan/nan_datapath.h
@@ -56,7 +56,7 @@ struct peer_nan_datapath_map;
  * @ht_mimo_ps_state: MIMO power state
  * @ht_ampdu_density: AMPDU density
  * @ht_max_rxampdu_factor: receieve AMPDU factor
- * @ht_max_amsdu_len: Max AMSDU lengh supported
+ * @ht_max_amsdu_len: Max AMSDU length supported
  * @ht_supp_chan_widthset: Supported channel widthset
  * @ht_ldpc_capable: LDPC capable
  * @heartbeat_failure: heart beat failure indication flag
diff --git a/core/mac/src/pe/sch/sch_beacon_process.c b/core/mac/src/pe/sch/sch_beacon_process.c
index 0e0f4955afe4..780450caec98 100644
--- a/core/mac/src/pe/sch/sch_beacon_process.c
+++ b/core/mac/src/pe/sch/sch_beacon_process.c
@@ -352,7 +352,7 @@ sch_bcn_process_sta(tpAniSirGlobal mac_ctx,
 	tpDphHashNode pStaDs = NULL;
 	/*
 	 *  This handles two cases:
-	 *  -- Infra STA receving beacons from AP
+	 *  -- Infra STA receiving beacons from AP
 	 */
 
 	/**
@@ -757,9 +757,9 @@ static void get_local_power_constraint_beacon(
  * @session:        pe session pointer
  *
  * Following scenarios exist when Session exists
- *   IBSS STA receving beacons from IBSS Peers, who are part of IBSS.
+ *   IBSS STA receiving beacons from IBSS Peers, who are part of IBSS.
  *     - call lim_handle_ibs_scoalescing with that session context.
- *   Infra STA receving beacons from AP to which it is connected
+ *   Infra STA receiving beacons from AP to which it is connected
  *     - call sch_beacon_processFromAP with that session's context.
  *     - call sch_beacon_processFromAP with that session's context.
  *     (here need to make sure BTAP creates session entry for BT STA)
diff --git a/core/mac/src/sys/legacy/src/system/src/mac_init_api.c b/core/mac/src/sys/legacy/src/system/src/mac_init_api.c
index 15fa7cc015bd..f9471815f935 100644
--- a/core/mac/src/sys/legacy/src/system/src/mac_init_api.c
+++ b/core/mac/src/sys/legacy/src/system/src/mac_init_api.c
@@ -106,8 +106,8 @@ tSirRetStatus mac_open(struct wlan_objmgr_psoc *psoc, tHalHandle *pHalHandle,
 
 	/*
 	 * Set various global fields of p_mac here
-	 * (Could be platform dependant as some variables in p_mac are platform
-	 * dependant)
+	 * (Could be platform dependent as some variables in p_mac are platform
+	 * dependent)
 	 */
 	p_mac->hHdd = hHdd;
 
diff --git a/core/mac/src/sys/legacy/src/utils/src/parser_api.c b/core/mac/src/sys/legacy/src/utils/src/parser_api.c
index feec5c616c44..4978e7e72946 100644
--- a/core/mac/src/sys/legacy/src/utils/src/parser_api.c
+++ b/core/mac/src/sys/legacy/src/utils/src/parser_api.c
@@ -1215,7 +1215,7 @@ populate_dot11f_ext_cap(tpAniSirGlobal pMac,
 	if (psessionEntry && psessionEntry->enable_bcast_probe_rsp)
 		p_ext_cap->fils_capability = 1;
 
-	/* Need to calulate the num_bytes based on bits set */
+	/* Need to calculate the num_bytes based on bits set */
 	if (pDot11f->present)
 		pDot11f->num_bytes = lim_compute_ext_cap_ie_length(pDot11f);