mwifiex: fix checkpatch --strict warnings/errors Part 1 (84266841) · Commits · e / devices / android_kernel_sony_msm8998

drivers/net/wireless/mwifiex/11n.c

+11 −11

drivers/net/wireless/mwifiex/11n.h

+3 −4

Original line number	Original line	Diff line number	Diff line
	@@ -86,9 +86,8 @@ mwifiex_is_ampdu_allowed(struct mwifiex_private *priv, int tid)
	static inline u8		static inline u8
	mwifiex_is_amsdu_allowed(struct mwifiex_private *priv, int tid)		mwifiex_is_amsdu_allowed(struct mwifiex_private *priv, int tid)
	{		{
	return (((priv->aggr_prio_tbl[tid].amsdu != BA_STREAM_NOT_ALLOWED)		return (((priv->aggr_prio_tbl[tid].amsdu != BA_STREAM_NOT_ALLOWED) &&
	&& ((priv->is_data_rate_auto)		(priv->is_data_rate_auto \|\| !(priv->bitmap_rates[2] & 0x03)))
	\|\| !((priv->bitmap_rates[2]) & 0x03)))
	? true : false);		? true : false);
	}		}

drivers/net/wireless/mwifiex/11n_aggr.c

+7 −8

Original line number	Original line	Diff line number	Diff line
	@@ -125,8 +125,8 @@ mwifiex_11n_form_amsdu_txpd(struct mwifiex_private *priv,
	/* TxCtrl set by user or default */		/* TxCtrl set by user or default */
	local_tx_pd->tx_control = cpu_to_le32(priv->pkt_tx_ctrl);		local_tx_pd->tx_control = cpu_to_le32(priv->pkt_tx_ctrl);

	if ((GET_BSS_ROLE(priv) == MWIFIEX_BSS_ROLE_STA) &&		if (GET_BSS_ROLE(priv) == MWIFIEX_BSS_ROLE_STA &&
	(priv->adapter->pps_uapsd_mode)) {		priv->adapter->pps_uapsd_mode) {
	if (true == mwifiex_check_last_packet_indication(priv)) {		if (true == mwifiex_check_last_packet_indication(priv)) {
	priv->adapter->tx_lock_flag = true;		priv->adapter->tx_lock_flag = true;
	local_tx_pd->flags =		local_tx_pd->flags =
	@@ -257,9 +257,8 @@ mwifiex_11n_aggregate_pkt(struct mwifiex_private *priv,
	mwifiex_write_data_complete(adapter, skb_aggr, -1);		mwifiex_write_data_complete(adapter, skb_aggr, -1);
	return -1;		return -1;
	}		}
	if ((GET_BSS_ROLE(priv) == MWIFIEX_BSS_ROLE_STA) &&		if (GET_BSS_ROLE(priv) == MWIFIEX_BSS_ROLE_STA &&
	(adapter->pps_uapsd_mode) &&		adapter->pps_uapsd_mode && adapter->tx_lock_flag) {
	(adapter->tx_lock_flag)) {
	priv->adapter->tx_lock_flag = false;		priv->adapter->tx_lock_flag = false;
	if (ptx_pd)		if (ptx_pd)
	ptx_pd->flags = 0;		ptx_pd->flags = 0;

drivers/net/wireless/mwifiex/11n_rxreorder.c

+22 −20

Original line number	Original line	Diff line number	Diff line
	@@ -352,7 +352,8 @@ int mwifiex_cmd_11n_addba_rsp_gen(struct mwifiex_private *priv,
	cmd_addba_req->block_ack_param_set = cpu_to_le16(block_ack_param_set);		cmd_addba_req->block_ack_param_set = cpu_to_le16(block_ack_param_set);

	mwifiex_11n_create_rx_reorder_tbl(priv, cmd_addba_req->peer_mac_addr,		mwifiex_11n_create_rx_reorder_tbl(priv, cmd_addba_req->peer_mac_addr,
	tid, win_size, le16_to_cpu(cmd_addba_req->ssn));		tid, win_size,
			le16_to_cpu(cmd_addba_req->ssn));
	return 0;		return 0;
	}		}

	@@ -416,11 +417,11 @@ int mwifiex_11n_rx_reorder_pkt(struct mwifiex_private *priv,
	* packet		* packet
	*/		*/
	if ((start_win + TWOPOW11) > (MAX_TID_VALUE - 1)) {/* Wrap */		if ((start_win + TWOPOW11) > (MAX_TID_VALUE - 1)) {/* Wrap */
	if (seq_num >= ((start_win + (TWOPOW11)) & (MAX_TID_VALUE - 1))		if (seq_num >= ((start_win + TWOPOW11) &
	&& (seq_num < start_win))		(MAX_TID_VALUE - 1)) && (seq_num < start_win))
	return -1;		return -1;
	} else if ((seq_num < start_win)		} else if ((seq_num < start_win) \|\|
	\|\| (seq_num > (start_win + (TWOPOW11)))) {		(seq_num > (start_win + TWOPOW11))) {
	return -1;		return -1;
	}		}

	@@ -431,10 +432,11 @@ int mwifiex_11n_rx_reorder_pkt(struct mwifiex_private *priv,
	if (pkt_type == PKT_TYPE_BAR)		if (pkt_type == PKT_TYPE_BAR)
	seq_num = ((seq_num + win_size) - 1) & (MAX_TID_VALUE - 1);		seq_num = ((seq_num + win_size) - 1) & (MAX_TID_VALUE - 1);

	if (((end_win < start_win)		if (((end_win < start_win) &&
	&& (seq_num < (TWOPOW11 - (MAX_TID_VALUE - start_win)))		(seq_num < (TWOPOW11 - (MAX_TID_VALUE - start_win))) &&
	&& (seq_num > end_win)) \|\| ((end_win > start_win)		(seq_num > end_win)) \|\|
	&& ((seq_num > end_win) \|\| (seq_num < start_win)))) {		((end_win > start_win) && ((seq_num > end_win) \|\|
			(seq_num < start_win)))) {
	end_win = seq_num;		end_win = seq_num;
	if (((seq_num - win_size) + 1) >= 0)		if (((seq_num - win_size) + 1) >= 0)
	start_win = (end_win - win_size) + 1;		start_win = (end_win - win_size) + 1;
	@@ -483,8 +485,8 @@ mwifiex_del_ba_tbl(struct mwifiex_private priv, int tid, u8 peer_mac,
	else		else
	cleanup_rx_reorder_tbl = (initiator) ? false : true;		cleanup_rx_reorder_tbl = (initiator) ? false : true;

	dev_dbg(priv->adapter->dev, "event: DELBA: %pM tid=%d, "		dev_dbg(priv->adapter->dev, "event: DELBA: %pM tid=%d initiator=%d\n",
	"initiator=%d\n", peer_mac, tid, initiator);		peer_mac, tid, initiator);

	if (cleanup_rx_reorder_tbl) {		if (cleanup_rx_reorder_tbl) {
	tbl = mwifiex_11n_get_rx_reorder_tbl(priv, tid,		tbl = mwifiex_11n_get_rx_reorder_tbl(priv, tid,
	@@ -538,10 +540,10 @@ int mwifiex_ret_11n_addba_resp(struct mwifiex_private *priv,
	IEEE80211_ADDBA_PARAM_BUF_SIZE_MASK)		IEEE80211_ADDBA_PARAM_BUF_SIZE_MASK)
	>> BLOCKACKPARAM_WINSIZE_POS;		>> BLOCKACKPARAM_WINSIZE_POS;

	dev_dbg(priv->adapter->dev, "cmd: ADDBA RSP: %pM"		dev_dbg(priv->adapter->dev,
	" tid=%d ssn=%d win_size=%d\n",		"cmd: ADDBA RSP: %pM tid=%d ssn=%d win_size=%d\n",
	add_ba_rsp->peer_mac_addr,		add_ba_rsp->peer_mac_addr, tid,
	tid, add_ba_rsp->ssn, win_size);		add_ba_rsp->ssn, win_size);
	} else {		} else {
	dev_err(priv->adapter->dev, "ADDBA RSP: failed %pM tid=%d)\n",		dev_err(priv->adapter->dev, "ADDBA RSP: failed %pM tid=%d)\n",
	add_ba_rsp->peer_mac_addr, tid);		add_ba_rsp->peer_mac_addr, tid);

Original line number	Original line	Diff line number	Diff line
	@@ -53,7 +53,7 @@ mwifiex_fill_cap_info(struct mwifiex_private *priv, u8 radio_type,
	sizeof(sband->ht_cap.mcs));		sizeof(sband->ht_cap.mcs));

	if (priv->bss_mode == NL80211_IFTYPE_STATION \|\|		if (priv->bss_mode == NL80211_IFTYPE_STATION \|\|
	(sband->ht_cap.cap & IEEE80211_HT_CAP_SUP_WIDTH_20_40))		sband->ht_cap.cap & IEEE80211_HT_CAP_SUP_WIDTH_20_40)
	/* Set MCS32 for infra mode or ad-hoc mode with 40MHz support */		/* Set MCS32 for infra mode or ad-hoc mode with 40MHz support */
	SETHT_MCS32(ht_cap->ht_cap.mcs.rx_mask);		SETHT_MCS32(ht_cap->ht_cap.mcs.rx_mask);

	@@ -389,9 +389,9 @@ mwifiex_cmd_append_11n_tlv(struct mwifiex_private *priv,
	chan_list->chan_scan_param[0].radio_type =		chan_list->chan_scan_param[0].radio_type =
	mwifiex_band_to_radio_type((u8) bss_desc->bss_band);		mwifiex_band_to_radio_type((u8) bss_desc->bss_band);

	if ((sband->ht_cap.cap & IEEE80211_HT_CAP_SUP_WIDTH_20_40)		if (sband->ht_cap.cap & IEEE80211_HT_CAP_SUP_WIDTH_20_40 &&
	&& (bss_desc->bcn_ht_info->ht_param &		bss_desc->bcn_ht_info->ht_param &
	IEEE80211_HT_PARAM_CHAN_WIDTH_ANY))		IEEE80211_HT_PARAM_CHAN_WIDTH_ANY)
	SET_SECONDARYCHAN(chan_list->chan_scan_param[0].		SET_SECONDARYCHAN(chan_list->chan_scan_param[0].
	radio_type,		radio_type,
	(bss_desc->bcn_ht_info->ht_param &		(bss_desc->bcn_ht_info->ht_param &
	@@ -548,8 +548,8 @@ mwifiex_get_ba_tbl(struct mwifiex_private priv, int tid, u8 ra)

	spin_lock_irqsave(&priv->tx_ba_stream_tbl_lock, flags);		spin_lock_irqsave(&priv->tx_ba_stream_tbl_lock, flags);
	list_for_each_entry(tx_ba_tsr_tbl, &priv->tx_ba_stream_tbl_ptr, list) {		list_for_each_entry(tx_ba_tsr_tbl, &priv->tx_ba_stream_tbl_ptr, list) {
	if ((!memcmp(tx_ba_tsr_tbl->ra, ra, ETH_ALEN))		if (!memcmp(tx_ba_tsr_tbl->ra, ra, ETH_ALEN) &&
	&& (tx_ba_tsr_tbl->tid == tid)) {		tx_ba_tsr_tbl->tid == tid) {
	spin_unlock_irqrestore(&priv->tx_ba_stream_tbl_lock,		spin_unlock_irqrestore(&priv->tx_ba_stream_tbl_lock,
	flags);		flags);
	return tx_ba_tsr_tbl;		return tx_ba_tsr_tbl;