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

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

diff --git a/net/core/ethtool.c b/net/core/ethtool.c
index 0adb3bec5b5a542a77c17d9bbaaa2d8327f36919..e23766c7e3ba19414494d242af86c1029e8eee61 100644 (file)
--- a/net/core/ethtool.c
+++ b/net/core/ethtool.c
@@ -2570,6 +2570,7 @@ int dev_ethtool(struct net *net, struct ifreq *ifr)
        case ETHTOOL_GEEE:
        case ETHTOOL_GTUNABLE:
        case ETHTOOL_PHY_GTUNABLE:
+       case ETHTOOL_GLINKSETTINGS:
                break;
        default:
                if (!ns_capable(net->user_ns, CAP_NET_ADMIN))