diff --git a/umac/cmn_services/mgmt_txrx/core/src/wlan_mgmt_txrx_main_i.h b/umac/cmn_services/mgmt_txrx/core/src/wlan_mgmt_txrx_main_i.h
index d2939448d8..89bc90ffaa 100644
--- a/umac/cmn_services/mgmt_txrx/core/src/wlan_mgmt_txrx_main_i.h
+++ b/umac/cmn_services/mgmt_txrx/core/src/wlan_mgmt_txrx_main_i.h
@@ -118,7 +118,7 @@ struct mgmt_rx_handler {
 /**
  * struct txrx_stats - txrx stats for mgmt frames
  * @pkts_success:       no. of packets successfully txed/rcvd
- * @pkts_fail:          no. of packets unsuccessfullt txed/rcvd
+ * @pkts_fail:          no. of packets unsuccessfully txed/rcvd
  * @bytes_success:      no. of bytes successfully txed/rcvd
  * @bytes_fail:         no. of bytes successfully txed/rcvd
  * @assoc_req_rcvd:     no. of assoc requests rcvd
diff --git a/umac/cmn_services/obj_mgr/inc/wlan_objmgr_cmn.h b/umac/cmn_services/obj_mgr/inc/wlan_objmgr_cmn.h
index 38b17310a4..f5c638dd1e 100644
--- a/umac/cmn_services/obj_mgr/inc/wlan_objmgr_cmn.h
+++ b/umac/cmn_services/obj_mgr/inc/wlan_objmgr_cmn.h
@@ -16,7 +16,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
  /**
-  * DOC: This file provides the common defintions for object manager
+  * DOC: This file provides the common definitions for object manager
   */
 
 #ifndef _WLAN_OBJMGR_CMN_H_
diff --git a/umac/cmn_services/serialization/inc/wlan_serialization_api.h b/umac/cmn_services/serialization/inc/wlan_serialization_api.h
index c1003c1154..5c8658f577 100644
--- a/umac/cmn_services/serialization/inc/wlan_serialization_api.h
+++ b/umac/cmn_services/serialization/inc/wlan_serialization_api.h
@@ -114,7 +114,7 @@ typedef void (*wlan_serialization_comp_info_cb)(struct wlan_objmgr_vdev *vdev,
  * The rules are applied using this callback and decided whether to
  * allow or deny the command
  *
- * Return: true, if rules are successfull and cmd can be queued
+ * Return: true, if rules are successful and cmd can be queued
  *         false, if rules failed and cmd should not be queued
  */
 typedef bool (*wlan_serialization_apply_rules_cb)(
diff --git a/umac/cmn_services/serialization/src/wlan_serialization_main.c b/umac/cmn_services/serialization/src/wlan_serialization_main.c
index f7dee230f2..c012e43f3c 100644
--- a/umac/cmn_services/serialization/src/wlan_serialization_main.c
+++ b/umac/cmn_services/serialization/src/wlan_serialization_main.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017 The Linux Foundation. All rights reserved.
+ * Copyright (c) 2017-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
@@ -463,7 +463,7 @@ QDF_STATUS wlan_serialization_deinit(void)
 			wlan_serialization_pdev_obj_destroy_notification,
 			NULL);
 	if (status != QDF_STATUS_SUCCESS) {
-		serialization_err("unreg fail for pdev ser destory notf:%d",
+		serialization_err("unreg fail for pdev ser destroy notf:%d",
 				status);
 		ret_status = QDF_STATUS_E_FAILURE;
 	}
diff --git a/umac/cmn_services/serialization/src/wlan_serialization_utils_i.h b/umac/cmn_services/serialization/src/wlan_serialization_utils_i.h
index 6d9b5e7902..374982937b 100644
--- a/umac/cmn_services/serialization/src/wlan_serialization_utils_i.h
+++ b/umac/cmn_services/serialization/src/wlan_serialization_utils_i.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017 The Linux Foundation. All rights reserved.
+ * Copyright (c) 2017-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
@@ -240,7 +240,7 @@ wlan_serialization_dequeue_cmd(struct wlan_serialization_command *cmd,
  * @psoc: pointer to psoc
  * @cmd: pointer to actual command
  *
- * find the timer associated with command, stop it and destory it
+ * find the timer associated with command, stop it and destroy it
  *
  * Return: QDF_STATUS
  */
diff --git a/umac/dfs/core/src/misc/dfs.c b/umac/dfs/core/src/misc/dfs.c
index e148032bfc..60bdc66ca0 100644
--- a/umac/dfs/core/src/misc/dfs.c
+++ b/umac/dfs/core/src/misc/dfs.c
@@ -121,7 +121,7 @@ int dfs_attach(struct wlan_dfs *dfs)
 
 	/*
 	 * Init of timer ,dfs_testtimer_task is required by both partial
-	 * and full offload, indicating test mode timer initilization for both.
+	 * and full offload, indicating test mode timer initialization for both.
 	 */
 	dfs_main_task_testtimer_init(dfs);
 	return 0;
diff --git a/umac/dfs/core/src/misc/dfs_random_chan_sel.c b/umac/dfs/core/src/misc/dfs_random_chan_sel.c
index c216380bd1..cc6de9fb1c 100644
--- a/umac/dfs/core/src/misc/dfs_random_chan_sel.c
+++ b/umac/dfs/core/src/misc/dfs_random_chan_sel.c
@@ -1154,7 +1154,7 @@ static uint8_t dfs_find_ch_with_fallback(
 		/* reset channels associate with primary 80Mhz */
 		for (i = 0; i < DFS_80_NUM_SUB_CHANNEL; i++)
 			final_lst[i + index] = 0;
-		/* select and calculate center freq for secondary segement */
+		/* select and calculate center freq for secondary segment */
 		for (i = 0; i < final_cnt / DFS_80_NUM_SUB_CHANNEL; i++) {
 			if (final_lst[i * DFS_80_NUM_SUB_CHANNEL] &&
 			    (abs(primary_seg_start_ch -
@@ -1241,7 +1241,7 @@ static bool dfs_freq_is_in_nol(struct wlan_dfs *dfs, uint32_t freq)
  * dfs_apply_rules()- prepare channel list based on flags
  * @dfs: dfs handler
  * @flags: channel flags
- * @random_chan_list: ouput channel list
+ * @random_chan_list: output channel list
  * @random_chan_cnt: output channel count
  * @ch_list: input channel list
  * @ch_cnt: input channel count
diff --git a/umac/nan/dispatcher/src/nan_ucfg_api.c b/umac/nan/dispatcher/src/nan_ucfg_api.c
index dc9412ac8b..8482c4390d 100644
--- a/umac/nan/dispatcher/src/nan_ucfg_api.c
+++ b/umac/nan/dispatcher/src/nan_ucfg_api.c
@@ -339,7 +339,7 @@ QDF_STATUS ucfg_nan_req_processor(struct wlan_objmgr_vdev *vdev,
 	msg.callback = nan_scheduled_msg_handler;
 	status = scheduler_post_msg(QDF_MODULE_ID_OS_IF, &msg);
 	if (QDF_IS_STATUS_ERROR(status)) {
-		nan_err("faild to post msg to NAN component, status: %d",
+		nan_err("failed to post msg to NAN component, status: %d",
 			status);
 	}
 
diff --git a/umac/scan/dispatcher/inc/wlan_scan_ucfg_api.h b/umac/scan/dispatcher/inc/wlan_scan_ucfg_api.h
index ebc4d2032f..5eb8f371f3 100644
--- a/umac/scan/dispatcher/inc/wlan_scan_ucfg_api.h
+++ b/umac/scan/dispatcher/inc/wlan_scan_ucfg_api.h
@@ -501,7 +501,7 @@ QDF_STATUS ucfg_scan_update_roam_params(struct wlan_objmgr_psoc *psoc,
 QDF_STATUS ucfg_scan_init(void);
 
 /**
- * ucfg_scan_deinit() - Scan module deinitilization API
+ * ucfg_scan_deinit() - Scan module deinitialization API
  *
  * Return: QDF_STATUS
  */
diff --git a/umac/scan/dispatcher/src/wlan_scan_ucfg_api.c b/umac/scan/dispatcher/src/wlan_scan_ucfg_api.c
index b482fd6d17..750ef24dac 100644
--- a/umac/scan/dispatcher/src/wlan_scan_ucfg_api.c
+++ b/umac/scan/dispatcher/src/wlan_scan_ucfg_api.c
@@ -1114,7 +1114,7 @@ ucfg_scan_cancel_sync(struct scan_cancel_request *req)
 
 	/*
 	 * If cancel req is to cancel all scan of pdev or vdev
-	 * wait untill all scan of pdev or vdev get cancelled
+	 * wait until all scan of pdev or vdev get cancelled
 	 */
 	qdf_event_create(&cancel_scan_event);
 	qdf_event_reset(&cancel_scan_event);
diff --git a/umac/tdls/core/src/wlan_tdls_ct.h b/umac/tdls/core/src/wlan_tdls_ct.h
index b713c971b4..04926b9bba 100644
--- a/umac/tdls/core/src/wlan_tdls_ct.h
+++ b/umac/tdls/core/src/wlan_tdls_ct.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017 The Linux Foundation. All rights reserved.
+ * Copyright (c) 2017-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
@@ -60,7 +60,7 @@ void tdls_implicit_enable(struct tdls_vdev_priv_obj *tdls_vdev);
  * @mac_addr: mac address of the data
  *
  * Increase the rx packet count, if the sender is not bssid and the packet is
- * not broadcast and muticast packet
+ * not broadcast and multicast packet
  *
  * This sampling information will be used in TDLS connection tracker
  *
@@ -78,7 +78,7 @@ void tdls_update_rx_pkt_cnt(struct wlan_objmgr_vdev *vdev,
  * @mac_addr: mac address of the data
  *
  * Increase the tx packet count, if the sender is not bssid and the packet is
- * not broadcast and muticast packet
+ * not broadcast and multicast packet
  *
  * This sampling information will be used in TDLS connection tracker
  *
diff --git a/umac/tdls/dispatcher/inc/wlan_tdls_public_structs.h b/umac/tdls/dispatcher/inc/wlan_tdls_public_structs.h
index 00fecd76da..089a75f9e1 100644
--- a/umac/tdls/dispatcher/inc/wlan_tdls_public_structs.h
+++ b/umac/tdls/dispatcher/inc/wlan_tdls_public_structs.h
@@ -1007,7 +1007,7 @@ struct tdls_get_all_peers {
  * @cmd_buf: cmd buffer
  * @len: length of the frame
  * @use_default_ac: access category
- * @tdls_mgmt: tdls managment
+ * @tdls_mgmt: tdls management
  */
 struct tdls_action_frame_request {
 	struct wlan_objmgr_vdev *vdev;
diff --git a/umac/tdls/dispatcher/inc/wlan_tdls_ucfg_api.h b/umac/tdls/dispatcher/inc/wlan_tdls_ucfg_api.h
index ffe3404dc6..1135c48e2d 100644
--- a/umac/tdls/dispatcher/inc/wlan_tdls_ucfg_api.h
+++ b/umac/tdls/dispatcher/inc/wlan_tdls_ucfg_api.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017 The Linux Foundation. All rights reserved.
+ * Copyright (c) 2017-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
@@ -40,7 +40,7 @@
 QDF_STATUS ucfg_tdls_init(void);
 
 /**
- * ucfg_tdls_deinit() - TDLS module deinitilization API
+ * ucfg_tdls_deinit() - TDLS module deinitialization API
  *
  * Return: QDF_STATUS
  */