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

Commit acebe8c1 authored by Zhaoyang Liu's avatar Zhaoyang Liu Committed by Kalle Valo
Browse files

mwifiex: change dbg print func to mwifiex_dbg 



This patch changes all debug print functions from dev_dbg/dev_err/dev_info
to mwifiex specific debug functions.

Signed-off-by: default avatarZhaoyang Liu <liuzy@marvell.com>
Signed-off-by: default avatarCathy Luo <cluo@marvell.com>
Signed-off-by: default avatarAvinash Patil <patila@marvell.com>
Signed-off-by: default avatarKalle Valo <kvalo@codeaurora.org>
parent 868093a9

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

+25 −23
Original line number Diff line number Diff line
@@ -134,7 +134,7 @@ void mwifiex_dfs_cac_work_queue(struct work_struct *work) 


	chandef = priv->dfs_chandef;

	if (priv->wdev.cac_started) {

		dev_dbg(priv->adapter->dev,

		mwifiex_dbg(priv->adapter, MSG,

			    "CAC timer finished; No radar detected\n");

		cfg80211_cac_event(priv->netdev, &chandef,

				   NL80211_RADAR_CAC_FINISHED,
@@ -161,7 +161,7 @@ int mwifiex_cmd_issue_chan_report_request(struct mwifiex_private *priv, 
	cr_req->chan_desc.chan_width = radar_params->chandef->width;

	cr_req->msec_dwell_time = cpu_to_le32(radar_params->cac_time_ms);



	dev_dbg(priv->adapter->dev,

	mwifiex_dbg(priv->adapter, MSG,

		    "11h: issuing DFS Radar check for channel=%d\n",

		    radar_params->chandef->chan->hw_value);
@@ -174,7 +174,7 @@ int mwifiex_cmd_issue_chan_report_request(struct mwifiex_private *priv, 
void mwifiex_abort_cac(struct mwifiex_private *priv)

{

	if (priv->wdev.cac_started) {

		dev_dbg(priv->adapter->dev,

		mwifiex_dbg(priv->adapter, MSG,

			    "Aborting delayed work for CAC.\n");

		cancel_delayed_work_sync(&priv->dfs_cac_work);

		cfg80211_cac_event(priv->netdev, &priv->dfs_chandef,
@@ -199,7 +199,8 @@ int mwifiex_11h_handle_chanrpt_ready(struct mwifiex_private *priv, 
				sizeof(u32));



	if (le32_to_cpu(rpt_event->result) != HostCmd_RESULT_OK) {

		dev_err(priv->adapter->dev, "Error in channel report event\n");

		mwifiex_dbg(priv->adapter, ERROR,

			    "Error in channel report event\n");

		return -1;

	}
@@ -212,7 +213,7 @@ int mwifiex_11h_handle_chanrpt_ready(struct mwifiex_private *priv, 
		switch (le16_to_cpu(rpt->header.type)) {

		case TLV_TYPE_CHANRPT_11H_BASIC:

			if (rpt->map.radar) {

				dev_notice(priv->adapter->dev,

				mwifiex_dbg(priv->adapter, MSG,

					    "RADAR Detected on channel %d!\n",

					    priv->dfs_chandef.chan->hw_value);

				cancel_delayed_work_sync(&priv->dfs_cac_work);
@@ -242,16 +243,17 @@ int mwifiex_11h_handle_radar_detected(struct mwifiex_private *priv, 
	rdr_event = (void *)(skb->data + sizeof(u32));



	if (le32_to_cpu(rdr_event->passed)) {

		dev_notice(priv->adapter->dev,

		mwifiex_dbg(priv->adapter, MSG,

			    "radar detected; indicating kernel\n");

		cfg80211_radar_event(priv->adapter->wiphy, &priv->dfs_chandef,

				     GFP_KERNEL);

		dev_dbg(priv->adapter->dev, "regdomain: %d\n",

		mwifiex_dbg(priv->adapter, MSG, "regdomain: %d\n",

			    rdr_event->reg_domain);

		dev_dbg(priv->adapter->dev, "radar detection type: %d\n",

		mwifiex_dbg(priv->adapter, MSG, "radar detection type: %d\n",

			    rdr_event->det_type);

	} else {

		dev_dbg(priv->adapter->dev, "false radar detection event!\n");

		mwifiex_dbg(priv->adapter, ERROR,

			    "false radar detection event!\n");

	}



	return 0;
@@ -276,7 +278,7 @@ void mwifiex_dfs_chan_sw_work_queue(struct work_struct *work) 


	bss_cfg = &priv->bss_cfg;

	if (!bss_cfg->beacon_period) {

		dev_err(priv->adapter->dev,

		mwifiex_dbg(priv->adapter, ERROR,

			    "channel switch: AP already stopped\n");

		return;

	}
@@ -284,12 +286,12 @@ void mwifiex_dfs_chan_sw_work_queue(struct work_struct *work) 
	mwifiex_uap_set_channel(bss_cfg, priv->dfs_chandef);



	if (mwifiex_config_start_uap(priv, bss_cfg)) {

		dev_dbg(priv->adapter->dev,

		mwifiex_dbg(priv->adapter, ERROR,

			    "Failed to start AP after channel switch\n");

		return;

	}



	dev_notice(priv->adapter->dev,

	mwifiex_dbg(priv->adapter, MSG,

		    "indicating channel switch completion to kernel\n");

	cfg80211_ch_switch_notify(priv->netdev, &priv->dfs_chandef);

}

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

+13 −11
Original line number Diff line number Diff line
@@ -42,7 +42,7 @@ int mwifiex_fill_cap_info(struct mwifiex_private *priv, u8 radio_type, 
					priv->wdev.wiphy->bands[radio_type];



	if (WARN_ON_ONCE(!sband)) {

		dev_err(priv->adapter->dev, "Invalid radio type!\n");

		mwifiex_dbg(priv->adapter, ERROR, "Invalid radio type!\n");

		return -EINVAL;

	}
@@ -184,7 +184,7 @@ int mwifiex_ret_11n_addba_req(struct mwifiex_private *priv, 


	tx_ba_tbl = mwifiex_get_ba_tbl(priv, tid, add_ba_rsp->peer_mac_addr);

	if (tx_ba_tbl) {

		dev_dbg(priv->adapter->dev, "info: BA stream complete\n");

		mwifiex_dbg(priv->adapter, EVENT, "info: BA stream complete\n");

		tx_ba_tbl->ba_status = BA_SETUP_COMPLETE;

		if ((block_ack_param_set & BLOCKACKPARAM_AMSDU_SUPP_MASK) &&

		    priv->add_ba_param.tx_amsdu &&
@@ -197,7 +197,7 @@ int mwifiex_ret_11n_addba_req(struct mwifiex_private *priv, 
			ra_list->ba_status = BA_SETUP_COMPLETE;

		}

	} else {

		dev_err(priv->adapter->dev, "BA stream not created\n");

		mwifiex_dbg(priv->adapter, ERROR, "BA stream not created\n");

	}



	return 0;
@@ -224,7 +224,8 @@ int mwifiex_cmd_recfg_tx_buf(struct mwifiex_private *priv, 
	tx_buf->action = cpu_to_le16(action);

	switch (action) {

	case HostCmd_ACT_GEN_SET:

		dev_dbg(priv->adapter->dev, "cmd: set tx_buf=%d\n", *buf_size);

		mwifiex_dbg(priv->adapter, CMD,

			    "cmd: set tx_buf=%d\n", *buf_size);

		tx_buf->buff_size = cpu_to_le16(*buf_size);

		break;

	case HostCmd_ACT_GEN_GET:
@@ -466,7 +467,8 @@ void mwifiex_11n_delete_tx_ba_stream_tbl_entry(struct mwifiex_private *priv, 
	    mwifiex_is_tx_ba_stream_ptr_valid(priv, tx_ba_tsr_tbl))

		return;



	dev_dbg(priv->adapter->dev, "info: tx_ba_tsr_tbl %p\n", tx_ba_tsr_tbl);

	mwifiex_dbg(priv->adapter, INFO,

		    "info: tx_ba_tsr_tbl %p\n", tx_ba_tsr_tbl);



	list_del(&tx_ba_tsr_tbl->list);
@@ -563,7 +565,7 @@ int mwifiex_send_addba(struct mwifiex_private *priv, int tid, u8 *peer_mac) 
	unsigned long flags;

	u16 block_ack_param_set;



	dev_dbg(priv->adapter->dev, "cmd: %s: tid %d\n", __func__, tid);

	mwifiex_dbg(priv->adapter, CMD, "cmd: %s: tid %d\n", __func__, tid);



	if ((GET_BSS_ROLE(priv) == MWIFIEX_BSS_ROLE_STA) &&

	    ISSUPP_TDLS_ENABLED(priv->adapter->fw_cap_info) &&
@@ -575,7 +577,7 @@ int mwifiex_send_addba(struct mwifiex_private *priv, int tid, u8 *peer_mac) 
		sta_ptr = mwifiex_get_sta_entry(priv, peer_mac);

		if (!sta_ptr) {

			spin_unlock_irqrestore(&priv->sta_list_spinlock, flags);

			dev_warn(priv->adapter->dev,

			mwifiex_dbg(priv->adapter, ERROR,

				    "BA setup with unknown TDLS peer %pM!\n",

				    peer_mac);

			return -1;
@@ -706,7 +708,7 @@ int mwifiex_get_tx_ba_stream_tbl(struct mwifiex_private *priv, 
	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) {

		rx_reo_tbl->tid = (u16) tx_ba_tsr_tbl->tid;

		dev_dbg(priv->adapter->dev, "data: %s tid=%d\n",

		mwifiex_dbg(priv->adapter, DATA, "data: %s tid=%d\n",

			    __func__, rx_reo_tbl->tid);

		memcpy(rx_reo_tbl->ra, tx_ba_tsr_tbl->ra, ETH_ALEN);

		rx_reo_tbl->amsdu = tx_ba_tsr_tbl->amsdu;

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

+3 −4
Original line number Diff line number Diff line
@@ -187,7 +187,6 @@ mwifiex_11n_aggregate_pkt(struct mwifiex_private *priv, 
	skb_aggr = mwifiex_alloc_dma_align_buf(adapter->tx_buf_size,

					       GFP_ATOMIC | GFP_DMA);

	if (!skb_aggr) {

		dev_err(adapter->dev, "%s: alloc skb_aggr\n", __func__);

		spin_unlock_irqrestore(&priv->wmm.ra_list_spinlock,

				       ra_list_flags);

		return -1;
@@ -297,12 +296,12 @@ mwifiex_11n_aggregate_pkt(struct mwifiex_private *priv, 
		tx_info_aggr->flags |= MWIFIEX_BUF_FLAG_REQUEUED_PKT;

		spin_unlock_irqrestore(&priv->wmm.ra_list_spinlock,

				       ra_list_flags);

		dev_dbg(adapter->dev, "data: -EBUSY is returned\n");

		mwifiex_dbg(adapter, ERROR, "data: -EBUSY is returned\n");

		break;

	case -1:

		if (adapter->iface_type != MWIFIEX_PCIE)

			adapter->data_sent = false;

		dev_err(adapter->dev, "%s: host_to_card failed: %#x\n",

		mwifiex_dbg(adapter, ERROR, "%s: host_to_card failed: %#x\n",

			    __func__, ret);

		adapter->dbg.num_tx_host_to_card_failure++;

		mwifiex_write_data_complete(adapter, skb_aggr, 1, ret);

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

+26 −25
Original line number Diff line number Diff line
@@ -51,7 +51,7 @@ static int mwifiex_11n_dispatch_amsdu_pkt(struct mwifiex_private *priv, 
			rx_skb = __skb_dequeue(&list);

			ret = mwifiex_recv_packet(priv, rx_skb);

			if (ret == -1)

				dev_err(priv->adapter->dev,

				mwifiex_dbg(priv->adapter, ERROR,

					    "Rx of A-MSDU failed");

		}

		return 0;
@@ -304,7 +304,7 @@ mwifiex_flush_data(unsigned long context) 
	if (seq_num < 0)

		return;



	dev_dbg(ctx->priv->adapter->dev, "info: flush data %d\n", seq_num);

	mwifiex_dbg(ctx->priv->adapter, INFO, "info: flush data %d\n", seq_num);

	start_win = (ctx->ptr->start_win + seq_num + 1) & (MAX_TID_VALUE - 1);

	mwifiex_11n_dispatch_pkt_until_start_win(ctx->priv, ctx->ptr,

						 start_win);
@@ -367,7 +367,8 @@ mwifiex_11n_create_rx_reorder_tbl(struct mwifiex_private *priv, u8 *ta, 
	}

	spin_unlock_irqrestore(&priv->sta_list_spinlock, flags);



	dev_dbg(priv->adapter->dev, "info: last_seq=%d start_win=%d\n",

	mwifiex_dbg(priv->adapter, INFO,

		    "info: last_seq=%d start_win=%d\n",

		    last_seq, new_node->start_win);



	if (last_seq != MWIFIEX_DEF_11N_RX_SEQ_NUM &&
@@ -382,7 +383,7 @@ mwifiex_11n_create_rx_reorder_tbl(struct mwifiex_private *priv, u8 *ta, 
					GFP_KERNEL);

	if (!new_node->rx_reorder_ptr) {

		kfree((u8 *) new_node);

		dev_err(priv->adapter->dev,

		mwifiex_dbg(priv->adapter, ERROR,

			    "%s: failed to alloc reorder_ptr\n", __func__);

		return;

	}
@@ -467,7 +468,7 @@ int mwifiex_cmd_11n_addba_rsp_gen(struct mwifiex_private *priv, 
						cmd_addba_req->peer_mac_addr);

		if (!sta_ptr) {

			spin_unlock_irqrestore(&priv->sta_list_spinlock, flags);

			dev_warn(priv->adapter->dev,

			mwifiex_dbg(priv->adapter, ERROR,

				    "BA setup with unknown TDLS peer %pM!\n",

				    cmd_addba_req->peer_mac_addr);

			return -1;
@@ -573,12 +574,12 @@ int mwifiex_11n_rx_reorder_pkt(struct mwifiex_private *priv, 
	}



	if (tbl->flags & RXREOR_FORCE_NO_DROP) {

		dev_dbg(priv->adapter->dev,

		mwifiex_dbg(priv->adapter, INFO,

			    "RXREOR_FORCE_NO_DROP when HS is activated\n");

		tbl->flags &= ~RXREOR_FORCE_NO_DROP;

	} else if (init_window_shift && seq_num < start_win &&

		   seq_num >= tbl->init_win) {

		dev_dbg(priv->adapter->dev,

		mwifiex_dbg(priv->adapter, INFO,

			    "Sender TID sequence number reset %d->%d for SSN %d\n",

			    start_win, seq_num, tbl->init_win);

		tbl->start_win = start_win = seq_num;
@@ -668,14 +669,14 @@ mwifiex_del_ba_tbl(struct mwifiex_private *priv, int tid, u8 *peer_mac, 
	else

		cleanup_rx_reorder_tbl = (initiator) ? false : true;



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

	mwifiex_dbg(priv->adapter, EVENT, "event: DELBA: %pM tid=%d initiator=%d\n",

		    peer_mac, tid, initiator);



	if (cleanup_rx_reorder_tbl) {

		tbl = mwifiex_11n_get_rx_reorder_tbl(priv, tid,

								 peer_mac);

		if (!tbl) {

			dev_dbg(priv->adapter->dev,

			mwifiex_dbg(priv->adapter, EVENT,

				    "event: TID, TA not found in table\n");

			return;

		}
@@ -683,7 +684,7 @@ mwifiex_del_ba_tbl(struct mwifiex_private *priv, int tid, u8 *peer_mac, 
	} else {

		ptx_tbl = mwifiex_get_ba_tbl(priv, tid, peer_mac);

		if (!ptx_tbl) {

			dev_dbg(priv->adapter->dev,

			mwifiex_dbg(priv->adapter, EVENT,

				    "event: TID, RA not found in table\n");

			return;

		}
@@ -721,7 +722,7 @@ int mwifiex_ret_11n_addba_resp(struct mwifiex_private *priv, 
	 * the stream

	 */

	if (le16_to_cpu(add_ba_rsp->status_code) != BA_RESULT_SUCCESS) {

		dev_err(priv->adapter->dev, "ADDBA RSP: failed %pM tid=%d)\n",

		mwifiex_dbg(priv->adapter, ERROR, "ADDBA RSP: failed %pM tid=%d)\n",

			    add_ba_rsp->peer_mac_addr, tid);



		tbl = mwifiex_11n_get_rx_reorder_tbl(priv, tid,
@@ -746,7 +747,7 @@ int mwifiex_ret_11n_addba_resp(struct mwifiex_private *priv, 
			tbl->amsdu = false;

	}



	dev_dbg(priv->adapter->dev,

	mwifiex_dbg(priv->adapter, CMD,

		    "cmd: ADDBA RSP: %pM tid=%d ssn=%d win_size=%d\n",

		add_ba_rsp->peer_mac_addr, tid, add_ba_rsp->ssn, win_size);

drivers/net/wireless/mwifiex/cfg80211.c

+259 −203

File changed.

Preview size limit exceeded, changes collapsed.