diff options
author | David S. Miller <davem@davemloft.net> | 2018-09-25 10:35:29 -0700 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2018-09-25 10:35:29 -0700 |
commit | a06ee256e5d6f03fffbd088de9bf84035658cc5a (patch) | |
tree | 9b88044cd4a46496d15a05b43246810c8b677f46 /net/core/ethtool.c | |
parent | net: macb: Clean 64b dma addresses if they are not detected (diff) | |
parent | Merge tag 'scsi-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi (diff) | |
download | linux-dev-a06ee256e5d6f03fffbd088de9bf84035658cc5a.tar.xz linux-dev-a06ee256e5d6f03fffbd088de9bf84035658cc5a.zip |
Merge ra.kernel.org:/pub/scm/linux/kernel/git/davem/net
Version bump conflict in batman-adv, take what's in net-next.
iavf conflict, adjustment of netdev_ops in net-next conflicting
with poll controller method removal in net.
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/core/ethtool.c')
-rw-r--r-- | net/core/ethtool.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/net/core/ethtool.c b/net/core/ethtool.c index 9d4e56d97080..96afc55aa61e 100644 --- a/net/core/ethtool.c +++ b/net/core/ethtool.c @@ -2536,6 +2536,7 @@ int dev_ethtool(struct net *net, struct ifreq *ifr) case ETHTOOL_GPHYSTATS: case ETHTOOL_GTSO: case ETHTOOL_GPERMADDR: + case ETHTOOL_GUFO: case ETHTOOL_GGSO: case ETHTOOL_GGRO: case ETHTOOL_GFLAGS: |