summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--drivers/staging/ks7010/ks7010_sdio.c10
-rw-r--r--drivers/staging/ks7010/ks7010_sdio.h1
-rw-r--r--drivers/staging/ks7010/ks_wlan.h1
3 files changed, 5 insertions, 7 deletions
diff --git a/drivers/staging/ks7010/ks7010_sdio.c b/drivers/staging/ks7010/ks7010_sdio.c
index 0f173c31066a..2d73ebb71a2e 100644
--- a/drivers/staging/ks7010/ks7010_sdio.c
+++ b/drivers/staging/ks7010/ks7010_sdio.c
@@ -380,7 +380,7 @@ static void rx_event_task(unsigned long dev)
inc_rxqhead(priv);
if (cnt_rxqbody(priv) > 0)
- tasklet_schedule(&priv->ks_wlan_hw.rx_bh_task);
+ tasklet_schedule(&priv->rx_bh_task);
}
}
@@ -447,8 +447,7 @@ static void ks_wlan_hw_rx(struct ks_wlan_private *priv, uint16_t size)
}
}
- /* rx_event_task((void *)priv); */
- tasklet_schedule(&priv->ks_wlan_hw.rx_bh_task);
+ tasklet_schedule(&priv->rx_bh_task);
}
static void ks7010_rw_function(struct work_struct *work)
@@ -614,8 +613,7 @@ static int trx_device_init(struct ks_wlan_private *priv)
spin_lock_init(&priv->tx_dev.tx_dev_lock);
spin_lock_init(&priv->rx_dev.rx_dev_lock);
- tasklet_init(&priv->ks_wlan_hw.rx_bh_task, rx_event_task,
- (unsigned long)priv);
+ tasklet_init(&priv->rx_bh_task, rx_event_task, (unsigned long)priv);
return 0;
}
@@ -633,7 +631,7 @@ static void trx_device_exit(struct ks_wlan_private *priv)
inc_txqhead(priv);
}
- tasklet_kill(&priv->ks_wlan_hw.rx_bh_task);
+ tasklet_kill(&priv->rx_bh_task);
}
static int ks7010_sdio_update_index(struct ks_wlan_private *priv, u32 index)
diff --git a/drivers/staging/ks7010/ks7010_sdio.h b/drivers/staging/ks7010/ks7010_sdio.h
index d04fccc606b6..76c6b10205fe 100644
--- a/drivers/staging/ks7010/ks7010_sdio.h
+++ b/drivers/staging/ks7010/ks7010_sdio.h
@@ -89,7 +89,6 @@ struct hw_info_t {
struct ks_sdio_card *sdio_card;
struct workqueue_struct *ks7010sdio_wq;
struct delayed_work rw_wq;
- struct tasklet_struct rx_bh_task;
};
struct ks_sdio_card {
diff --git a/drivers/staging/ks7010/ks_wlan.h b/drivers/staging/ks7010/ks_wlan.h
index 79684702fc5b..b0bc7a8d850c 100644
--- a/drivers/staging/ks7010/ks_wlan.h
+++ b/drivers/staging/ks7010/ks_wlan.h
@@ -414,6 +414,7 @@ struct wps_status_t {
struct ks_wlan_private {
struct hw_info_t ks_wlan_hw; /* hardware information */
+ struct tasklet_struct rx_bh_task;
struct net_device *net_dev;
int reg_net; /* register_netdev */