aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/netxen/netxen_nic_ethtool.c
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/net/netxen/netxen_nic_ethtool.c')
-rw-r--r--drivers/net/netxen/netxen_nic_ethtool.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/drivers/net/netxen/netxen_nic_ethtool.c b/drivers/net/netxen/netxen_nic_ethtool.c
index 16fabb377488..0175f6c353f6 100644
--- a/drivers/net/netxen/netxen_nic_ethtool.c
+++ b/drivers/net/netxen/netxen_nic_ethtool.c
@@ -94,7 +94,7 @@ static const char netxen_nic_gstrings_test[][ETH_GSTRING_LEN] = {
94 94
95static int netxen_nic_get_eeprom_len(struct net_device *dev) 95static int netxen_nic_get_eeprom_len(struct net_device *dev)
96{ 96{
97 return FLASH_TOTAL_SIZE; 97 return NETXEN_FLASH_TOTAL_SIZE;
98} 98}
99 99
100static void 100static void
@@ -470,7 +470,7 @@ netxen_nic_set_eeprom(struct net_device *dev, struct ethtool_eeprom *eeprom,
470 return 0; 470 return 0;
471 } 471 }
472 472
473 if (offset == BOOTLD_START) { 473 if (offset == NETXEN_BOOTLD_START) {
474 ret = netxen_flash_erase_primary(adapter); 474 ret = netxen_flash_erase_primary(adapter);
475 if (ret != FLASH_SUCCESS) { 475 if (ret != FLASH_SUCCESS) {
476 printk(KERN_ERR "%s: Flash erase failed.\n", 476 printk(KERN_ERR "%s: Flash erase failed.\n",
@@ -478,10 +478,10 @@ netxen_nic_set_eeprom(struct net_device *dev, struct ethtool_eeprom *eeprom,
478 return ret; 478 return ret;
479 } 479 }
480 480
481 ret = netxen_rom_se(adapter, USER_START); 481 ret = netxen_rom_se(adapter, NETXEN_USER_START);
482 if (ret != FLASH_SUCCESS) 482 if (ret != FLASH_SUCCESS)
483 return ret; 483 return ret;
484 ret = netxen_rom_se(adapter, FIXED_START); 484 ret = netxen_rom_se(adapter, NETXEN_FIXED_START);
485 if (ret != FLASH_SUCCESS) 485 if (ret != FLASH_SUCCESS)
486 return ret; 486 return ret;
487 487