diff options
Diffstat (limited to 'drivers/net/sungem.c')
-rw-r--r-- | drivers/net/sungem.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/net/sungem.c b/drivers/net/sungem.c index 253e96e7ad20..004d651681ad 100644 --- a/drivers/net/sungem.c +++ b/drivers/net/sungem.c | |||
@@ -2281,9 +2281,9 @@ static void gem_do_stop(struct net_device *dev, int wol) | |||
2281 | } | 2281 | } |
2282 | } | 2282 | } |
2283 | 2283 | ||
2284 | static void gem_reset_task(void *data) | 2284 | static void gem_reset_task(struct work_struct *work) |
2285 | { | 2285 | { |
2286 | struct gem *gp = (struct gem *) data; | 2286 | struct gem *gp = container_of(work, struct gem, reset_task); |
2287 | 2287 | ||
2288 | mutex_lock(&gp->pm_mutex); | 2288 | mutex_lock(&gp->pm_mutex); |
2289 | 2289 | ||
@@ -3043,7 +3043,7 @@ static int __devinit gem_init_one(struct pci_dev *pdev, | |||
3043 | gp->link_timer.function = gem_link_timer; | 3043 | gp->link_timer.function = gem_link_timer; |
3044 | gp->link_timer.data = (unsigned long) gp; | 3044 | gp->link_timer.data = (unsigned long) gp; |
3045 | 3045 | ||
3046 | INIT_WORK(&gp->reset_task, gem_reset_task, gp); | 3046 | INIT_WORK(&gp->reset_task, gem_reset_task); |
3047 | 3047 | ||
3048 | gp->lstate = link_down; | 3048 | gp->lstate = link_down; |
3049 | gp->timer_ticks = 0; | 3049 | gp->timer_ticks = 0; |