lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

mwl8k: remove MWL8K_RADIO_* defines

Browse Source 
Instead of passing a flag bitmask to mwl8k_cmd_802_11_radio_control,
pass the 'enable' and 'force' arguments as separate parameters, and
introduce wrappers for the common cases of enabling and disabling
without forcing.

Signed-off-by: Lennert Buytenhek <buytenh@marvell.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
This commit is contained in:
Lennert Buytenhek
2009-07-16 12:14:58 +02:00
committed by John W. Linville
parent ce9e2e1b84
commit c46563b714
1 changed files with 26 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

50
drivers/net/wireless/mwl8k.c
View File

@@ -186,9 +186,10 @@ struct mwl8k_priv {
struct ieee80211_channel channels[14]; struct ieee80211_channel channels[14];
struct ieee80211_rate rates[12]; struct ieee80211_rate rates[12];
bool radio_on;
/* RF preamble: Short, Long or Auto */ /* RF preamble: Short, Long or Auto */
u8 radio_preamble; u8 radio_preamble;
u8 radio_state;
/* WMM MODE 1 for enabled; 0 for disabled */ /* WMM MODE 1 for enabled; 0 for disabled */
bool wmm_mode; bool wmm_mode;
@@ -278,9 +279,6 @@ static const struct ieee80211_rate mwl8k_rates[] = {
}; };
/* Radio settings */ /* Radio settings */
#define MWL8K_RADIO_FORCE 0x2
#define MWL8K_RADIO_ENABLE 0x1
#define MWL8K_RADIO_DISABLE 0x0
#define MWL8K_RADIO_AUTO_PREAMBLE 0x0005 #define MWL8K_RADIO_AUTO_PREAMBLE 0x0005
#define MWL8K_RADIO_SHORT_PREAMBLE 0x0003 #define MWL8K_RADIO_SHORT_PREAMBLE 0x0003
#define MWL8K_RADIO_LONG_PREAMBLE 0x0001 #define MWL8K_RADIO_LONG_PREAMBLE 0x0001
@@ -1195,7 +1193,7 @@ static int mwl8k_tx_wait_empty(struct ieee80211_hw *hw, u32 delay_ms)
count = mwl8k_txq_busy(priv); count = mwl8k_txq_busy(priv);
if (count) { if (count) {
priv->tx_wait = &cmd_wait; priv->tx_wait = &cmd_wait;
if (priv->radio_state) if (priv->radio_on)
mwl8k_tx_start(priv); mwl8k_tx_start(priv);
} }
spin_unlock_bh(&priv->tx_lock); spin_unlock_bh(&priv->tx_lock);
@@ -1318,7 +1316,7 @@ static void mwl8k_txq_reclaim(struct ieee80211_hw *hw, int index, int force)
ieee80211_tx_status_irqsafe(hw, skb); ieee80211_tx_status_irqsafe(hw, skb);
wake = !priv->inconfig && priv->radio_state; wake = !priv->inconfig && priv->radio_on;
} }
if (wake) if (wake)
@@ -1726,18 +1724,16 @@ struct mwl8k_cmd_802_11_radio_control {
__le16 radio_on; __le16 radio_on;
} __attribute__((packed)); } __attribute__((packed));
static int mwl8k_cmd_802_11_radio_control(struct ieee80211_hw *hw, int enable) static int
mwl8k_cmd_802_11_radio_control(struct ieee80211_hw *hw, bool enable, bool force)
{ {
struct mwl8k_priv *priv = hw->priv; struct mwl8k_priv *priv = hw->priv;
struct mwl8k_cmd_802_11_radio_control *cmd; struct mwl8k_cmd_802_11_radio_control *cmd;
int rc; int rc;
if (((enable & MWL8K_RADIO_ENABLE) == priv->radio_state) && if (enable == priv->radio_on && !force)
!(enable & MWL8K_RADIO_FORCE))
return 0; return 0;
enable &= MWL8K_RADIO_ENABLE;
cmd = kzalloc(sizeof(*cmd), GFP_KERNEL); cmd = kzalloc(sizeof(*cmd), GFP_KERNEL);
if (cmd == NULL) if (cmd == NULL)
return -ENOMEM; return -ENOMEM;
@@ -1752,11 +1748,21 @@ static int mwl8k_cmd_802_11_radio_control(struct ieee80211_hw *hw, int enable)
kfree(cmd); kfree(cmd);
if (!rc) if (!rc)
priv->radio_state = enable; priv->radio_on = enable;
return rc; return rc;
} }
static int mwl8k_cmd_802_11_radio_disable(struct ieee80211_hw *hw)
{
return mwl8k_cmd_802_11_radio_control(hw, 0, 0);
}
static int mwl8k_cmd_802_11_radio_enable(struct ieee80211_hw *hw)
{
return mwl8k_cmd_802_11_radio_control(hw, 1, 0);
}
static int static int
mwl8k_set_radio_preamble(struct ieee80211_hw *hw, bool short_preamble) mwl8k_set_radio_preamble(struct ieee80211_hw *hw, bool short_preamble)
{ {
@@ -1770,8 +1776,7 @@ mwl8k_set_radio_preamble(struct ieee80211_hw *hw, bool short_preamble)
MWL8K_RADIO_SHORT_PREAMBLE : MWL8K_RADIO_SHORT_PREAMBLE :
MWL8K_RADIO_LONG_PREAMBLE); MWL8K_RADIO_LONG_PREAMBLE);
return mwl8k_cmd_802_11_radio_control(hw, return mwl8k_cmd_802_11_radio_control(hw, 1, 1);
MWL8K_RADIO_ENABLE | MWL8K_RADIO_FORCE);
} }
/* /*
@@ -2483,7 +2488,7 @@ static irqreturn_t mwl8k_interrupt(int irq, void *dev_id)
if (status & MWL8K_A2H_INT_QUEUE_EMPTY) { if (status & MWL8K_A2H_INT_QUEUE_EMPTY) {
if (!priv->inconfig && if (!priv->inconfig &&
priv->radio_state && priv->radio_on &&
mwl8k_txq_busy(priv)) mwl8k_txq_busy(priv))
mwl8k_tx_start(priv); mwl8k_tx_start(priv);
} }
@@ -2661,7 +2666,7 @@ static void mwl8k_config_thread(struct work_struct *wt)
spin_lock_irq(&priv->tx_lock); spin_lock_irq(&priv->tx_lock);
priv->inconfig = false; priv->inconfig = false;
if (priv->pending_tx_pkts && priv->radio_state) if (priv->pending_tx_pkts && priv->radio_on)
mwl8k_tx_start(priv); mwl8k_tx_start(priv);
spin_unlock_irq(&priv->tx_lock); spin_unlock_irq(&priv->tx_lock);
ieee80211_wake_queues(hw); ieee80211_wake_queues(hw);
@@ -2745,7 +2750,7 @@ static int mwl8k_start_wt(struct work_struct *wt)
} }
/* Turn on radio */ /* Turn on radio */
if (mwl8k_cmd_802_11_radio_control(hw, MWL8K_RADIO_ENABLE)) { if (mwl8k_cmd_802_11_radio_enable(hw)) {
rc = -EIO; rc = -EIO;
goto mwl8k_start_exit; goto mwl8k_start_exit;
} }
@@ -2839,11 +2844,8 @@ static int mwl8k_stop_wt(struct work_struct *wt)
{ {
struct mwl8k_stop_worker *worker = (struct mwl8k_stop_worker *)wt; struct mwl8k_stop_worker *worker = (struct mwl8k_stop_worker *)wt;
struct ieee80211_hw *hw = worker->header.hw; struct ieee80211_hw *hw = worker->header.hw;
int rc;
rc = mwl8k_cmd_802_11_radio_control(hw, MWL8K_RADIO_DISABLE); return mwl8k_cmd_802_11_radio_disable(hw);
return rc;
} }
static void mwl8k_stop(struct ieee80211_hw *hw) static void mwl8k_stop(struct ieee80211_hw *hw)
@@ -2958,7 +2960,7 @@ static int mwl8k_config_wt(struct work_struct *wt)
struct mwl8k_priv *priv = hw->priv; struct mwl8k_priv *priv = hw->priv;
int rc = 0; int rc = 0;
if (mwl8k_cmd_802_11_radio_control(hw, MWL8K_RADIO_ENABLE)) { if (mwl8k_cmd_802_11_radio_enable(hw)) {
rc = -EINVAL; rc = -EINVAL;
goto mwl8k_config_exit; goto mwl8k_config_exit;
} }
@@ -3503,7 +3505,7 @@ static int __devinit mwl8k_probe(struct pci_dev *pdev,
/* Set default radio state and preamble */ /* Set default radio state and preamble */
priv->radio_preamble = MWL8K_RADIO_DEFAULT_PREAMBLE; priv->radio_preamble = MWL8K_RADIO_DEFAULT_PREAMBLE;
priv->radio_state = MWL8K_RADIO_DISABLE; priv->radio_on = 0;
/* Finalize join worker */ /* Finalize join worker */
INIT_WORK(&priv->finalize_join_worker, mwl8k_finalize_join_worker); INIT_WORK(&priv->finalize_join_worker, mwl8k_finalize_join_worker);
@@ -3584,7 +3586,7 @@ static int __devinit mwl8k_probe(struct pci_dev *pdev,
} }
/* Turn radio off */ /* Turn radio off */
rc = mwl8k_cmd_802_11_radio_control(hw, MWL8K_RADIO_DISABLE); rc = mwl8k_cmd_802_11_radio_disable(hw);
if (rc) { if (rc) {
printk(KERN_ERR "%s: Cannot disable\n", priv->name); printk(KERN_ERR "%s: Cannot disable\n", priv->name);
goto err_stop_firmware; goto err_stop_firmware;