git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Pull asus into release branch
[pandora-kernel.git]
/
drivers
/
net
/
netxen
/
netxen_nic_ethtool.c
diff --git
a/drivers/net/netxen/netxen_nic_ethtool.c
b/drivers/net/netxen/netxen_nic_ethtool.c
index
986ef98
..
ee1b5a2
100644
(file)
--- a/
drivers/net/netxen/netxen_nic_ethtool.c
+++ b/
drivers/net/netxen/netxen_nic_ethtool.c
@@
-462,6
+462,7
@@
netxen_nic_set_eeprom(struct net_device *dev, struct ethtool_eeprom *eeprom,
}
printk(KERN_INFO "%s: flash unlocked. \n",
netxen_nic_driver_name);
+ last_schedule_time = jiffies;
ret = netxen_flash_erase_secondary(adapter);
if (ret != FLASH_SUCCESS) {
printk(KERN_ERR "%s: Flash erase failed.\n",