summaryrefslogtreecommitdiff
path: root/net
diff options
context:
space:
mode:
authorMiroslav Lichvar <mlichvar@redhat.com>2016-11-24 10:55:06 +0100
committerDavid S. Miller <davem@davemloft.net>2016-11-25 20:23:30 -0500
commit8006f6bf5e39f11c697f48df20382b81d2f2f8b8 (patch)
treef2068b7b3252761d07fbfbd47d089464082eda67 /net
parentd876a4d2afecacf4b4d8b11479e9f1ed0080bb2e (diff)
downloadlinux-next-8006f6bf5e39f11c697f48df20382b81d2f2f8b8.tar.gz
net: ethtool: don't require CAP_NET_ADMIN for ETHTOOL_GLINKSETTINGS
The ETHTOOL_GLINKSETTINGS command is deprecating the ETHTOOL_GSET command and likewise it shouldn't require the CAP_NET_ADMIN capability. Signed-off-by: Miroslav Lichvar <mlichvar@redhat.com> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net')
-rw-r--r--net/core/ethtool.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/net/core/ethtool.c b/net/core/ethtool.c
index 977489820eb9..047a1752ece1 100644
--- a/net/core/ethtool.c
+++ b/net/core/ethtool.c
@@ -2479,6 +2479,7 @@ int dev_ethtool(struct net *net, struct ifreq *ifr)
case ETHTOOL_GET_TS_INFO:
case ETHTOOL_GEEE:
case ETHTOOL_GTUNABLE:
+ case ETHTOOL_GLINKSETTINGS:
break;
default:
if (!ns_capable(net->user_ns, CAP_NET_ADMIN))