Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net

[linux.git] / net / core / ethtool.c

diff --git a/net/core/ethtool.c b/net/core/ethtool.c
index 36ed619faf3641ae4d40edc7385b003de7500764..4a593853cbf283832d57ff085690d9110a1eee1e 100644 (file)
--- a/net/core/ethtool.c
+++ b/net/core/ethtool.c
@@ -136,6 +136,7 @@ static const char
 phy_tunable_strings[__ETHTOOL_PHY_TUNABLE_COUNT][ETH_GSTRING_LEN] = {
        [ETHTOOL_ID_UNSPEC]     = "Unspec",
        [ETHTOOL_PHY_DOWNSHIFT] = "phy-downshift",
+       [ETHTOOL_PHY_FAST_LINK_DOWN] = "phy-fast-link-down",
 };
 
 static int ethtool_get_features(struct net_device *dev, void __user *useraddr)
@@ -2446,6 +2447,7 @@ static int ethtool_phy_tunable_valid(const struct ethtool_tunable *tuna)
 {
        switch (tuna->id) {
        case ETHTOOL_PHY_DOWNSHIFT:
+       case ETHTOOL_PHY_FAST_LINK_DOWN:
                if (tuna->len != sizeof(u8) ||
                    tuna->type_id != ETHTOOL_TUNABLE_U8)
                        return -EINVAL;