diff options
-rw-r--r-- | drivers/net/bnx2.c | 3 | ||||
-rw-r--r-- | drivers/net/bnx2.h | 2 |
2 files changed, 1 insertions, 4 deletions
diff --git a/drivers/net/bnx2.c b/drivers/net/bnx2.c index a78b664cd443..84177663291e 100644 --- a/drivers/net/bnx2.c +++ b/drivers/net/bnx2.c | |||
@@ -7718,7 +7718,6 @@ bnx2_init_one(struct pci_dev *pdev, const struct pci_device_id *ent) | |||
7718 | 7718 | ||
7719 | memcpy(dev->dev_addr, bp->mac_addr, 6); | 7719 | memcpy(dev->dev_addr, bp->mac_addr, 6); |
7720 | memcpy(dev->perm_addr, bp->mac_addr, 6); | 7720 | memcpy(dev->perm_addr, bp->mac_addr, 6); |
7721 | bp->name = board_info[ent->driver_data].name; | ||
7722 | 7721 | ||
7723 | dev->features |= NETIF_F_IP_CSUM | NETIF_F_SG; | 7722 | dev->features |= NETIF_F_IP_CSUM | NETIF_F_SG; |
7724 | if (CHIP_NUM(bp) == CHIP_NUM_5709) | 7723 | if (CHIP_NUM(bp) == CHIP_NUM_5709) |
@@ -7745,7 +7744,7 @@ bnx2_init_one(struct pci_dev *pdev, const struct pci_device_id *ent) | |||
7745 | printk(KERN_INFO "%s: %s (%c%d) %s found at mem %lx, " | 7744 | printk(KERN_INFO "%s: %s (%c%d) %s found at mem %lx, " |
7746 | "IRQ %d, node addr %s\n", | 7745 | "IRQ %d, node addr %s\n", |
7747 | dev->name, | 7746 | dev->name, |
7748 | bp->name, | 7747 | board_info[ent->driver_data].name, |
7749 | ((CHIP_ID(bp) & 0xf000) >> 12) + 'A', | 7748 | ((CHIP_ID(bp) & 0xf000) >> 12) + 'A', |
7750 | ((CHIP_ID(bp) & 0x0ff0) >> 4), | 7749 | ((CHIP_ID(bp) & 0x0ff0) >> 4), |
7751 | bnx2_bus_string(bp, str), | 7750 | bnx2_bus_string(bp, str), |
diff --git a/drivers/net/bnx2.h b/drivers/net/bnx2.h index c3c579f98ed0..cb47c98ddd71 100644 --- a/drivers/net/bnx2.h +++ b/drivers/net/bnx2.h | |||
@@ -6701,8 +6701,6 @@ struct bnx2 { | |||
6701 | 6701 | ||
6702 | /* End of fields used in the performance code paths. */ | 6702 | /* End of fields used in the performance code paths. */ |
6703 | 6703 | ||
6704 | char *name; | ||
6705 | |||
6706 | int timer_interval; | 6704 | int timer_interval; |
6707 | int current_interval; | 6705 | int current_interval; |
6708 | struct timer_list timer; | 6706 | struct timer_list timer; |