diff options
Diffstat (limited to 'drivers/net/bnx2.c')
-rw-r--r-- | drivers/net/bnx2.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/net/bnx2.c b/drivers/net/bnx2.c index 01b76d3aa42f..b12cc4596b8d 100644 --- a/drivers/net/bnx2.c +++ b/drivers/net/bnx2.c | |||
@@ -4339,9 +4339,9 @@ bnx2_open(struct net_device *dev) | |||
4339 | } | 4339 | } |
4340 | 4340 | ||
4341 | static void | 4341 | static void |
4342 | bnx2_reset_task(void *data) | 4342 | bnx2_reset_task(struct work_struct *work) |
4343 | { | 4343 | { |
4344 | struct bnx2 *bp = data; | 4344 | struct bnx2 *bp = container_of(work, struct bnx2, reset_task); |
4345 | 4345 | ||
4346 | if (!netif_running(bp->dev)) | 4346 | if (!netif_running(bp->dev)) |
4347 | return; | 4347 | return; |
@@ -5630,7 +5630,7 @@ bnx2_init_board(struct pci_dev *pdev, struct net_device *dev) | |||
5630 | bp->pdev = pdev; | 5630 | bp->pdev = pdev; |
5631 | 5631 | ||
5632 | spin_lock_init(&bp->phy_lock); | 5632 | spin_lock_init(&bp->phy_lock); |
5633 | INIT_WORK(&bp->reset_task, bnx2_reset_task, bp); | 5633 | INIT_WORK(&bp->reset_task, bnx2_reset_task); |
5634 | 5634 | ||
5635 | dev->base_addr = dev->mem_start = pci_resource_start(pdev, 0); | 5635 | dev->base_addr = dev->mem_start = pci_resource_start(pdev, 0); |
5636 | mem_len = MB_GET_CID_ADDR(17); | 5636 | mem_len = MB_GET_CID_ADDR(17); |