From b6031b9bbe9bfb9f8dce74bf768620d4bc43c3ab Mon Sep 17 00:00:00 2001 From: Francois Romieu Date: Fri, 9 Mar 2012 18:37:58 +0100 Subject: [PATCH] --- yaml --- r: 300537 b: refs/heads/master c: 0ca0aa08eb70dd23c1bc5d154c3d8ba157b712e9 h: refs/heads/master i: 300535: b0ddd15db860e3275d9bbb0098bcacfd49fa2dce v: v3 --- [refs] | 2 +- trunk/drivers/net/ethernet/packetengines/hamachi.c | 11 +++-------- 2 files changed, 4 insertions(+), 9 deletions(-) diff --git a/[refs] b/[refs] index 6b513978bdb0..245687a61158 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 05d334eca9994680a6cb8fba3f19955356ccf72a +refs/heads/master: 0ca0aa08eb70dd23c1bc5d154c3d8ba157b712e9 diff --git a/trunk/drivers/net/ethernet/packetengines/hamachi.c b/trunk/drivers/net/ethernet/packetengines/hamachi.c index 0d29f5f4b8e4..c2367158350e 100644 --- a/trunk/drivers/net/ethernet/packetengines/hamachi.c +++ b/trunk/drivers/net/ethernet/packetengines/hamachi.c @@ -683,8 +683,6 @@ static int __devinit hamachi_init_one (struct pci_dev *pdev, } hmp->base = ioaddr; - dev->base_addr = (unsigned long)ioaddr; - dev->irq = irq; pci_set_drvdata(pdev, dev); hmp->chip_id = chip_id; @@ -859,14 +857,11 @@ static int hamachi_open(struct net_device *dev) u32 rx_int_var, tx_int_var; u16 fifo_info; - i = request_irq(dev->irq, hamachi_interrupt, IRQF_SHARED, dev->name, dev); + i = request_irq(hmp->pci_dev->irq, hamachi_interrupt, IRQF_SHARED, + dev->name, dev); if (i) return i; - if (hamachi_debug > 1) - printk(KERN_DEBUG "%s: hamachi_open() irq %d.\n", - dev->name, dev->irq); - hamachi_init_ring(dev); #if ADDRLEN == 64 @@ -1705,7 +1700,7 @@ static int hamachi_close(struct net_device *dev) } #endif /* __i386__ debugging only */ - free_irq(dev->irq, dev); + free_irq(hmp->pci_dev->irq, dev); del_timer_sync(&hmp->timer);