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

wl1251: remove unused filter_work

Browse Source 
filter_work is never used, remove it.

Signed-off-by: Grazvydas Ignotas <notasas@gmail.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
This commit is contained in:
Grazvydas Ignotas
2012-06-16 22:31:48 +03:00
committed by John W. Linville
parent edc7651f3a
commit 7e05bedca0
2 changed files with 0 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files

36
drivers/net/wireless/ti/wl1251/main.c
View File

@@ -348,33 +348,6 @@ out:
return ret; return ret;
} }
static void wl1251_filter_work(struct work_struct *work)
{
struct wl1251 *wl =
container_of(work, struct wl1251, filter_work);
int ret;
mutex_lock(&wl->mutex);
if (wl->state == WL1251_STATE_OFF)
goto out;
ret = wl1251_ps_elp_wakeup(wl);
if (ret < 0)
goto out;
ret = wl1251_join(wl, wl->bss_type, wl->channel, wl->beacon_int,
wl->dtim_period);
if (ret < 0)
goto out_sleep;
out_sleep:
wl1251_ps_elp_sleep(wl);
out:
mutex_unlock(&wl->mutex);
}
static void wl1251_op_tx(struct ieee80211_hw *hw, struct sk_buff *skb) static void wl1251_op_tx(struct ieee80211_hw *hw, struct sk_buff *skb)
{ {
struct wl1251 *wl = hw->priv; struct wl1251 *wl = hw->priv;
@@ -478,7 +451,6 @@ static void wl1251_op_stop(struct ieee80211_hw *hw)
cancel_work_sync(&wl->irq_work); cancel_work_sync(&wl->irq_work);
cancel_work_sync(&wl->tx_work); cancel_work_sync(&wl->tx_work);
cancel_work_sync(&wl->filter_work);
cancel_delayed_work_sync(&wl->elp_work); cancel_delayed_work_sync(&wl->elp_work);
mutex_lock(&wl->mutex); mutex_lock(&wl->mutex);
@@ -723,13 +695,6 @@ static void wl1251_op_configure_filter(struct ieee80211_hw *hw,
wl->rx_filter |= CFG_RX_CTL_EN; wl->rx_filter |= CFG_RX_CTL_EN;
if (*total & FIF_OTHER_BSS) if (*total & FIF_OTHER_BSS)
wl->rx_filter &= ~CFG_BSSID_FILTER_EN; wl->rx_filter &= ~CFG_BSSID_FILTER_EN;
/*
* FIXME: workqueues need to be properly cancelled on stop(), for
* now let's just disable changing the filter settings. They will
* be updated any on config().
*/
/* schedule_work(&wl->filter_work); */
} }
/* HW encryption */ /* HW encryption */
@@ -1390,7 +1355,6 @@ struct ieee80211_hw *wl1251_alloc_hw(void)
skb_queue_head_init(&wl->tx_queue); skb_queue_head_init(&wl->tx_queue);
INIT_WORK(&wl->filter_work, wl1251_filter_work);
INIT_DELAYED_WORK(&wl->elp_work, wl1251_elp_work); INIT_DELAYED_WORK(&wl->elp_work, wl1251_elp_work);
wl->channel = WL1251_DEFAULT_CHANNEL; wl->channel = WL1251_DEFAULT_CHANNEL;
wl->scanning = false; wl->scanning = false;

1
drivers/net/wireless/ti/wl1251/wl1251.h
View File

@@ -315,7 +315,6 @@ struct wl1251 {
bool tx_queue_stopped; bool tx_queue_stopped;
struct work_struct tx_work; struct work_struct tx_work;
struct work_struct filter_work;
/* Pending TX frames */ /* Pending TX frames */
struct sk_buff *tx_frames[16]; struct sk_buff *tx_frames[16];