diff options
author | Mike McCormack <mikem@ring3k.org> | 2011-03-08 10:40:56 -0500 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@suse.de> | 2011-03-09 18:46:28 -0500 |
commit | 1f0e427007d2dc3679faecdf61aaf8673abbb5e8 (patch) | |
tree | d716aa6de4d7c8ab1847d7e21afd44d61d78b67a /drivers/staging/rtl8192e | |
parent | ddd877b2e19de8c73d67b57f9a117b51e8ddfec8 (diff) |
staging: rtl8192e: Pass priv to watch_dog_timer_callback
Signed-off-by: Mike McCormack <mikem@ring3k.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'drivers/staging/rtl8192e')
-rw-r--r-- | drivers/staging/rtl8192e/r8192E_core.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/staging/rtl8192e/r8192E_core.c b/drivers/staging/rtl8192e/r8192E_core.c index a3fcbae8365..06b35a234b4 100644 --- a/drivers/staging/rtl8192e/r8192E_core.c +++ b/drivers/staging/rtl8192e/r8192E_core.c | |||
@@ -2429,7 +2429,7 @@ static short rtl8192_init(struct r8192_priv *priv) | |||
2429 | rtl8192_get_channel_map(priv); | 2429 | rtl8192_get_channel_map(priv); |
2430 | init_hal_dm(dev); | 2430 | init_hal_dm(dev); |
2431 | init_timer(&priv->watch_dog_timer); | 2431 | init_timer(&priv->watch_dog_timer); |
2432 | priv->watch_dog_timer.data = (unsigned long)dev; | 2432 | priv->watch_dog_timer.data = (unsigned long)priv; |
2433 | priv->watch_dog_timer.function = watch_dog_timer_callback; | 2433 | priv->watch_dog_timer.function = watch_dog_timer_callback; |
2434 | if (request_irq(dev->irq, rtl8192_interrupt, IRQF_SHARED, dev->name, dev)) { | 2434 | if (request_irq(dev->irq, rtl8192_interrupt, IRQF_SHARED, dev->name, dev)) { |
2435 | printk("Error allocating IRQ %d",dev->irq); | 2435 | printk("Error allocating IRQ %d",dev->irq); |
@@ -3379,7 +3379,7 @@ static void rtl819x_watchdog_wqcallback(struct work_struct *work) | |||
3379 | 3379 | ||
3380 | void watch_dog_timer_callback(unsigned long data) | 3380 | void watch_dog_timer_callback(unsigned long data) |
3381 | { | 3381 | { |
3382 | struct r8192_priv *priv = ieee80211_priv((struct net_device *) data); | 3382 | struct r8192_priv *priv = (struct r8192_priv *) data; |
3383 | queue_delayed_work(priv->priv_wq,&priv->watch_dog_wq,0); | 3383 | queue_delayed_work(priv->priv_wq,&priv->watch_dog_wq,0); |
3384 | mod_timer(&priv->watch_dog_timer, jiffies + MSECS(IEEE80211_WATCH_DOG_TIME)); | 3384 | mod_timer(&priv->watch_dog_timer, jiffies + MSECS(IEEE80211_WATCH_DOG_TIME)); |
3385 | 3385 | ||
@@ -3409,7 +3409,7 @@ static int _rtl8192_up(struct r8192_priv *priv) | |||
3409 | if(priv->ieee80211->state != IEEE80211_LINKED) | 3409 | if(priv->ieee80211->state != IEEE80211_LINKED) |
3410 | ieee80211_softmac_start_protocol(priv->ieee80211); | 3410 | ieee80211_softmac_start_protocol(priv->ieee80211); |
3411 | ieee80211_reset_queue(priv->ieee80211); | 3411 | ieee80211_reset_queue(priv->ieee80211); |
3412 | watch_dog_timer_callback((unsigned long) dev); | 3412 | watch_dog_timer_callback((unsigned long) priv); |
3413 | if(!netif_queue_stopped(dev)) | 3413 | if(!netif_queue_stopped(dev)) |
3414 | netif_start_queue(dev); | 3414 | netif_start_queue(dev); |
3415 | else | 3415 | else |