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

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

mwl8k: Fix checkpatch.pl and sparse warnings and errors 



Fix checkpatch errors and warnings comprising of indent errors, spaces and
__packed warnings. Also fix 'make C = 2' warnings.

Signed-off-by: default avatarYogesh Ashok Powar <yogeshp@marvell.com>
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent 1296433b

drivers/net/wireless/mwl8k.c

+13 −14
Original line number Original line Diff line number Diff line
@@ -701,7 +701,7 @@ static int mwl8k_load_firmware(struct ieee80211_hw *hw) 
			       "helper image\n", pci_name(priv->pdev));

			       "helper image\n", pci_name(priv->pdev));

			return rc;

			return rc;

		}

		}

		msleep(5);

		msleep(20);





		rc = mwl8k_feed_fw_image(priv, fw->data, fw->size);

		rc = mwl8k_feed_fw_image(priv, fw->data, fw->size);

	} else {

	} else {
@@ -823,8 +823,8 @@ static void mwl8k_encapsulate_tx_frame(struct sk_buff *skb) 
	/*

	/*

	 * Make sure the packet header is in the DMA header format (4-address

	 * Make sure the packet header is in the DMA header format (4-address

	 * without QoS), the necessary crypto padding between the header and the

	 * without QoS), the necessary crypto padding between the header and the

	 * payload has already been provided by mac80211, but it doesn't add tail

	 * payload has already been provided by mac80211, but it doesn't add

	 * padding when HW crypto is enabled.

	 * tail padding when HW crypto is enabled.

	 *

	 *

	 * We have the following trailer padding requirements:

	 * We have the following trailer padding requirements:

	 * - WEP: 4 trailer bytes (ICV)

	 * - WEP: 4 trailer bytes (ICV)
@@ -1487,9 +1487,8 @@ static int mwl8k_tx_wait_empty(struct ieee80211_hw *hw) 




		if (timeout) {

		if (timeout) {

			WARN_ON(priv->pending_tx_pkts);

			WARN_ON(priv->pending_tx_pkts);

			if (retry) {

			if (retry)

				wiphy_notice(hw->wiphy, "tx rings drained\n");

				wiphy_notice(hw->wiphy, "tx rings drained\n");

			}

			break;

			break;

		}

		}
@@ -1688,7 +1687,7 @@ static void mwl8k_txq_deinit(struct ieee80211_hw *hw, int index) 
}

}





/* caller must hold priv->stream_lock when calling the stream functions */

/* caller must hold priv->stream_lock when calling the stream functions */

struct mwl8k_ampdu_stream *

static struct mwl8k_ampdu_stream *

mwl8k_add_stream(struct ieee80211_hw *hw, struct ieee80211_sta *sta, u8 tid)

mwl8k_add_stream(struct ieee80211_hw *hw, struct ieee80211_sta *sta, u8 tid)

{

{

	struct mwl8k_ampdu_stream *stream;

	struct mwl8k_ampdu_stream *stream;
@@ -2657,7 +2656,7 @@ struct mwl8k_cmd_tx_power { 
	__le16 bw;

	__le16 bw;

	__le16 sub_ch;

	__le16 sub_ch;

	__le16 power_level_list[MWL8K_TX_POWER_LEVEL_TOTAL];

	__le16 power_level_list[MWL8K_TX_POWER_LEVEL_TOTAL];

} __attribute__((packed));

} __packed;





static int mwl8k_cmd_tx_power(struct ieee80211_hw *hw,

static int mwl8k_cmd_tx_power(struct ieee80211_hw *hw,

				     struct ieee80211_conf *conf,

				     struct ieee80211_conf *conf,
@@ -3520,13 +3519,13 @@ static int mwl8k_cmd_bss_start(struct ieee80211_hw *hw, 
#define BASTREAM_FLAG_DIRECTION_UPSTREAM	0x00

#define BASTREAM_FLAG_DIRECTION_UPSTREAM	0x00

#define BASTREAM_FLAG_IMMEDIATE_TYPE		0x01

#define BASTREAM_FLAG_IMMEDIATE_TYPE		0x01





enum {

enum ba_stream_action_type {

	MWL8K_BA_CREATE,

	MWL8K_BA_CREATE,

	MWL8K_BA_UPDATE,

	MWL8K_BA_UPDATE,

	MWL8K_BA_DESTROY,

	MWL8K_BA_DESTROY,

	MWL8K_BA_FLUSH,

	MWL8K_BA_FLUSH,

	MWL8K_BA_CHECK,

	MWL8K_BA_CHECK,

} ba_stream_action_type;

};









struct mwl8k_create_ba_stream {

struct mwl8k_create_ba_stream {
@@ -3780,7 +3779,7 @@ struct mwl8k_cmd_update_encryption { 
	__u8 mac_addr[6];

	__u8 mac_addr[6];

	__u8 encr_type;

	__u8 encr_type;





} __attribute__((packed));

} __packed;





struct mwl8k_cmd_set_key {

struct mwl8k_cmd_set_key {

	struct mwl8k_cmd_pkt header;

	struct mwl8k_cmd_pkt header;
@@ -3800,7 +3799,7 @@ struct mwl8k_cmd_set_key { 
	__le16 tkip_tsc_low;

	__le16 tkip_tsc_low;

	__le32 tkip_tsc_high;

	__le32 tkip_tsc_high;

	__u8 mac_addr[6];

	__u8 mac_addr[6];

} __attribute__((packed));

} __packed;





enum {

enum {

	MWL8K_ENCR_ENABLE,

	MWL8K_ENCR_ENABLE,
@@ -4502,7 +4501,7 @@ mwl8k_bss_info_changed_sta(struct ieee80211_hw *hw, struct ieee80211_vif *vif, 
			   struct ieee80211_bss_conf *info, u32 changed)

			   struct ieee80211_bss_conf *info, u32 changed)

{

{

	struct mwl8k_priv *priv = hw->priv;

	struct mwl8k_priv *priv = hw->priv;

	u32 ap_legacy_rates;

	u32 ap_legacy_rates = 0;

	u8 ap_mcs_rates[16];

	u8 ap_mcs_rates[16];

	int rc;

	int rc;