Răsfoiți Sursa

qcacmn: umac: Replace fallthrough comment with attribute

-Wimplicit-fallthrough is being enabled by default. Some compilers
such as clang require the attribute instead of just a fallthrough comment.

Change-Id: Idc7c80891aed551db5b6b87eba7b44b6c75ecad3
CRs-Fixed: 3217348
David Oladunjoye 3 ani în urmă
părinte
comite
46468556c8

+ 1 - 1
umac/dcs/core/src/wlan_dcs.c

@@ -896,7 +896,7 @@ wlan_dcs_awgn_get_intf_for_seg(struct wlan_host_dcs_awgn_info *awgn_info,
 static enum wlan_dcs_chan_seg wlan_dcs_get_max_seg_idx(enum phy_ch_width width)
 static enum wlan_dcs_chan_seg wlan_dcs_get_max_seg_idx(enum phy_ch_width width)
 {
 {
 	switch (width) {
 	switch (width) {
-	case CH_WIDTH_160MHZ: /* fallthrough */
+	case CH_WIDTH_160MHZ:
 	case CH_WIDTH_80P80MHZ:
 	case CH_WIDTH_80P80MHZ:
 		return WLAN_DCS_SEG_SEC80;
 		return WLAN_DCS_SEG_SEC80;
 	case CH_WIDTH_80MHZ:
 	case CH_WIDTH_80MHZ:

+ 2 - 2
umac/mlme/connection_mgr/core/src/wlan_cm_connect.c

@@ -1339,7 +1339,7 @@ cm_handle_connect_req_in_non_init_state(struct cnx_mgr *cm_ctx,
 		if (cm_roam_offload_enabled(wlan_vdev_get_psoc(cm_ctx->vdev)))
 		if (cm_roam_offload_enabled(wlan_vdev_get_psoc(cm_ctx->vdev)))
 			cm_flush_pending_request(cm_ctx, ROAM_REQ_PREFIX,
 			cm_flush_pending_request(cm_ctx, ROAM_REQ_PREFIX,
 						 false);
 						 false);
-		/* fallthrough */
+		fallthrough;
 	case WLAN_CM_S_CONNECTED:
 	case WLAN_CM_S_CONNECTED:
 	case WLAN_CM_SS_JOIN_ACTIVE:
 	case WLAN_CM_SS_JOIN_ACTIVE:
 		/*
 		/*
@@ -1362,7 +1362,7 @@ cm_handle_connect_req_in_non_init_state(struct cnx_mgr *cm_ctx,
 		/* In the scan state abort the ongoing scan */
 		/* In the scan state abort the ongoing scan */
 		cm_vdev_scan_cancel(wlan_vdev_get_pdev(cm_ctx->vdev),
 		cm_vdev_scan_cancel(wlan_vdev_get_pdev(cm_ctx->vdev),
 				    cm_ctx->vdev);
 				    cm_ctx->vdev);
-		/* fallthrough */
+		fallthrough;
 	case WLAN_CM_SS_JOIN_PENDING:
 	case WLAN_CM_SS_JOIN_PENDING:
 		/*
 		/*
 		 * In case of scan or join pending there could be 2 scenarios:-
 		 * In case of scan or join pending there could be 2 scenarios:-

+ 2 - 2
umac/mlme/connection_mgr/core/src/wlan_cm_disconnect.c

@@ -636,7 +636,7 @@ cm_handle_discon_req_in_non_connected_state(struct cnx_mgr *cm_ctx,
 		if (cm_roam_offload_enabled(wlan_vdev_get_psoc(cm_ctx->vdev)))
 		if (cm_roam_offload_enabled(wlan_vdev_get_psoc(cm_ctx->vdev)))
 			cm_flush_pending_request(cm_ctx, ROAM_REQ_PREFIX,
 			cm_flush_pending_request(cm_ctx, ROAM_REQ_PREFIX,
 						 false);
 						 false);
-		/* fallthrough */
+		fallthrough;
 	case WLAN_CM_SS_JOIN_ACTIVE:
 	case WLAN_CM_SS_JOIN_ACTIVE:
 		/*
 		/*
 		 * In join active/roaming state, there would be no pending
 		 * In join active/roaming state, there would be no pending
@@ -649,7 +649,7 @@ cm_handle_discon_req_in_non_connected_state(struct cnx_mgr *cm_ctx,
 		/* In the scan state abort the ongoing scan */
 		/* In the scan state abort the ongoing scan */
 		cm_vdev_scan_cancel(wlan_vdev_get_pdev(cm_ctx->vdev),
 		cm_vdev_scan_cancel(wlan_vdev_get_pdev(cm_ctx->vdev),
 				    cm_ctx->vdev);
 				    cm_ctx->vdev);
-		/* fallthrough */
+		fallthrough;
 	case WLAN_CM_SS_JOIN_PENDING:
 	case WLAN_CM_SS_JOIN_PENDING:
 		/*
 		/*
 		 * There would be pending disconnect requests in the list, and
 		 * There would be pending disconnect requests in the list, and

+ 1 - 1
umac/mlme/connection_mgr/core/src/wlan_cm_sm.c

@@ -575,7 +575,7 @@ static bool cm_subst_join_pending_event(void *ctx, uint16_t event,
 	case WLAN_CM_SM_EV_SCAN_FAILURE:
 	case WLAN_CM_SM_EV_SCAN_FAILURE:
 		status = QDF_STATUS_E_FAILURE;
 		status = QDF_STATUS_E_FAILURE;
 		/* Fall through after setting status failure */
 		/* Fall through after setting status failure */
-		/* fallthrough */
+		fallthrough;
 	case WLAN_CM_SM_EV_SCAN_SUCCESS:
 	case WLAN_CM_SM_EV_SCAN_SUCCESS:
 		cm_connect_scan_resp(cm_ctx, data, status);
 		cm_connect_scan_resp(cm_ctx, data, status);
 		break;
 		break;

+ 3 - 3
umac/mlme/vdev_mgr/core/src/vdev_mlme_sm.c

@@ -1785,7 +1785,7 @@ static bool mlme_vdev_subst_up_active_event(void *ctx, uint16_t event,
 	case WLAN_VDEV_SM_EV_START_SUCCESS:
 	case WLAN_VDEV_SM_EV_START_SUCCESS:
 		if (wlan_vdev_mlme_is_mlo_ap(vdev))
 		if (wlan_vdev_mlme_is_mlo_ap(vdev))
 			QDF_BUG(0);
 			QDF_BUG(0);
-		/* fallthrough */
+		fallthrough;
 	case WLAN_VDEV_SM_EV_MLO_SYNC_COMPLETE:
 	case WLAN_VDEV_SM_EV_MLO_SYNC_COMPLETE:
 		mlme_vdev_update_beacon(vdev_mlme, BEACON_INIT,
 		mlme_vdev_update_beacon(vdev_mlme, BEACON_INIT,
 					event_data_len, event_data);
 					event_data_len, event_data);
@@ -1808,7 +1808,7 @@ static bool mlme_vdev_subst_up_active_event(void *ctx, uint16_t event,
 		/* These events are not supported in STA mode */
 		/* These events are not supported in STA mode */
 		if (mode == QDF_STA_MODE)
 		if (mode == QDF_STA_MODE)
 			QDF_BUG(0);
 			QDF_BUG(0);
-		/* fallthrough */
+		fallthrough;
 	case WLAN_VDEV_SM_EV_DOWN:
 	case WLAN_VDEV_SM_EV_DOWN:
 		mlme_vdev_sm_transition_to(vdev_mlme, WLAN_VDEV_S_SUSPEND);
 		mlme_vdev_sm_transition_to(vdev_mlme, WLAN_VDEV_S_SUSPEND);
 		mlme_vdev_sm_deliver_event(vdev_mlme, event,
 		mlme_vdev_sm_deliver_event(vdev_mlme, event,
@@ -1831,7 +1831,7 @@ static bool mlme_vdev_subst_up_active_event(void *ctx, uint16_t event,
 		/* Reinit beacon, send template to FW(use ping-pong buffer) */
 		/* Reinit beacon, send template to FW(use ping-pong buffer) */
 		mlme_vdev_update_beacon(vdev_mlme, BEACON_UPDATE,
 		mlme_vdev_update_beacon(vdev_mlme, BEACON_UPDATE,
 					event_data_len, event_data);
 					event_data_len, event_data);
-		/* fallthrough */
+		fallthrough;
 	case WLAN_VDEV_SM_EV_START:
 	case WLAN_VDEV_SM_EV_START:
 		/* notify that UP command is completed */
 		/* notify that UP command is completed */
 		mlme_vdev_notify_up_complete(vdev_mlme,
 		mlme_vdev_notify_up_complete(vdev_mlme,

+ 1 - 1
umac/scan/core/src/wlan_scan_filter.c

@@ -507,7 +507,7 @@ static bool scm_is_security_match(struct scan_filter *filter,
 			if (match)
 			if (match)
 				break;
 				break;
 		/* If not OPEN, then check WEP match */
 		/* If not OPEN, then check WEP match */
-		/* fallthrough */
+			fallthrough;
 		case WLAN_CRYPTO_AUTH_SHARED:
 		case WLAN_CRYPTO_AUTH_SHARED:
 			match = scm_check_wep(filter, db_entry, security);
 			match = scm_check_wep(filter, db_entry, security);
 			break;
 			break;

+ 1 - 1
umac/scan/core/src/wlan_scan_manager.c

@@ -1663,7 +1663,7 @@ scm_scan_event_handler(struct scheduler_msg *msg)
 		if (event->reason == SCAN_REASON_COMPLETED)
 		if (event->reason == SCAN_REASON_COMPLETED)
 			scm_11d_decide_country_code(vdev);
 			scm_11d_decide_country_code(vdev);
 		/* release the command */
 		/* release the command */
-		/* fallthrough */
+		fallthrough;
 	case SCAN_EVENT_TYPE_START_FAILED:
 	case SCAN_EVENT_TYPE_START_FAILED:
 	case SCAN_EVENT_TYPE_DEQUEUED:
 	case SCAN_EVENT_TYPE_DEQUEUED:
 		scm_release_serialization_command(vdev, event->scan_id);
 		scm_release_serialization_command(vdev, event->scan_id);

+ 1 - 1
umac/scan/core/src/wlan_scan_manager_6ghz.c

@@ -373,7 +373,7 @@ scm_copy_valid_channels(struct wlan_objmgr_psoc *psoc,
 		 * Consider the complete channel list if firmware supports
 		 * Consider the complete channel list if firmware supports
 		 * RNR_ONLY scan flag/feature.
 		 * RNR_ONLY scan flag/feature.
 		 */
 		 */
-		/* fallthrough */
+		fallthrough;
 	default:
 	default:
 		/*
 		/*
 		 * Allow all 2g/5g/6g channels. Below are also covered in this
 		 * Allow all 2g/5g/6g channels. Below are also covered in this