Merge branch 'for-linus' of git://git.kernel.dk/linux-block

[karo-tx-linux.git] / net / core / ethtool.c

diff --git a/net/core/ethtool.c b/net/core/ethtool.c
index 369b418945276e58c04a6f90201b90f7398e5dd0..6d6d7d25caaa30319870c6b1d62b38eb8972e543 100644 (file)
--- a/net/core/ethtool.c
+++ b/net/core/ethtool.c
@@ -73,6 +73,8 @@ static const char netdev_features_strings[NETDEV_FEATURE_COUNT][ETH_GSTRING_LEN]
        [NETIF_F_RXCSUM_BIT] =           "rx-checksum",
        [NETIF_F_NOCACHE_COPY_BIT] =     "tx-nocache-copy",
        [NETIF_F_LOOPBACK_BIT] =         "loopback",
+       [NETIF_F_RXFCS_BIT] =            "rx-fcs",
+       [NETIF_F_RXALL_BIT] =            "rx-all",
 };
 
 static int ethtool_get_features(struct net_device *dev, void __user *useraddr)
@@ -1190,6 +1192,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);
 }