Skip to content

Commit

Permalink
Merge pull request torvalds#175 in PROCESSOR-SDK/processor-sdk-linux …
Browse files Browse the repository at this point in the history
…from PLSDK-2941 to processor-sdk-linux-4.19.y

* commit '118465638a4ff65896dcf3014d8a55ddaa8a86d8':
  vlan: add set_dump() ethtool api
  • Loading branch information
Aaron Kramer committed Aug 15, 2019
2 parents 903e38b + 1184656 commit d5c99e0
Showing 1 changed file with 12 additions and 0 deletions.
12 changes: 12 additions & 0 deletions net/8021q/vlan_dev.c
Original file line number Diff line number Diff line change
Expand Up @@ -770,11 +770,23 @@ static int vlan_dev_get_iflink(const struct net_device *dev)
return real_dev->ifindex;
}

static int vlan_set_dump(struct net_device *dev,
struct ethtool_dump *dump)
{
struct net_device *real_dev = vlan_dev_priv(dev)->real_dev;

if (!real_dev->ethtool_ops->set_dump)
return -EOPNOTSUPP;

return real_dev->ethtool_ops->set_dump(real_dev, dump);
}

static const struct ethtool_ops vlan_ethtool_ops = {
.get_link_ksettings = vlan_ethtool_get_link_ksettings,
.get_drvinfo = vlan_ethtool_get_drvinfo,
.get_link = ethtool_op_get_link,
.get_ts_info = vlan_ethtool_get_ts_info,
.set_dump = vlan_set_dump,
};

static const struct net_device_ops vlan_netdev_ops = {
Expand Down

0 comments on commit d5c99e0

Please sign in to comment.