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

Commit 500f747c authored by Yogesh Ashok Powar's avatar Yogesh Ashok Powar Committed by John W. Linville
Browse files

mwifiex: fix checkpatch --strict warnings/errors Part 8 



For files sta_event.c and sta_ioctl.c

Signed-off-by: default avatarYogesh Ashok Powar <yogeshp@marvell.com>
Signed-off-by: default avatarBing Zhao <bzhao@marvell.com>
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent 9c05fd72

drivers/net/wireless/mwifiex/sta_event.c

+22 −19
Original line number Diff line number Diff line
@@ -115,9 +115,9 @@ mwifiex_reset_connect_state(struct mwifiex_private *priv) 
	if (adapter->num_cmd_timeout && adapter->curr_cmd)

		return;

	priv->media_connected = false;

	dev_dbg(adapter->dev, "info: successfully disconnected from"

			" %pM: reason code %d\n", priv->cfg_bssid,

			WLAN_REASON_DEAUTH_LEAVING);

	dev_dbg(adapter->dev,

		"info: successfully disconnected from %pM: reason code %d\n",

		priv->cfg_bssid, WLAN_REASON_DEAUTH_LEAVING);

	if (priv->bss_mode == NL80211_IFTYPE_STATION) {

		cfg80211_disconnected(priv->netdev, WLAN_REASON_DEAUTH_LEAVING,

				      NULL, 0, GFP_KERNEL);
@@ -192,8 +192,8 @@ int mwifiex_process_sta_event(struct mwifiex_private *priv) 


	switch (eventcause) {

	case EVENT_DUMMY_HOST_WAKEUP_SIGNAL:

		dev_err(adapter->dev, "invalid EVENT: DUMMY_HOST_WAKEUP_SIGNAL,"

				" ignoring it\n");

		dev_err(adapter->dev,

			"invalid EVENT: DUMMY_HOST_WAKEUP_SIGNAL, ignore it\n");

		break;

	case EVENT_LINK_SENSED:

		dev_dbg(adapter->dev, "event: LINK_SENSED\n");
@@ -235,8 +235,7 @@ int mwifiex_process_sta_event(struct mwifiex_private *priv) 
	case EVENT_PS_AWAKE:

		dev_dbg(adapter->dev, "info: EVENT: AWAKE\n");

		if (!adapter->pps_uapsd_mode &&

			priv->media_connected &&

			adapter->sleep_period.period) {

		    priv->media_connected && adapter->sleep_period.period) {

				adapter->pps_uapsd_mode = true;

				dev_dbg(adapter->dev,

					"event: PPS/UAPSD mode activated\n");
@@ -244,17 +243,21 @@ int mwifiex_process_sta_event(struct mwifiex_private *priv) 
		adapter->tx_lock_flag = false;

		if (adapter->pps_uapsd_mode && adapter->gen_null_pkt) {

			if (mwifiex_check_last_packet_indication(priv)) {

				if (!adapter->data_sent) {

					if (!mwifiex_send_null_packet(priv,

					MWIFIEX_TxPD_POWER_MGMT_NULL_PACKET

					|

				if (adapter->data_sent) {

					adapter->ps_state = PS_STATE_AWAKE;

					adapter->pm_wakeup_card_req = false;

					adapter->pm_wakeup_fw_try = false;

					break;

				}

				if (!mwifiex_send_null_packet

					(priv,

					 MWIFIEX_TxPD_POWER_MGMT_NULL_PACKET |

					 MWIFIEX_TxPD_POWER_MGMT_LAST_PACKET))

						adapter->ps_state =

							PS_STATE_SLEEP;

					return 0;

			}

		}

		}

		adapter->ps_state = PS_STATE_AWAKE;

		adapter->pm_wakeup_card_req = false;

		adapter->pm_wakeup_fw_try = false;

drivers/net/wireless/mwifiex/sta_ioctl.c

+51 −51
Original line number Diff line number Diff line
@@ -266,9 +266,8 @@ int mwifiex_bss_start(struct mwifiex_private *priv, struct cfg80211_bss *bss, 
		/* Adhoc mode */

		/* If the requested SSID matches current SSID, return */

		if (bss_desc && bss_desc->ssid.ssid_len &&

		    (!mwifiex_ssid_cmp

		     (&priv->curr_bss_params.bss_descriptor.ssid,

		      &bss_desc->ssid))) {

		    (!mwifiex_ssid_cmp(&priv->curr_bss_params.bss_descriptor.

				       ssid, &bss_desc->ssid))) {

			kfree(bss_desc);

			kfree(beacon_ie);

			return 0;
@@ -350,9 +349,8 @@ static int mwifiex_set_hs_params(struct mwifiex_private *priv, u16 action, 
				adapter->hs_cfg.gpio = (u8)hs_cfg->gpio;

				if (hs_cfg->gap)

					adapter->hs_cfg.gap = (u8)hs_cfg->gap;

			} else if (adapter->hs_cfg.conditions ==

						cpu_to_le32(

						HOST_SLEEP_CFG_CANCEL)) {

			} else if (adapter->hs_cfg.conditions

				   == cpu_to_le32(HOST_SLEEP_CFG_CANCEL)) {

				/* Return failure if no parameters for HS

				   enable */

				status = -1;
@@ -653,7 +651,8 @@ mwifiex_drv_change_adhoc_chan(struct mwifiex_private *priv, u16 channel) 


	band = mwifiex_band_to_radio_type(priv->curr_bss_params.band);

	chan = __ieee80211_get_channel(priv->wdev->wiphy,

			ieee80211_channel_to_frequency(channel, band));

				       ieee80211_channel_to_frequency(channel,

								      band));



	/* Find the BSS we want using available scan results */

	bss = cfg80211_get_bss(priv->wdev->wiphy, chan, bss_info.bssid,
@@ -790,7 +789,9 @@ int mwifiex_drv_get_data_rate(struct mwifiex_private *priv, 
	if (!ret) {

		if (rate->is_rate_auto)

			rate->rate = mwifiex_index_to_data_rate(priv,

					priv->tx_rate, priv->tx_htinfo);

								priv->tx_rate,

								priv->tx_htinfo

								);

		else

			rate->rate = priv->data_rate;

	} else {
@@ -844,13 +845,13 @@ int mwifiex_set_tx_power(struct mwifiex_private *priv, 
	txp_cfg->action = cpu_to_le16(HostCmd_ACT_GEN_SET);

	if (!power_cfg->is_power_auto) {

		txp_cfg->mode = cpu_to_le32(1);

		pg_tlv = (struct mwifiex_types_power_group *) (buf +

				sizeof(struct host_cmd_ds_txpwr_cfg));

		pg_tlv = (struct mwifiex_types_power_group *)

			 (buf + sizeof(struct host_cmd_ds_txpwr_cfg));

		pg_tlv->type = TLV_TYPE_POWER_GROUP;

		pg_tlv->length = 4 * sizeof(struct mwifiex_power_group);

		pg = (struct mwifiex_power_group *) (buf +

				sizeof(struct host_cmd_ds_txpwr_cfg) +

				sizeof(struct mwifiex_types_power_group));

		pg = (struct mwifiex_power_group *)

		     (buf + sizeof(struct host_cmd_ds_txpwr_cfg)

		      + sizeof(struct mwifiex_types_power_group));

		/* Power group for modulation class HR/DSSS */

		pg->first_rate_code = 0x00;

		pg->last_rate_code = 0x03;
@@ -913,8 +914,8 @@ int mwifiex_drv_set_power(struct mwifiex_private *priv, u32 *ps_mode) 
				    sub_cmd, BITMAP_STA_PS, NULL);

	if ((!ret) && (sub_cmd == DIS_AUTO_PS))

		ret = mwifiex_send_cmd_async(priv,

				HostCmd_CMD_802_11_PS_MODE_ENH, GET_PS,

				0, NULL);

					     HostCmd_CMD_802_11_PS_MODE_ENH,

					     GET_PS, 0, NULL);



	return ret;

}
@@ -1101,8 +1102,8 @@ static int mwifiex_sec_ioctl_set_wpa_key(struct mwifiex_private *priv, 
		encrypt_key->key_index = MWIFIEX_KEY_INDEX_UNICAST;

		ret = mwifiex_send_cmd_async(priv,

					     HostCmd_CMD_802_11_KEY_MATERIAL,

					HostCmd_ACT_GEN_SET, KEY_INFO_ENABLED,

					encrypt_key);

					     HostCmd_ACT_GEN_SET,

					     KEY_INFO_ENABLED, encrypt_key);

		if (ret)

			return ret;
@@ -1128,13 +1129,13 @@ static int mwifiex_sec_ioctl_set_wpa_key(struct mwifiex_private *priv, 
	if (remove_key)

		ret = mwifiex_send_cmd_sync(priv,

					    HostCmd_CMD_802_11_KEY_MATERIAL,

				       HostCmd_ACT_GEN_SET, !(KEY_INFO_ENABLED),

				       encrypt_key);

					    HostCmd_ACT_GEN_SET,

					    !KEY_INFO_ENABLED, encrypt_key);

	else

		ret = mwifiex_send_cmd_sync(priv,

					    HostCmd_CMD_802_11_KEY_MATERIAL,

					HostCmd_ACT_GEN_SET, KEY_INFO_ENABLED,

					encrypt_key);

					    HostCmd_ACT_GEN_SET,

					    KEY_INFO_ENABLED, encrypt_key);



	return ret;

}
@@ -1410,9 +1411,9 @@ mwifiex_set_gen_ie_helper(struct mwifiex_private *priv, u8 *ie_data_ptr, 
	}

	pvendor_ie = (struct ieee_types_vendor_header *) ie_data_ptr;

	/* Test to see if it is a WPA IE, if not, then it is a gen IE */

	if (((pvendor_ie->element_id == WLAN_EID_WPA)

	     && (!memcmp(pvendor_ie->oui, wpa_oui, sizeof(wpa_oui))))

			|| (pvendor_ie->element_id == WLAN_EID_RSN)) {

	if (((pvendor_ie->element_id == WLAN_EID_WPA) &&

	     (!memcmp(pvendor_ie->oui, wpa_oui, sizeof(wpa_oui)))) ||

	    (pvendor_ie->element_id == WLAN_EID_RSN)) {



		/* IE is a WPA/WPA2 IE so call set_wpa function */

		ret = mwifiex_set_wpa_ie_helper(priv, ie_data_ptr, ie_len);
@@ -1435,9 +1436,8 @@ mwifiex_set_gen_ie_helper(struct mwifiex_private *priv, u8 *ie_data_ptr, 
		 * wps session flag

		 */

		pvendor_ie = (struct ieee_types_vendor_header *) ie_data_ptr;

		if ((pvendor_ie->element_id == WLAN_EID_VENDOR_SPECIFIC)

				&& (!memcmp(pvendor_ie->oui, wps_oui,

						sizeof(wps_oui)))) {

		if ((pvendor_ie->element_id == WLAN_EID_VENDOR_SPECIFIC) &&

		    (!memcmp(pvendor_ie->oui, wps_oui, sizeof(wps_oui)))) {

			priv->wps.session_enable = true;

			dev_dbg(priv->adapter->dev,

				"info: WPS Session Enabled.\n");