Skip to content

Commit

Permalink
mwl8k: remove (mostly) write-only variable priv->current_channel
Browse files Browse the repository at this point in the history
Signed-off-by: Lennert Buytenhek <buytenh@marvell.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
  • Loading branch information
Lennert Buytenhek authored and John W. Linville committed Jan 12, 2010
1 parent c92d4ed commit 9189c10
Showing 1 changed file with 1 addition and 7 deletions.
8 changes: 1 addition & 7 deletions drivers/net/wireless/mwl8k.c
Original file line number Diff line number Diff line change
Expand Up @@ -156,8 +156,6 @@ struct mwl8k_priv {

struct ieee80211_vif *vif;

struct ieee80211_channel *current_channel;

/* power management status cookie from firmware */
u32 *cookie;
dma_addr_t cookie_dma;
Expand Down Expand Up @@ -3050,7 +3048,7 @@ static int mwl8k_tx(struct ieee80211_hw *hw, struct sk_buff *skb)
int index = skb_get_queue_mapping(skb);
int rc;

if (priv->current_channel == NULL) {
if (!priv->radio_on) {
printk(KERN_DEBUG "%s: dropped TX frame since radio "
"disabled\n", wiphy_name(hw->wiphy));
dev_kfree_skb(skb);
Expand Down Expand Up @@ -3182,7 +3180,6 @@ static int mwl8k_add_interface(struct ieee80211_hw *hw,
mwl8k_vif->seqno = 0;

priv->vif = vif;
priv->current_channel = NULL;

return 0;
}
Expand All @@ -3208,7 +3205,6 @@ static int mwl8k_config(struct ieee80211_hw *hw, u32 changed)

if (conf->flags & IEEE80211_CONF_IDLE) {
mwl8k_cmd_radio_disable(hw);
priv->current_channel = NULL;
return 0;
}

Expand All @@ -3224,8 +3220,6 @@ static int mwl8k_config(struct ieee80211_hw *hw, u32 changed)
if (rc)
goto out;

priv->current_channel = conf->channel;

if (conf->power_level > 18)
conf->power_level = 18;
rc = mwl8k_cmd_rf_tx_power(hw, conf->power_level);
Expand Down

0 comments on commit 9189c10

Please sign in to comment.