Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 999ced14 authored by Luca Coelho's avatar Luca Coelho
Browse files

iwlwifi: dvm: fix some fall through warnings 



Some case statements were missing a comment about falling through or
had more text than the compiler can recognize.  Fix that.

Signed-off-by: default avatarLuca Coelho <luciano.coelho@intel.com>
parent d7febc2e

drivers/net/wireless/intel/iwlwifi/dvm/rx.c

+4 −2
Original line number Diff line number Diff line
@@ -2,6 +2,7 @@ 
 *

 * Copyright(c) 2003 - 2014 Intel Corporation. All rights reserved.

 * Copyright(c) 2015 Intel Deutschland GmbH

 * Copyright(c) 2018 Intel Corporation

 *

 * Portions of this file are derived from the ipw3945 project, as well

 * as portionhelp of the ieee80211 subsystem header files.
@@ -592,7 +593,7 @@ static int iwlagn_set_decrypted_flag(struct iwl_priv *priv, 
		if ((decrypt_res & RX_RES_STATUS_DECRYPT_TYPE_MSK) ==

		    RX_RES_STATUS_BAD_KEY_TTAK)

			break;



		/* fall through */

	case RX_RES_STATUS_SEC_TYPE_WEP:

		if ((decrypt_res & RX_RES_STATUS_DECRYPT_TYPE_MSK) ==

		    RX_RES_STATUS_BAD_ICV_MIC) {
@@ -601,6 +602,7 @@ static int iwlagn_set_decrypted_flag(struct iwl_priv *priv, 
			IWL_DEBUG_RX(priv, "Packet destroyed\n");

			return -1;

		}

		/* fall through */

	case RX_RES_STATUS_SEC_TYPE_CCMP:

		if ((decrypt_res & RX_RES_STATUS_DECRYPT_TYPE_MSK) ==

		    RX_RES_STATUS_DECRYPT_OK) {
@@ -729,7 +731,7 @@ static u32 iwlagn_translate_rx_status(struct iwl_priv *priv, u32 decrypt_in) 
			decrypt_out |= RX_RES_STATUS_BAD_KEY_TTAK;

			break;

		}

		/* fall through if TTAK OK */

		/* fall through */

	default:

		if (!(decrypt_in & RX_MPDU_RES_STATUS_ICV_OK))

			decrypt_out |= RX_RES_STATUS_BAD_ICV_MIC;

drivers/net/wireless/intel/iwlwifi/dvm/scan.c

+2 −1
Original line number Diff line number Diff line
@@ -3,6 +3,7 @@ 
 * GPL LICENSE SUMMARY

 *

 * Copyright(c) 2008 - 2014 Intel Corporation. All rights reserved.

 * Copyright(c) 2018        Intel Corporation

 *

 * This program is free software; you can redistribute it and/or modify

 * it under the terms of version 2 of the GNU General Public License as
@@ -418,7 +419,7 @@ static u16 iwl_limit_dwell(struct iwl_priv *priv, u16 dwell_time) 
		limit = (limits[1] * 98) / 100 - IWL_CHANNEL_TUNE_TIME * 2;

		limit /= 2;

		dwell_time = min(limit, dwell_time);

		/* fall through to limit further */

		/* fall through */

	case 1:

		limit = (limits[0] * 98) / 100 - IWL_CHANNEL_TUNE_TIME * 2;

		limit /= n_active;