Commit 4bc606af authored by Kees Cook's avatar Kees Cook Committed by Kalle Valo
Browse files

libertas: Remove function entry/exit debugging 



In at least one place, the enter/exit debugging was not being correctly
matched. Based on mailing list feedback, it was desired to drop all of
these in favor of using ftrace instead.

Suggested-by: default avatarJoe Perches <joe@perches.com>
Suggested-by: default avatarKalle Valo <kvalo@codeaurora.org>
Signed-off-by: default avatarKees Cook <keescook@chromium.org>
Signed-off-by: default avatarKalle Valo <kvalo@codeaurora.org>
parent 12e3c043

drivers/net/wireless/marvell/libertas/cfg.c

+1 −103
Original line number Diff line number Diff line
@@ -443,17 +443,12 @@ static int lbs_cfg_set_monitor_channel(struct wiphy *wiphy, 
	struct lbs_private *priv = wiphy_priv(wiphy);

	int ret = -ENOTSUPP;



	lbs_deb_enter_args(LBS_DEB_CFG80211, "freq %d, type %d",

			   chandef->chan->center_freq,

			   cfg80211_get_chandef_type(chandef));



	if (cfg80211_get_chandef_type(chandef) != NL80211_CHAN_NO_HT)

		goto out;



	ret = lbs_set_channel(priv, chandef->chan->hw_value);



 out:

	lbs_deb_leave_args(LBS_DEB_CFG80211, "ret %d", ret);

	return ret;

}
@@ -464,16 +459,12 @@ static int lbs_cfg_set_mesh_channel(struct wiphy *wiphy, 
	struct lbs_private *priv = wiphy_priv(wiphy);

	int ret = -ENOTSUPP;



	lbs_deb_enter_args(LBS_DEB_CFG80211, "iface %s freq %d",

			   netdev_name(netdev), channel->center_freq);



	if (netdev != priv->mesh_dev)

		goto out;



	ret = lbs_mesh_set_channel(priv, channel->hw_value);



 out:

	lbs_deb_leave_args(LBS_DEB_CFG80211, "ret %d", ret);

	return ret;

}
@@ -512,8 +503,6 @@ static int lbs_ret_scan(struct lbs_private *priv, unsigned long dummy, 
	int i;

	int ret = -EILSEQ;



	lbs_deb_enter(LBS_DEB_CFG80211);



	bsssize = get_unaligned_le16(&scanresp->bssdescriptsize);



	lbs_deb_scan("scan response: %d BSSs (%d bytes); resp size %d bytes\n",
@@ -665,7 +654,6 @@ static int lbs_ret_scan(struct lbs_private *priv, unsigned long dummy, 
	ret = 0;



 done:

	lbs_deb_leave_args(LBS_DEB_SCAN, "ret %d", ret);

	return ret;

}
@@ -693,11 +681,9 @@ static void lbs_scan_worker(struct work_struct *work) 
	int last_channel;

	int running, carrier;



	lbs_deb_enter(LBS_DEB_SCAN);



	scan_cmd = kzalloc(LBS_SCAN_MAX_CMD_SIZE, GFP_KERNEL);

	if (scan_cmd == NULL)

		goto out_no_scan_cmd;

		return;



	/* prepare fixed part of scan command */

	scan_cmd->bsstype = CMD_BSS_TYPE_ANY;
@@ -766,16 +752,11 @@ static void lbs_scan_worker(struct work_struct *work) 
		lbs_deb_scan("scan: waking up waiters\n");

		wake_up_all(&priv->scan_q);

	}



 out_no_scan_cmd:

	lbs_deb_leave(LBS_DEB_SCAN);

}



static void _internal_start_scan(struct lbs_private *priv, bool internal,

	struct cfg80211_scan_request *request)

{

	lbs_deb_enter(LBS_DEB_CFG80211);



	lbs_deb_scan("scan: ssids %d, channels %d, ie_len %zd\n",

		request->n_ssids, request->n_channels, request->ie_len);
@@ -785,8 +766,6 @@ static void _internal_start_scan(struct lbs_private *priv, bool internal, 


	queue_delayed_work(priv->work_thread, &priv->scan_work,

		msecs_to_jiffies(50));



	lbs_deb_leave(LBS_DEB_CFG80211);

}



/*
@@ -815,8 +794,6 @@ static int lbs_cfg_scan(struct wiphy *wiphy, 
	struct lbs_private *priv = wiphy_priv(wiphy);

	int ret = 0;



	lbs_deb_enter(LBS_DEB_CFG80211);



	if (priv->scan_req || delayed_work_pending(&priv->scan_work)) {

		/* old scan request not yet processed */

		ret = -EAGAIN;
@@ -829,7 +806,6 @@ static int lbs_cfg_scan(struct wiphy *wiphy, 
		ret = -EIO;



 out:

	lbs_deb_leave_args(LBS_DEB_CFG80211, "ret %d", ret);

	return ret;

}
@@ -843,18 +819,12 @@ static int lbs_cfg_scan(struct wiphy *wiphy, 
void lbs_send_disconnect_notification(struct lbs_private *priv,

				      bool locally_generated)

{

	lbs_deb_enter(LBS_DEB_CFG80211);



	cfg80211_disconnected(priv->dev, 0, NULL, 0, locally_generated,

			      GFP_KERNEL);



	lbs_deb_leave(LBS_DEB_CFG80211);

}



void lbs_send_mic_failureevent(struct lbs_private *priv, u32 event)

{

	lbs_deb_enter(LBS_DEB_CFG80211);



	cfg80211_michael_mic_failure(priv->dev,

		priv->assoc_bss,

		event == MACREG_INT_CODE_MIC_ERR_MULTICAST ?
@@ -863,8 +833,6 @@ void lbs_send_mic_failureevent(struct lbs_private *priv, u32 event) 
		-1,

		NULL,

		GFP_KERNEL);



	lbs_deb_leave(LBS_DEB_CFG80211);

}
@@ -883,8 +851,6 @@ static int lbs_remove_wep_keys(struct lbs_private *priv) 
	struct cmd_ds_802_11_set_wep cmd;

	int ret;



	lbs_deb_enter(LBS_DEB_CFG80211);



	memset(&cmd, 0, sizeof(cmd));

	cmd.hdr.size = cpu_to_le16(sizeof(cmd));

	cmd.keyindex = cpu_to_le16(priv->wep_tx_key);
@@ -892,7 +858,6 @@ static int lbs_remove_wep_keys(struct lbs_private *priv) 


	ret = lbs_cmd_with_response(priv, CMD_802_11_SET_WEP, &cmd);



	lbs_deb_leave(LBS_DEB_CFG80211);

	return ret;

}
@@ -905,8 +870,6 @@ static int lbs_set_wep_keys(struct lbs_private *priv) 
	int i;

	int ret;



	lbs_deb_enter(LBS_DEB_CFG80211);



	/*

	 * command         13 00

	 * size            50 00
@@ -956,7 +919,6 @@ static int lbs_set_wep_keys(struct lbs_private *priv) 
		ret = lbs_remove_wep_keys(priv);

	}



	lbs_deb_leave(LBS_DEB_CFG80211);

	return ret;

}
@@ -969,8 +931,6 @@ static int lbs_enable_rsn(struct lbs_private *priv, int enable) 
	struct cmd_ds_802_11_enable_rsn cmd;

	int ret;



	lbs_deb_enter_args(LBS_DEB_CFG80211, "%d", enable);



	/*

	 * cmd       2f 00

	 * size      0c 00
@@ -986,7 +946,6 @@ static int lbs_enable_rsn(struct lbs_private *priv, int enable) 


	ret = lbs_cmd_with_response(priv, CMD_802_11_ENABLE_RSN, &cmd);



	lbs_deb_leave(LBS_DEB_CFG80211);

	return ret;

}
@@ -1014,8 +973,6 @@ static int lbs_set_key_material(struct lbs_private *priv, 
	struct cmd_key_material cmd;

	int ret;



	lbs_deb_enter(LBS_DEB_CFG80211);



	/*

	 * Example for WPA (TKIP):

	 *
@@ -1044,7 +1001,6 @@ static int lbs_set_key_material(struct lbs_private *priv, 


	ret = lbs_cmd_with_response(priv, CMD_802_11_KEY_MATERIAL, &cmd);



	lbs_deb_leave(LBS_DEB_CFG80211);

	return ret;

}
@@ -1061,8 +1017,6 @@ static int lbs_set_authtype(struct lbs_private *priv, 
	struct cmd_ds_802_11_authenticate cmd;

	int ret;



	lbs_deb_enter_args(LBS_DEB_CFG80211, "%d", sme->auth_type);



	/*

	 * cmd        11 00

	 * size       19 00
@@ -1085,7 +1039,6 @@ static int lbs_set_authtype(struct lbs_private *priv, 
	ret = lbs_cmd_with_response(priv, CMD_802_11_AUTHENTICATE, &cmd);



 done:

	lbs_deb_leave_args(LBS_DEB_CFG80211, "ret %d", ret);

	return ret;

}
@@ -1116,8 +1069,6 @@ static int lbs_associate(struct lbs_private *priv, 
	u8 *pos;

	u8 *tmp;



	lbs_deb_enter(LBS_DEB_CFG80211);



	if (!cmd) {

		ret = -ENOMEM;

		goto done;
@@ -1262,7 +1213,6 @@ static int lbs_associate(struct lbs_private *priv, 


	kfree(cmd);

done:

	lbs_deb_leave_args(LBS_DEB_CFG80211, "ret %d", ret);

	return ret;

}
@@ -1329,8 +1279,6 @@ static int lbs_cfg_connect(struct wiphy *wiphy, struct net_device *dev, 
	if (dev == priv->mesh_dev)

		return -EOPNOTSUPP;



	lbs_deb_enter(LBS_DEB_CFG80211);



	if (!sme->bssid) {

		struct cfg80211_scan_request *creq;
@@ -1442,7 +1390,6 @@ static int lbs_cfg_connect(struct wiphy *wiphy, struct net_device *dev, 
 done:

	if (bss)

		cfg80211_put_bss(wiphy, bss);

	lbs_deb_leave_args(LBS_DEB_CFG80211, "ret %d", ret);

	return ret;

}
@@ -1478,8 +1425,6 @@ static int lbs_cfg_disconnect(struct wiphy *wiphy, struct net_device *dev, 
	if (dev == priv->mesh_dev)

		return -EOPNOTSUPP;



	lbs_deb_enter_args(LBS_DEB_CFG80211, "reason_code %d", reason_code);



	/* store for lbs_cfg_ret_disconnect() */

	priv->disassoc_reason = reason_code;
@@ -1496,8 +1441,6 @@ static int lbs_cfg_set_default_key(struct wiphy *wiphy, 
	if (netdev == priv->mesh_dev)

		return -EOPNOTSUPP;



	lbs_deb_enter(LBS_DEB_CFG80211);



	if (key_index != priv->wep_tx_key) {

		lbs_deb_assoc("set_default_key: to %d\n", key_index);

		priv->wep_tx_key = key_index;
@@ -1520,8 +1463,6 @@ static int lbs_cfg_add_key(struct wiphy *wiphy, struct net_device *netdev, 
	if (netdev == priv->mesh_dev)

		return -EOPNOTSUPP;



	lbs_deb_enter(LBS_DEB_CFG80211);



	lbs_deb_assoc("add_key: cipher 0x%x, mac_addr %pM\n",

		      params->cipher, mac_addr);

	lbs_deb_assoc("add_key: key index %d, key len %d\n",
@@ -1575,8 +1516,6 @@ static int lbs_cfg_del_key(struct wiphy *wiphy, struct net_device *netdev, 
			   u8 key_index, bool pairwise, const u8 *mac_addr)

{



	lbs_deb_enter(LBS_DEB_CFG80211);



	lbs_deb_assoc("del_key: key_idx %d, mac_addr %pM\n",

		      key_index, mac_addr);
@@ -1619,8 +1558,6 @@ static int lbs_cfg_get_station(struct wiphy *wiphy, struct net_device *dev, 
	int ret;

	size_t i;



	lbs_deb_enter(LBS_DEB_CFG80211);



	sinfo->filled |= BIT(NL80211_STA_INFO_TX_BYTES) |

			 BIT(NL80211_STA_INFO_TX_PACKETS) |

			 BIT(NL80211_STA_INFO_RX_BYTES) |
@@ -1675,15 +1612,12 @@ static int lbs_change_intf(struct wiphy *wiphy, struct net_device *dev, 
		return -EOPNOTSUPP;

	}



	lbs_deb_enter(LBS_DEB_CFG80211);



	if (priv->iface_running)

		ret = lbs_set_iface_type(priv, type);



	if (!ret)

		priv->wdev->iftype = type;



	lbs_deb_leave_args(LBS_DEB_CFG80211, "ret %d", ret);

	return ret;

}
@@ -1713,8 +1647,6 @@ static void lbs_join_post(struct lbs_private *priv, 
	u8 *fake = fake_ie;

	struct cfg80211_bss *bss;



	lbs_deb_enter(LBS_DEB_CFG80211);



	/*

	 * For cfg80211_inform_bss, we'll need a fake IE, as we can't get

	 * the real IE from the firmware. So we fabricate a fake IE based on
@@ -1777,8 +1709,6 @@ static void lbs_join_post(struct lbs_private *priv, 
	netif_carrier_on(priv->dev);

	if (!priv->tx_pending_len)

		netif_wake_queue(priv->dev);



	lbs_deb_leave(LBS_DEB_CFG80211);

}



static int lbs_ibss_join_existing(struct lbs_private *priv,
@@ -1790,8 +1720,6 @@ static int lbs_ibss_join_existing(struct lbs_private *priv, 
	u8 preamble = RADIO_PREAMBLE_SHORT;

	int ret = 0;



	lbs_deb_enter(LBS_DEB_CFG80211);



	/* TODO: set preamble based on scan result */

	ret = lbs_set_radio(priv, preamble, 1);

	if (ret)
@@ -1888,7 +1816,6 @@ static int lbs_ibss_join_existing(struct lbs_private *priv, 
	lbs_join_post(priv, params, bss->bssid, bss->capability);



 out:

	lbs_deb_leave_args(LBS_DEB_CFG80211, "ret %d", ret);

	return ret;

}
@@ -1904,8 +1831,6 @@ static int lbs_ibss_start_new(struct lbs_private *priv, 
	int ret = 0;

	u16 capability;



	lbs_deb_enter(LBS_DEB_CFG80211);



	ret = lbs_set_radio(priv, preamble, 1);

	if (ret)

		goto out;
@@ -1975,7 +1900,6 @@ static int lbs_ibss_start_new(struct lbs_private *priv, 
	lbs_join_post(priv, params, resp->bssid, capability);



 out:

	lbs_deb_leave_args(LBS_DEB_CFG80211, "ret %d", ret);

	return ret;

}
@@ -1990,8 +1914,6 @@ static int lbs_join_ibss(struct wiphy *wiphy, struct net_device *dev, 
	if (dev == priv->mesh_dev)

		return -EOPNOTSUPP;



	lbs_deb_enter(LBS_DEB_CFG80211);



	if (!params->chandef.chan) {

		ret = -ENOTSUPP;

		goto out;
@@ -2015,7 +1937,6 @@ static int lbs_join_ibss(struct wiphy *wiphy, struct net_device *dev, 




 out:

	lbs_deb_leave_args(LBS_DEB_CFG80211, "ret %d", ret);

	return ret;

}
@@ -2029,8 +1950,6 @@ static int lbs_leave_ibss(struct wiphy *wiphy, struct net_device *dev) 
	if (dev == priv->mesh_dev)

		return -EOPNOTSUPP;



	lbs_deb_enter(LBS_DEB_CFG80211);



	memset(&cmd, 0, sizeof(cmd));

	cmd.hdr.size = cpu_to_le16(sizeof(cmd));

	ret = lbs_cmd_with_response(priv, CMD_802_11_AD_HOC_STOP, &cmd);
@@ -2038,7 +1957,6 @@ static int lbs_leave_ibss(struct wiphy *wiphy, struct net_device *dev) 
	/* TODO: consider doing this at MACREG_INT_CODE_ADHOC_BCN_LOST time */

	lbs_mac_event_disconnected(priv, true);



	lbs_deb_leave_args(LBS_DEB_CFG80211, "ret %d", ret);

	return ret;

}
@@ -2114,8 +2032,6 @@ struct wireless_dev *lbs_cfg_alloc(struct device *dev) 
	int ret = 0;

	struct wireless_dev *wdev;



	lbs_deb_enter(LBS_DEB_CFG80211);



	wdev = kzalloc(sizeof(struct wireless_dev), GFP_KERNEL);

	if (!wdev)

		return ERR_PTR(-ENOMEM);
@@ -2127,12 +2043,10 @@ struct wireless_dev *lbs_cfg_alloc(struct device *dev) 
		goto err_wiphy_new;

	}



	lbs_deb_leave(LBS_DEB_CFG80211);

	return wdev;



 err_wiphy_new:

	kfree(wdev);

	lbs_deb_leave_args(LBS_DEB_CFG80211, "ret %d", ret);

	return ERR_PTR(ret);

}
@@ -2155,15 +2069,11 @@ static void lbs_cfg_set_regulatory_hint(struct lbs_private *priv) 
	};

	size_t i;



	lbs_deb_enter(LBS_DEB_CFG80211);



	for (i = 0; i < ARRAY_SIZE(regmap); i++)

		if (regmap[i].code == priv->regioncode) {

			regulatory_hint(priv->wdev->wiphy, regmap[i].cn);

			break;

		}



	lbs_deb_leave(LBS_DEB_CFG80211);

}



static void lbs_reg_notifier(struct wiphy *wiphy,
@@ -2171,15 +2081,9 @@ static void lbs_reg_notifier(struct wiphy *wiphy, 
{

	struct lbs_private *priv = wiphy_priv(wiphy);



	lbs_deb_enter_args(LBS_DEB_CFG80211, "cfg80211 regulatory domain "

			"callback for domain %c%c\n", request->alpha2[0],

			request->alpha2[1]);



	memcpy(priv->country_code, request->alpha2, sizeof(request->alpha2));

	if (lbs_iface_active(priv))

		lbs_set_11d_domain_info(priv);



	lbs_deb_leave(LBS_DEB_CFG80211);

}



/*
@@ -2192,8 +2096,6 @@ int lbs_cfg_register(struct lbs_private *priv) 
	struct wireless_dev *wdev = priv->wdev;

	int ret;



	lbs_deb_enter(LBS_DEB_CFG80211);



	wdev->wiphy->max_scan_ssids = 1;

	wdev->wiphy->signal_type = CFG80211_SIGNAL_TYPE_MBM;
@@ -2229,13 +2131,11 @@ int lbs_cfg_register(struct lbs_private *priv) 


	lbs_cfg_set_regulatory_hint(priv);



	lbs_deb_leave_args(LBS_DEB_CFG80211, "ret %d", ret);

	return ret;

}



void lbs_scan_deinit(struct lbs_private *priv)

{

	lbs_deb_enter(LBS_DEB_CFG80211);

	cancel_delayed_work_sync(&priv->scan_work);

}
@@ -2244,8 +2144,6 @@ void lbs_cfg_free(struct lbs_private *priv) 
{

	struct wireless_dev *wdev = priv->wdev;



	lbs_deb_enter(LBS_DEB_CFG80211);



	if (!wdev)

		return;

drivers/net/wireless/marvell/libertas/cmd.c

+7 −109
Original line number Diff line number Diff line
@@ -91,8 +91,6 @@ int lbs_update_hw_spec(struct lbs_private *priv) 
	int ret = -1;

	u32 i;



	lbs_deb_enter(LBS_DEB_CMD);



	memset(&cmd, 0, sizeof(cmd));

	cmd.hdr.size = cpu_to_le16(sizeof(cmd));

	memcpy(cmd.permanentaddr, priv->current_addr, ETH_ALEN);
@@ -159,14 +157,12 @@ int lbs_update_hw_spec(struct lbs_private *priv) 
	}



out:

	lbs_deb_leave(LBS_DEB_CMD);

	return ret;

}



static int lbs_ret_host_sleep_cfg(struct lbs_private *priv, unsigned long dummy,

			struct cmd_header *resp)

{

	lbs_deb_enter(LBS_DEB_CMD);

	if (priv->is_host_sleep_activated) {

		priv->is_host_sleep_configured = 0;

		if (priv->psstate == PS_STATE_FULL_POWER) {
@@ -176,7 +172,7 @@ static int lbs_ret_host_sleep_cfg(struct lbs_private *priv, unsigned long dummy, 
	} else {

		priv->is_host_sleep_configured = 1;

	}

	lbs_deb_leave(LBS_DEB_CMD);



	return 0;

}
@@ -236,8 +232,6 @@ int lbs_set_ps_mode(struct lbs_private *priv, u16 cmd_action, bool block) 
	struct cmd_ds_802_11_ps_mode cmd;

	int ret = 0;



	lbs_deb_enter(LBS_DEB_CMD);



	memset(&cmd, 0, sizeof(cmd));

	cmd.hdr.size = cpu_to_le16(sizeof(cmd));

	cmd.action = cpu_to_le16(cmd_action);
@@ -262,7 +256,6 @@ int lbs_set_ps_mode(struct lbs_private *priv, u16 cmd_action, bool block) 
		lbs_cmd_async(priv, CMD_802_11_PS_MODE, &cmd.hdr, sizeof (cmd));



out:

	lbs_deb_leave_args(LBS_DEB_CMD, "ret %d", ret);

	return ret;

}
@@ -272,8 +265,6 @@ int lbs_cmd_802_11_sleep_params(struct lbs_private *priv, uint16_t cmd_action, 
	struct cmd_ds_802_11_sleep_params cmd;

	int ret;



	lbs_deb_enter(LBS_DEB_CMD);



	if (cmd_action == CMD_ACT_GET) {

		memset(&cmd, 0, sizeof(cmd));

	} else {
@@ -304,7 +295,6 @@ int lbs_cmd_802_11_sleep_params(struct lbs_private *priv, uint16_t cmd_action, 
		sp->sp_reserved = le16_to_cpu(cmd.reserved);

	}



	lbs_deb_leave_args(LBS_DEB_CMD, "ret %d", ret);

	return ret;

}
@@ -312,8 +302,6 @@ static int lbs_wait_for_ds_awake(struct lbs_private *priv) 
{

	int ret = 0;



	lbs_deb_enter(LBS_DEB_CMD);



	if (priv->is_deep_sleep) {

		if (!wait_event_interruptible_timeout(priv->ds_awake_q,

					!priv->is_deep_sleep, (10 * HZ))) {
@@ -322,7 +310,6 @@ static int lbs_wait_for_ds_awake(struct lbs_private *priv) 
		}

	}



	lbs_deb_leave_args(LBS_DEB_CMD, "ret %d", ret);

	return ret;

}
@@ -330,8 +317,6 @@ int lbs_set_deep_sleep(struct lbs_private *priv, int deep_sleep) 
{

	int ret =  0;



	lbs_deb_enter(LBS_DEB_CMD);



	if (deep_sleep) {

		if (priv->is_deep_sleep != 1) {

			lbs_deb_cmd("deep sleep: sleep\n");
@@ -358,7 +343,6 @@ int lbs_set_deep_sleep(struct lbs_private *priv, int deep_sleep) 
		}

	}



	lbs_deb_leave_args(LBS_DEB_CMD, "ret %d", ret);

	return ret;

}
@@ -366,10 +350,9 @@ static int lbs_ret_host_sleep_activate(struct lbs_private *priv, 
		unsigned long dummy,

		struct cmd_header *cmd)

{

	lbs_deb_enter(LBS_DEB_FW);

	priv->is_host_sleep_activated = 1;

	wake_up_interruptible(&priv->host_sleep_q);

	lbs_deb_leave(LBS_DEB_FW);



	return 0;

}
@@ -379,8 +362,6 @@ int lbs_set_host_sleep(struct lbs_private *priv, int host_sleep) 
	int ret = 0;

	uint32_t criteria = EHS_REMOVE_WAKEUP;



	lbs_deb_enter(LBS_DEB_CMD);



	if (host_sleep) {

		if (priv->is_host_sleep_activated != 1) {

			memset(&cmd, 0, sizeof(cmd));
@@ -438,8 +419,6 @@ int lbs_set_snmp_mib(struct lbs_private *priv, u32 oid, u16 val) 
	struct cmd_ds_802_11_snmp_mib cmd;

	int ret;



	lbs_deb_enter(LBS_DEB_CMD);



	memset(&cmd, 0, sizeof (cmd));

	cmd.hdr.size = cpu_to_le16(sizeof(cmd));

	cmd.action = cpu_to_le16(CMD_ACT_SET);
@@ -470,7 +449,6 @@ int lbs_set_snmp_mib(struct lbs_private *priv, u32 oid, u16 val) 
	ret = lbs_cmd_with_response(priv, CMD_802_11_SNMP_MIB, &cmd);



out:

	lbs_deb_leave_args(LBS_DEB_CMD, "ret %d", ret);

	return ret;

}
@@ -488,8 +466,6 @@ int lbs_get_snmp_mib(struct lbs_private *priv, u32 oid, u16 *out_val) 
	struct cmd_ds_802_11_snmp_mib cmd;

	int ret;



	lbs_deb_enter(LBS_DEB_CMD);



	memset(&cmd, 0, sizeof (cmd));

	cmd.hdr.size = cpu_to_le16(sizeof(cmd));

	cmd.action = cpu_to_le16(CMD_ACT_GET);
@@ -513,7 +489,6 @@ int lbs_get_snmp_mib(struct lbs_private *priv, u32 oid, u16 *out_val) 
	}



out:

	lbs_deb_leave_args(LBS_DEB_CMD, "ret %d", ret);

	return ret;

}
@@ -533,8 +508,6 @@ int lbs_get_tx_power(struct lbs_private *priv, s16 *curlevel, s16 *minlevel, 
	struct cmd_ds_802_11_rf_tx_power cmd;

	int ret;



	lbs_deb_enter(LBS_DEB_CMD);



	memset(&cmd, 0, sizeof(cmd));

	cmd.hdr.size = cpu_to_le16(sizeof(cmd));

	cmd.action = cpu_to_le16(CMD_ACT_GET);
@@ -548,7 +521,6 @@ int lbs_get_tx_power(struct lbs_private *priv, s16 *curlevel, s16 *minlevel, 
			*maxlevel = cmd.maxlevel;

	}



	lbs_deb_leave(LBS_DEB_CMD);

	return ret;

}
@@ -565,8 +537,6 @@ int lbs_set_tx_power(struct lbs_private *priv, s16 dbm) 
	struct cmd_ds_802_11_rf_tx_power cmd;

	int ret;



	lbs_deb_enter(LBS_DEB_CMD);



	memset(&cmd, 0, sizeof(cmd));

	cmd.hdr.size = cpu_to_le16(sizeof(cmd));

	cmd.action = cpu_to_le16(CMD_ACT_SET);
@@ -576,7 +546,6 @@ int lbs_set_tx_power(struct lbs_private *priv, s16 dbm) 


	ret = lbs_cmd_with_response(priv, CMD_802_11_RF_TX_POWER, &cmd);



	lbs_deb_leave(LBS_DEB_CMD);

	return ret;

}
@@ -608,7 +577,6 @@ int lbs_set_monitor_mode(struct lbs_private *priv, int enable) 
						ARPHRD_ETHER;

	}



	lbs_deb_leave(LBS_DEB_CMD);

	return ret;

}
@@ -624,8 +592,6 @@ static int lbs_get_channel(struct lbs_private *priv) 
	struct cmd_ds_802_11_rf_channel cmd;

	int ret = 0;



	lbs_deb_enter(LBS_DEB_CMD);



	memset(&cmd, 0, sizeof(cmd));

	cmd.hdr.size = cpu_to_le16(sizeof(cmd));

	cmd.action = cpu_to_le16(CMD_OPT_802_11_RF_CHANNEL_GET);
@@ -638,7 +604,6 @@ static int lbs_get_channel(struct lbs_private *priv) 
	lbs_deb_cmd("current radio channel is %d\n", ret);



out:

	lbs_deb_leave_args(LBS_DEB_CMD, "ret %d", ret);

	return ret;

}
@@ -647,14 +612,12 @@ int lbs_update_channel(struct lbs_private *priv) 
	int ret;



	/* the channel in f/w could be out of sync; get the current channel */

	lbs_deb_enter(LBS_DEB_ASSOC);



	ret = lbs_get_channel(priv);

	if (ret > 0) {

		priv->channel = ret;

		ret = 0;

	}

	lbs_deb_leave_args(LBS_DEB_ASSOC, "ret %d", ret);



	return ret;

}
@@ -674,8 +637,6 @@ int lbs_set_channel(struct lbs_private *priv, u8 channel) 
#endif

	int ret = 0;



	lbs_deb_enter(LBS_DEB_CMD);



	memset(&cmd, 0, sizeof(cmd));

	cmd.hdr.size = cpu_to_le16(sizeof(cmd));

	cmd.action = cpu_to_le16(CMD_OPT_802_11_RF_CHANNEL_SET);
@@ -690,7 +651,6 @@ int lbs_set_channel(struct lbs_private *priv, u8 channel) 
		priv->channel);



out:

	lbs_deb_leave_args(LBS_DEB_CMD, "ret %d", ret);

	return ret;

}
@@ -708,8 +668,6 @@ int lbs_get_rssi(struct lbs_private *priv, s8 *rssi, s8 *nf) 
	struct cmd_ds_802_11_rssi cmd;

	int ret = 0;



	lbs_deb_enter(LBS_DEB_CMD);



	BUG_ON(rssi == NULL);

	BUG_ON(nf == NULL);
@@ -724,7 +682,6 @@ int lbs_get_rssi(struct lbs_private *priv, s8 *rssi, s8 *nf) 
		*rssi = CAL_RSSI(le16_to_cpu(cmd.n_or_snr), le16_to_cpu(cmd.nf));

	}



	lbs_deb_leave_args(LBS_DEB_CMD, "ret %d", ret);

	return ret;

}
@@ -752,7 +709,6 @@ int lbs_set_11d_domain_info(struct lbs_private *priv) 
	size_t triplet_size;

	int ret = 0;



	lbs_deb_enter(LBS_DEB_11D);

	if (!priv->country_code[0])

		goto out;
@@ -849,7 +805,6 @@ int lbs_set_11d_domain_info(struct lbs_private *priv) 
	ret = lbs_cmd_with_response(priv, CMD_802_11D_DOMAIN_INFO, &cmd);



out:

	lbs_deb_leave_args(LBS_DEB_11D, "ret %d", ret);

	return ret;

}
@@ -869,8 +824,6 @@ int lbs_get_reg(struct lbs_private *priv, u16 reg, u16 offset, u32 *value) 
	struct cmd_ds_reg_access cmd;

	int ret = 0;



	lbs_deb_enter(LBS_DEB_CMD);



	BUG_ON(value == NULL);



	memset(&cmd, 0, sizeof(cmd));
@@ -894,7 +847,6 @@ int lbs_get_reg(struct lbs_private *priv, u16 reg, u16 offset, u32 *value) 
	}



out:

	lbs_deb_leave_args(LBS_DEB_CMD, "ret %d", ret);

	return ret;

}
@@ -914,8 +866,6 @@ int lbs_set_reg(struct lbs_private *priv, u16 reg, u16 offset, u32 value) 
	struct cmd_ds_reg_access cmd;

	int ret = 0;



	lbs_deb_enter(LBS_DEB_CMD);



	memset(&cmd, 0, sizeof(cmd));

	cmd.hdr.size = cpu_to_le16(sizeof(cmd));

	cmd.action = cpu_to_le16(CMD_ACT_SET);
@@ -933,7 +883,6 @@ int lbs_set_reg(struct lbs_private *priv, u16 reg, u16 offset, u32 value) 
	ret = lbs_cmd_with_response(priv, reg, &cmd);



out:

	lbs_deb_leave_args(LBS_DEB_CMD, "ret %d", ret);

	return ret;

}
@@ -943,15 +892,13 @@ static void lbs_queue_cmd(struct lbs_private *priv, 
	unsigned long flags;

	int addtail = 1;



	lbs_deb_enter(LBS_DEB_HOST);



	if (!cmdnode) {

		lbs_deb_host("QUEUE_CMD: cmdnode is NULL\n");

		goto done;

		return;

	}

	if (!cmdnode->cmdbuf->size) {

		lbs_deb_host("DNLD_CMD: cmd size is zero\n");

		goto done;

		return;

	}

	cmdnode->result = 0;
@@ -979,9 +926,6 @@ static void lbs_queue_cmd(struct lbs_private *priv, 


	lbs_deb_host("QUEUE_CMD: inserted command 0x%04x into cmdpendingq\n",

		     le16_to_cpu(cmdnode->cmdbuf->command));



done:

	lbs_deb_leave(LBS_DEB_HOST);

}



static void lbs_submit_command(struct lbs_private *priv,
@@ -994,8 +938,6 @@ static void lbs_submit_command(struct lbs_private *priv, 
	int timeo = 3 * HZ;

	int ret;



	lbs_deb_enter(LBS_DEB_HOST);



	cmd = cmdnode->cmdbuf;



	spin_lock_irqsave(&priv->driver_lock, flags);
@@ -1036,8 +978,6 @@ static void lbs_submit_command(struct lbs_private *priv, 
		/* Setup the timer after transmit command */

		mod_timer(&priv->command_timer, jiffies + timeo);

	}



	lbs_deb_leave(LBS_DEB_HOST);

}



/*
@@ -1047,10 +987,8 @@ static void lbs_submit_command(struct lbs_private *priv, 
static void __lbs_cleanup_and_insert_cmd(struct lbs_private *priv,

					 struct cmd_ctrl_node *cmdnode)

{

	lbs_deb_enter(LBS_DEB_HOST);



	if (!cmdnode)

		goto out;

		return;



	cmdnode->callback = NULL;

	cmdnode->callback_arg = 0;
@@ -1058,8 +996,6 @@ static void __lbs_cleanup_and_insert_cmd(struct lbs_private *priv, 
	memset(cmdnode->cmdbuf, 0, LBS_CMD_BUFFER_SIZE);



	list_add_tail(&cmdnode->list, &priv->cmdfreeq);

 out:

	lbs_deb_leave(LBS_DEB_HOST);

}



static void lbs_cleanup_and_insert_cmd(struct lbs_private *priv,
@@ -1107,8 +1043,6 @@ int lbs_set_radio(struct lbs_private *priv, u8 preamble, u8 radio_on) 
	struct cmd_ds_802_11_radio_control cmd;

	int ret = -EINVAL;



	lbs_deb_enter(LBS_DEB_CMD);



	cmd.hdr.size = cpu_to_le16(sizeof(cmd));

	cmd.action = cpu_to_le16(CMD_ACT_SET);

	cmd.control = 0;
@@ -1141,7 +1075,6 @@ int lbs_set_radio(struct lbs_private *priv, u8 preamble, u8 radio_on) 
	ret = lbs_cmd_with_response(priv, CMD_802_11_RADIO_CONTROL, &cmd);



out:

	lbs_deb_leave_args(LBS_DEB_CMD, "ret %d", ret);

	return ret;

}
@@ -1149,15 +1082,11 @@ void lbs_set_mac_control(struct lbs_private *priv) 
{

	struct cmd_ds_mac_control cmd;



	lbs_deb_enter(LBS_DEB_CMD);



	cmd.hdr.size = cpu_to_le16(sizeof(cmd));

	cmd.action = cpu_to_le16(priv->mac_control);

	cmd.reserved = 0;



	lbs_cmd_async(priv, CMD_MAC_CONTROL, &cmd.hdr, sizeof(cmd));



	lbs_deb_leave(LBS_DEB_CMD);

}



int lbs_set_mac_control_sync(struct lbs_private *priv)
@@ -1165,14 +1094,11 @@ int lbs_set_mac_control_sync(struct lbs_private *priv) 
	struct cmd_ds_mac_control cmd;

	int ret = 0;



	lbs_deb_enter(LBS_DEB_CMD);



	cmd.hdr.size = cpu_to_le16(sizeof(cmd));

	cmd.action = cpu_to_le16(priv->mac_control);

	cmd.reserved = 0;

	ret = lbs_cmd_with_response(priv, CMD_MAC_CONTROL, &cmd);



	lbs_deb_leave(LBS_DEB_CMD);

	return ret;

}
@@ -1191,8 +1117,6 @@ int lbs_allocate_cmd_buffer(struct lbs_private *priv) 
	u32 i;

	struct cmd_ctrl_node *cmdarray;



	lbs_deb_enter(LBS_DEB_HOST);



	/* Allocate and initialize the command array */

	bufsize = sizeof(struct cmd_ctrl_node) * LBS_NUM_CMD_BUFFERS;

	if (!(cmdarray = kzalloc(bufsize, GFP_KERNEL))) {
@@ -1219,7 +1143,6 @@ int lbs_allocate_cmd_buffer(struct lbs_private *priv) 
	ret = 0;



done:

	lbs_deb_leave_args(LBS_DEB_HOST, "ret %d", ret);

	return ret;

}
@@ -1235,8 +1158,6 @@ int lbs_free_cmd_buffer(struct lbs_private *priv) 
	struct cmd_ctrl_node *cmdarray;

	unsigned int i;



	lbs_deb_enter(LBS_DEB_HOST);



	/* need to check if cmd array is allocated or not */

	if (priv->cmd_array == NULL) {

		lbs_deb_host("FREE_CMD_BUF: cmd_array is NULL\n");
@@ -1260,7 +1181,6 @@ int lbs_free_cmd_buffer(struct lbs_private *priv) 
	}



done:

	lbs_deb_leave(LBS_DEB_HOST);

	return 0;

}
@@ -1278,8 +1198,6 @@ static struct cmd_ctrl_node *lbs_get_free_cmd_node(struct lbs_private *priv) 
	struct cmd_ctrl_node *tempnode;

	unsigned long flags;



	lbs_deb_enter(LBS_DEB_HOST);



	if (!priv)

		return NULL;
@@ -1296,7 +1214,6 @@ static struct cmd_ctrl_node *lbs_get_free_cmd_node(struct lbs_private *priv) 


	spin_unlock_irqrestore(&priv->driver_lock, flags);



	lbs_deb_leave(LBS_DEB_HOST);

	return tempnode;

}
@@ -1318,8 +1235,6 @@ int lbs_execute_next_command(struct lbs_private *priv) 
	/* Debug group is LBS_DEB_THREAD and not LBS_DEB_HOST, because the

	 * only caller to us is lbs_thread() and we get even when a

	 * data packet is received */

	lbs_deb_enter(LBS_DEB_THREAD);



	spin_lock_irqsave(&priv->driver_lock, flags);



	if (priv->cur_cmd) {
@@ -1440,7 +1355,6 @@ int lbs_execute_next_command(struct lbs_private *priv) 


	ret = 0;

done:

	lbs_deb_leave(LBS_DEB_THREAD);

	return ret;

}
@@ -1449,7 +1363,6 @@ static void lbs_send_confirmsleep(struct lbs_private *priv) 
	unsigned long flags;

	int ret;



	lbs_deb_enter(LBS_DEB_HOST);

	lbs_deb_hex(LBS_DEB_HOST, "sleep confirm", (u8 *) &confirm_sleep,

		sizeof(confirm_sleep));
@@ -1457,7 +1370,7 @@ static void lbs_send_confirmsleep(struct lbs_private *priv) 
		sizeof(confirm_sleep));

	if (ret) {

		netdev_alert(priv->dev, "confirm_sleep failed\n");

		goto out;

		return;

	}



	spin_lock_irqsave(&priv->driver_lock, flags);
@@ -1475,9 +1388,6 @@ static void lbs_send_confirmsleep(struct lbs_private *priv) 
		priv->psstate = PS_STATE_SLEEP;



	spin_unlock_irqrestore(&priv->driver_lock, flags);



out:

	lbs_deb_leave(LBS_DEB_HOST);

}



/**
@@ -1493,8 +1403,6 @@ void lbs_ps_confirm_sleep(struct lbs_private *priv) 
	unsigned long flags =0;

	int allowed = 1;



	lbs_deb_enter(LBS_DEB_HOST);



	spin_lock_irqsave(&priv->driver_lock, flags);

	if (priv->dnld_sent) {

		allowed = 0;
@@ -1520,8 +1428,6 @@ void lbs_ps_confirm_sleep(struct lbs_private *priv) 
	} else {

		lbs_deb_host("sleep confirm has been delayed\n");

	}



	lbs_deb_leave(LBS_DEB_HOST);

}
@@ -1596,8 +1502,6 @@ struct cmd_ctrl_node *__lbs_cmd_async(struct lbs_private *priv, 
{

	struct cmd_ctrl_node *cmdnode;



	lbs_deb_enter(LBS_DEB_HOST);



	if (priv->surpriseremoved) {

		lbs_deb_host("PREP_CMD: card removed\n");

		cmdnode = ERR_PTR(-ENOENT);
@@ -1643,17 +1547,14 @@ struct cmd_ctrl_node *__lbs_cmd_async(struct lbs_private *priv, 
	wake_up(&priv->waitq);



 done:

	lbs_deb_leave_args(LBS_DEB_HOST, "ret %p", cmdnode);

	return cmdnode;

}



void lbs_cmd_async(struct lbs_private *priv, uint16_t command,

	struct cmd_header *in_cmd, int in_cmd_size)

{

	lbs_deb_enter(LBS_DEB_CMD);

	__lbs_cmd_async(priv, command, in_cmd, in_cmd_size,

		lbs_cmd_async_callback, 0);

	lbs_deb_leave(LBS_DEB_CMD);

}



int __lbs_cmd(struct lbs_private *priv, uint16_t command,
@@ -1665,8 +1566,6 @@ int __lbs_cmd(struct lbs_private *priv, uint16_t command, 
	unsigned long flags;

	int ret = 0;



	lbs_deb_enter(LBS_DEB_HOST);



	cmdnode = __lbs_cmd_async(priv, command, in_cmd, in_cmd_size,

				  callback, callback_arg);

	if (IS_ERR(cmdnode)) {
@@ -1693,7 +1592,6 @@ int __lbs_cmd(struct lbs_private *priv, uint16_t command, 
	spin_unlock_irqrestore(&priv->driver_lock, flags);



done:

	lbs_deb_leave_args(LBS_DEB_HOST, "ret %d", ret);

	return ret;

}

EXPORT_SYMBOL_GPL(__lbs_cmd);

drivers/net/wireless/marvell/libertas/cmdresp.c

+0 −9
Original line number Diff line number Diff line
@@ -32,8 +32,6 @@ void lbs_mac_event_disconnected(struct lbs_private *priv, 
	if (priv->connect_status != LBS_CONNECTED)

		return;



	lbs_deb_enter(LBS_DEB_ASSOC);



	/*

	 * Cisco AP sends EAP failure and de-auth in less than 0.5 ms.

	 * It causes problem in the Supplicant
@@ -61,7 +59,6 @@ void lbs_mac_event_disconnected(struct lbs_private *priv, 
		lbs_deb_cmd("disconnected, so exit PS mode\n");

		lbs_set_ps_mode(priv, PS_MODE_ACTION_EXIT_PS, false);

	}

	lbs_deb_leave(LBS_DEB_ASSOC);

}



int lbs_process_command_response(struct lbs_private *priv, u8 *data, u32 len)
@@ -72,8 +69,6 @@ int lbs_process_command_response(struct lbs_private *priv, u8 *data, u32 len) 
	unsigned long flags;

	uint16_t result;



	lbs_deb_enter(LBS_DEB_HOST);



	mutex_lock(&priv->lock);

	spin_lock_irqsave(&priv->driver_lock, flags);
@@ -221,7 +216,6 @@ int lbs_process_command_response(struct lbs_private *priv, u8 *data, u32 len) 


done:

	mutex_unlock(&priv->lock);

	lbs_deb_leave_args(LBS_DEB_HOST, "ret %d", ret);

	return ret;

}
@@ -230,8 +224,6 @@ int lbs_process_event(struct lbs_private *priv, u32 event) 
	int ret = 0;

	struct cmd_header cmd;



	lbs_deb_enter(LBS_DEB_CMD);



	switch (event) {

	case MACREG_INT_CODE_LINK_SENSED:

		lbs_deb_cmd("EVENT: link sensed\n");
@@ -359,6 +351,5 @@ int lbs_process_event(struct lbs_private *priv, u32 event) 
		break;

	}



	lbs_deb_leave_args(LBS_DEB_CMD, "ret %d", ret);

	return ret;

}

drivers/net/wireless/marvell/libertas/defs.h

+0 −9
Original line number Diff line number Diff line
@@ -55,15 +55,6 @@ do { if ((lbs_debug & (grp)) == (grp)) \ 
#define LBS_DEB_LL(grp, grpnam, fmt, args...) do {} while (0)

#endif



#define lbs_deb_enter(grp) \

  LBS_DEB_LL(grp | LBS_DEB_ENTER, " enter", "%s()\n", __func__);

#define lbs_deb_enter_args(grp, fmt, args...) \

  LBS_DEB_LL(grp | LBS_DEB_ENTER, " enter", "%s(" fmt ")\n", __func__, ## args);

#define lbs_deb_leave(grp) \

  LBS_DEB_LL(grp | LBS_DEB_LEAVE, " leave", "%s()\n", __func__);

#define lbs_deb_leave_args(grp, fmt, args...) \

  LBS_DEB_LL(grp | LBS_DEB_LEAVE, " leave", "%s(), " fmt "\n", \

  __func__, ##args);

#define lbs_deb_main(fmt, args...)      LBS_DEB_LL(LBS_DEB_MAIN, " main", fmt, ##args)

#define lbs_deb_net(fmt, args...)       LBS_DEB_LL(LBS_DEB_NET, " net", fmt, ##args)

#define lbs_deb_mesh(fmt, args...)      LBS_DEB_LL(LBS_DEB_MESH, " mesh", fmt, ##args)

drivers/net/wireless/marvell/libertas/ethtool.c

+0 −3
Original line number Diff line number Diff line
@@ -41,8 +41,6 @@ static int lbs_ethtool_get_eeprom(struct net_device *dev, 
	struct cmd_ds_802_11_eeprom_access cmd;

	int ret;



	lbs_deb_enter(LBS_DEB_ETHTOOL);



	if (eeprom->offset + eeprom->len > LBS_EEPROM_LEN ||

	    eeprom->len > LBS_EEPROM_READ_LEN) {

		ret = -EINVAL;
@@ -59,7 +57,6 @@ static int lbs_ethtool_get_eeprom(struct net_device *dev, 
		memcpy(bytes, cmd.value, eeprom->len);



out:

	lbs_deb_leave_args(LBS_DEB_ETHTOOL, "ret %d", ret);

        return ret;

}

CRA Git | Maintained and supported by SUSTech CRA and CCSE