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

Commit 0fe72086 authored by Victor Goldenshtein's avatar Victor Goldenshtein Committed by Luciano Coelho
Browse files

wlcore: cleanup scan debug prints 



Remove scan debug dumps which are rarely used.
Make scan debug prints more clear and short.

Signed-off-by: default avatarVictor Goldenshtein <victorg@ti.com>
Signed-off-by: default avatarEliad Peller <eliad@wizery.com>
Signed-off-by: default avatarLuciano Coelho <luciano.coelho@intel.com>
parent b0ed8a4d

drivers/net/wireless/ti/wlcore/cmd.c

+3 −3
Original line number Original line Diff line number Diff line
@@ -1126,6 +1126,8 @@ int wl12xx_cmd_build_probe_req(struct wl1271 *wl, struct wl12xx_vif *wlvif, 
	u16 template_id_2_4 = wl->scan_templ_id_2_4;

	u16 template_id_2_4 = wl->scan_templ_id_2_4;

	u16 template_id_5 = wl->scan_templ_id_5;

	u16 template_id_5 = wl->scan_templ_id_5;





	wl1271_debug(DEBUG_SCAN, "build probe request band %d", band);



	skb = ieee80211_probereq_get(wl->hw, vif, ssid, ssid_len,

	skb = ieee80211_probereq_get(wl->hw, vif, ssid, ssid_len,

				     ie_len);

				     ie_len);

	if (!skb) {

	if (!skb) {
@@ -1135,8 +1137,6 @@ int wl12xx_cmd_build_probe_req(struct wl1271 *wl, struct wl12xx_vif *wlvif, 
	if (ie_len)

	if (ie_len)

		memcpy(skb_put(skb, ie_len), ie, ie_len);

		memcpy(skb_put(skb, ie_len), ie, ie_len);





	wl1271_dump(DEBUG_SCAN, "PROBE REQ: ", skb->data, skb->len);



	if (sched_scan &&

	if (sched_scan &&

	    (wl->quirks & WLCORE_QUIRK_DUAL_PROBE_TMPL)) {

	    (wl->quirks & WLCORE_QUIRK_DUAL_PROBE_TMPL)) {

		template_id_2_4 = wl->sched_scan_templ_id_2_4;

		template_id_2_4 = wl->sched_scan_templ_id_2_4;
@@ -1172,7 +1172,7 @@ struct sk_buff *wl1271_cmd_build_ap_probe_req(struct wl1271 *wl, 
	if (!skb)

	if (!skb)

		goto out;

		goto out;





	wl1271_dump(DEBUG_SCAN, "AP PROBE REQ: ", skb->data, skb->len);

	wl1271_debug(DEBUG_SCAN, "set ap probe request template");





	rate = wl1271_tx_min_rate_get(wl, wlvif->bitrate_masks[wlvif->band]);

	rate = wl1271_tx_min_rate_get(wl, wlvif->bitrate_masks[wlvif->band]);

	if (wlvif->band == IEEE80211_BAND_2GHZ)

	if (wlvif->band == IEEE80211_BAND_2GHZ)

drivers/net/wireless/ti/wlcore/scan.c

+13 −14
Original line number Original line Diff line number Diff line
@@ -174,17 +174,7 @@ wlcore_scan_get_channels(struct wl1271 *wl, 
		    /* if radar is set, we ignore the passive flag */

		    /* if radar is set, we ignore the passive flag */

		    (radar ||

		    (radar ||

		     !!(flags & IEEE80211_CHAN_PASSIVE_SCAN) == passive)) {

		     !!(flags & IEEE80211_CHAN_PASSIVE_SCAN) == passive)) {

			wl1271_debug(DEBUG_SCAN, "band %d, center_freq %d ",



				     req_channels[i]->band,

				     req_channels[i]->center_freq);

			wl1271_debug(DEBUG_SCAN, "hw_value %d, flags %X",

				     req_channels[i]->hw_value,

				     req_channels[i]->flags);

			wl1271_debug(DEBUG_SCAN, "max_power %d",

				     req_channels[i]->max_power);

			wl1271_debug(DEBUG_SCAN, "min_dwell_time %d max dwell time %d",

				     min_dwell_time_active,

				     max_dwell_time_active);





			if (flags & IEEE80211_CHAN_RADAR) {

			if (flags & IEEE80211_CHAN_RADAR) {

				channels[j].flags |= SCAN_CHANNEL_FLAGS_DFS;

				channels[j].flags |= SCAN_CHANNEL_FLAGS_DFS;
@@ -222,6 +212,17 @@ wlcore_scan_get_channels(struct wl1271 *wl, 
					     *n_pactive_ch);

					     *n_pactive_ch);

			}

			}





			wl1271_debug(DEBUG_SCAN, "freq %d, ch. %d, flags 0x%x, power %d, min/max_dwell %d/%d%s%s",

				     req_channels[i]->center_freq,

				     req_channels[i]->hw_value,

				     req_channels[i]->flags,

				     req_channels[i]->max_power,

				     min_dwell_time_active,

				     max_dwell_time_active,

				     flags & IEEE80211_CHAN_RADAR ?

					", DFS" : "",

				     flags & IEEE80211_CHAN_PASSIVE_SCAN ?

					", PASSIVE" : "");

			j++;

			j++;

		}

		}

	}

	}
@@ -364,7 +365,7 @@ wlcore_scan_sched_scan_ssid_list(struct wl1271 *wl, 
	struct cfg80211_ssid *ssids = req->ssids;

	struct cfg80211_ssid *ssids = req->ssids;

	int ret = 0, type, i, j, n_match_ssids = 0;

	int ret = 0, type, i, j, n_match_ssids = 0;





	wl1271_debug(DEBUG_CMD, "cmd sched scan ssid list");

	wl1271_debug((DEBUG_CMD | DEBUG_SCAN), "cmd sched scan ssid list");





	/* count the match sets that contain SSIDs */

	/* count the match sets that contain SSIDs */

	for (i = 0; i < req->n_match_sets; i++)

	for (i = 0; i < req->n_match_sets; i++)
@@ -442,8 +443,6 @@ wlcore_scan_sched_scan_ssid_list(struct wl1271 *wl, 
		}

		}

	}

	}





	wl1271_dump(DEBUG_SCAN, "SSID_LIST: ", cmd, sizeof(*cmd));



	ret = wl1271_cmd_send(wl, CMD_CONNECTION_SCAN_SSID_CFG, cmd,

	ret = wl1271_cmd_send(wl, CMD_CONNECTION_SCAN_SSID_CFG, cmd,

			      sizeof(*cmd), 0);

			      sizeof(*cmd), 0);

	if (ret < 0) {

	if (ret < 0) {