From e2d72b1310d0c004d975b57655d950baa96dd464 Mon Sep 17 00:00:00 2001 From: Ben Hutchings Date: Wed, 1 Feb 2012 09:32:25 +0000 Subject: [PATCH] --- yaml --- r: 287475 b: refs/heads/master c: 786f528119722f564a22ad953411374e06116333 h: refs/heads/master i: 287473: f5a5342b84ba4fdf70e3e77aa040f5379c2565da 287471: 3ebbb0094dc9c6b4db511e763819b4a8b6de5075 v: v3 --- [refs] | 2 +- trunk/drivers/net/ethernet/emulex/benet/be_ethtool.c | 6 +----- trunk/net/core/ethtool.c | 2 ++ 3 files changed, 4 insertions(+), 6 deletions(-) diff --git a/[refs] b/[refs] index 0e301859fb2b..dc3df8e8ea61 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: efcdbf24fd5daa88060869e51ed49f68b7ac8708 +refs/heads/master: 786f528119722f564a22ad953411374e06116333 diff --git a/trunk/drivers/net/ethernet/emulex/benet/be_ethtool.c b/trunk/drivers/net/ethernet/emulex/benet/be_ethtool.c index 6db6b6ae5e9b..802e5ddef8a8 100644 --- a/trunk/drivers/net/ethernet/emulex/benet/be_ethtool.c +++ b/trunk/drivers/net/ethernet/emulex/benet/be_ethtool.c @@ -716,12 +716,8 @@ static int be_do_flash(struct net_device *netdev, struct ethtool_flash *efl) { struct be_adapter *adapter = netdev_priv(netdev); - char file_name[ETHTOOL_FLASH_MAX_FILENAME]; - file_name[ETHTOOL_FLASH_MAX_FILENAME - 1] = 0; - strcpy(file_name, efl->data); - - return be_load_fw(adapter, file_name); + return be_load_fw(adapter, efl->data); } static int diff --git a/trunk/net/core/ethtool.c b/trunk/net/core/ethtool.c index 369b41894527..3f79db1b612a 100644 --- a/trunk/net/core/ethtool.c +++ b/trunk/net/core/ethtool.c @@ -1190,6 +1190,8 @@ static noinline_for_stack int ethtool_flash_device(struct net_device *dev, if (!dev->ethtool_ops->flash_device) return -EOPNOTSUPP; + efl.data[ETHTOOL_FLASH_MAX_FILENAME - 1] = 0; + return dev->ethtool_ops->flash_device(dev, &efl); }