aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/ethernet/emulex/benet/be_ethtool.c
diff options
context:
space:
mode:
authorDavid S. Miller <davem@davemloft.net>2012-02-04 16:39:32 -0500
committerDavid S. Miller <davem@davemloft.net>2012-02-04 16:39:32 -0500
commitdd48dc34fe7639a8b2e22d8b609672f5f81aa7cb (patch)
treef16ace0ae09edab16bf6d0be9e8280dfbb7100da /drivers/net/ethernet/emulex/benet/be_ethtool.c
parent8d9eb069eafce49307f839783e4a4673414b1fd5 (diff)
parent5962b35c1de3254a2f03b95efd3b7854b874d7b7 (diff)
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
Diffstat (limited to 'drivers/net/ethernet/emulex/benet/be_ethtool.c')
-rw-r--r--drivers/net/ethernet/emulex/benet/be_ethtool.c6
1 files changed, 1 insertions, 5 deletions
diff --git a/drivers/net/ethernet/emulex/benet/be_ethtool.c b/drivers/net/ethernet/emulex/benet/be_ethtool.c
index 0a5ee224cfe2..dc1383c396c0 100644
--- a/drivers/net/ethernet/emulex/benet/be_ethtool.c
+++ b/drivers/net/ethernet/emulex/benet/be_ethtool.c
@@ -774,12 +774,8 @@ static int
774be_do_flash(struct net_device *netdev, struct ethtool_flash *efl) 774be_do_flash(struct net_device *netdev, struct ethtool_flash *efl)
775{ 775{
776 struct be_adapter *adapter = netdev_priv(netdev); 776 struct be_adapter *adapter = netdev_priv(netdev);
777 char file_name[ETHTOOL_FLASH_MAX_FILENAME];
778 777
779 file_name[ETHTOOL_FLASH_MAX_FILENAME - 1] = 0; 778 return be_load_fw(adapter, efl->data);
780 strcpy(file_name, efl->data);
781
782 return be_load_fw(adapter, file_name);
783} 779}
784 780
785static int 781static int