From: Lennert Buytenhek <buytenh@wantstofly.org>
Date: Thu, 16 Jul 2009 10:34:02 +0000 (+0200)
Subject: mwl8k: remove MWL8K_WMM_* defines
X-Git-Tag: firefly_0821_release~12983^2~335^2~22
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=0439b1f55646ea944b0d58337f5065b79a1c1be0;p=firefly-linux-kernel-4.4.55.git

mwl8k: remove MWL8K_WMM_* defines

Signed-off-by: Lennert Buytenhek <buytenh@marvell.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
---

diff --git a/drivers/net/wireless/mwl8k.c b/drivers/net/wireless/mwl8k.c
index 22500bf59d10..33d7ab517b33 100644
--- a/drivers/net/wireless/mwl8k.c
+++ b/drivers/net/wireless/mwl8k.c
@@ -188,9 +188,7 @@ struct mwl8k_priv {
 
 	bool radio_on;
 	bool radio_short_preamble;
-
-	/* WMM MODE 1 for enabled; 0 for disabled */
-	bool wmm_mode;
+	bool wmm_enabled;
 
 	/* Set if PHY config is in progress */
 	bool inconfig;
@@ -276,10 +274,6 @@ static const struct ieee80211_rate mwl8k_rates[] = {
 	{ .bitrate = 540, .hw_value = 108, },
 };
 
-/* WMM */
-#define MWL8K_WMM_ENABLE		1
-#define MWL8K_WMM_DISABLE		0
-
 /* Slot time */
 
 /* Short Slot: 9us slot time */
@@ -2028,13 +2022,13 @@ static int mwl8k_set_wmm(struct ieee80211_hw *hw, bool enable)
 
 	cmd->header.code = cpu_to_le16(MWL8K_CMD_SET_WMM_MODE);
 	cmd->header.length = cpu_to_le16(sizeof(*cmd));
-	cmd->action = enable ? cpu_to_le16(MWL8K_CMD_SET) : 0;
+	cmd->action = cpu_to_le16(!!enable);
 
 	rc = mwl8k_post_cmd(hw, &cmd->header);
 	kfree(cmd);
 
 	if (!rc)
-		priv->wmm_mode = enable;
+		priv->wmm_enabled = enable;
 
 	return rc;
 }
@@ -2762,7 +2756,7 @@ static int mwl8k_start_wt(struct work_struct *wt)
 	}
 
 	/* Disable WMM. WMM gets enabled when stack sends WMM parms */
-	if (mwl8k_set_wmm(hw, MWL8K_WMM_DISABLE)) {
+	if (mwl8k_set_wmm(hw, 0)) {
 		rc = -EIO;
 		goto mwl8k_start_exit;
 	}
@@ -3272,10 +3266,11 @@ static int mwl8k_conf_tx_wt(struct work_struct *wt)
 	struct mwl8k_priv *priv = hw->priv;
 	int rc = 0;
 
-	if (priv->wmm_mode == MWL8K_WMM_DISABLE)
-		if (mwl8k_set_wmm(hw, MWL8K_WMM_ENABLE)) {
+	if (!priv->wmm_enabled) {
+		if (mwl8k_set_wmm(hw, 1)) {
 			rc = -EINVAL;
 			goto mwl8k_conf_tx_exit;
+		}
 	}
 
 	if (mwl8k_set_edca_params(hw, GET_TXQ(queue), params->cw_min,
@@ -3446,7 +3441,7 @@ static int __devinit mwl8k_probe(struct pci_dev *pdev,
 	priv->hostcmd_wait = NULL;
 	priv->tx_wait = NULL;
 	priv->inconfig = false;
-	priv->wmm_mode = false;
+	priv->wmm_enabled = false;
 	priv->pending_tx_pkts = 0;
 	strncpy(priv->name, MWL8K_NAME, sizeof(priv->name));