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

Commit c60b486d authored by Tobin C. Harding's avatar Tobin C. Harding Committed by Greg Kroah-Hartman
Browse files

staging: ks7010: refactor newly separated function 



Checkpatch emits various warnings and checks;

WARNING: Avoid multiple line dereference
CHECK: Alignment should match open parenthesis
WARNING: line over 80 characters
CHECK: Blank lines aren't necessary before a close brace '}'

These are all whitespace fixes.

Refactor whitespace inline with kernel coding style. Fix various
checkpatch warnings.

Signed-off-by: default avatarTobin C. Harding <me@tobin.cc>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 6422c6ef

drivers/staging/ks7010/ks_hostif.c

+17 −25
Original line number Diff line number Diff line
@@ -342,11 +342,14 @@ int hostif_data_indication_wpa(struct ks_wlan_private *priv, 
		DPRINTK(4, "TKIP: protocol=%04X: size=%u\n",

			eth_proto, priv->rx_size);

		/* MIC save */

		memcpy(&RecvMIC[0],

			(priv->rxp) + ((priv->rx_size) - 8), 8);

		memcpy(&RecvMIC[0], (priv->rxp) + ((priv->rx_size) - 8), 8);

		priv->rx_size = priv->rx_size - 8;

		if (auth_type > 0 && auth_type < 4) {	/* auth_type check */

			MichaelMICFunction(&michel_mic, (uint8_t *)priv->wpa.key[auth_type - 1].rx_mic_key, (uint8_t *)priv->rxp, (int)priv->rx_size, (uint8_t)0,	/* priority */

			MichaelMICFunction(&michel_mic,

					   (uint8_t *)priv->wpa.key[auth_type - 1].rx_mic_key,

					   (uint8_t *)priv->rxp,

					   (int)priv->rx_size,

					   (uint8_t)0,	/* priority */

					   (uint8_t *)michel_mic.Result);

		}

		if (memcmp(michel_mic.Result, RecvMIC, 8)) {
@@ -354,9 +357,7 @@ int hostif_data_indication_wpa(struct ks_wlan_private *priv, 
			mic_failure = &priv->wpa.mic_failure;

			/* MIC FAILURE */

			if (mic_failure->last_failure_time &&

				(now -

					mic_failure->last_failure_time) /

				HZ >= 60) {

			    (now - mic_failure->last_failure_time) / HZ >= 60) {

				mic_failure->failure = 0;

			}

			DPRINTK(4, "MIC FAILURE\n");
@@ -366,39 +367,30 @@ int hostif_data_indication_wpa(struct ks_wlan_private *priv, 
			} else if (mic_failure->failure == 1) {

				mic_failure->failure = 2;

				mic_failure->counter =

					(uint16_t)((now -

							mic_failure->

							last_failure_time)

						/ HZ);

					(uint16_t)((now - mic_failure->last_failure_time) / HZ);

				if (!mic_failure->counter)	/* mic_failure counter value range 1-60 */

					mic_failure->counter =

						1;

					mic_failure->counter = 1;

			}

			priv->wpa.mic_failure.

				last_failure_time = now;

			priv->wpa.mic_failure.last_failure_time = now;



			/*  needed parameters: count, keyid, key type, TSC */

			sprintf(buf,

				"MLME-MICHAELMICFAILURE.indication(keyid=%d %scast addr="

				"%pM)",

				auth_type - 1,

				eth_hdr->

				h_dest[0] & 0x01 ? "broad" :

				"uni", eth_hdr->h_source);

				eth_hdr->h_dest[0] & 0x01 ? "broad" : "uni",

				eth_hdr->h_source);

			memset(&wrqu, 0, sizeof(wrqu));

			wrqu.data.length = strlen(buf);

			DPRINTK(4,

				"IWEVENT:MICHAELMICFAILURE\n");

			wireless_send_event(priv->net_dev,

					IWEVCUSTOM, &wrqu,

			DPRINTK(4, "IWEVENT:MICHAELMICFAILURE\n");

			wireless_send_event(priv->net_dev, IWEVCUSTOM, &wrqu,

					    buf);

			return -EINVAL;



		}

	}

	return 0;

}





static

void hostif_data_indication(struct ks_wlan_private *priv)

{