diff options
author | Michal Kubecek <mkubecek@suse.cz> | 2020-03-28 00:01:48 +0100 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2020-03-29 22:32:36 -0700 |
commit | 6c5bc8fe4e1915da8296a665bd742dbe34de02f0 (patch) | |
tree | 407739e00f65ba29cb6faf4001a0849ab2def99b /net | |
parent | fd77be7bd43c578614165b1ae5fdb91b8f2f1689 (diff) |
ethtool: add EEE_NTF notification
Send ETHTOOL_MSG_EEE_NTF notification whenever EEE settings of a network
device are modified using ETHTOOL_MSG_EEE_SET netlink message or
ETHTOOL_SEEE ioctl request.
Signed-off-by: Michal Kubecek <mkubecek@suse.cz>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net')
-rw-r--r-- | net/ethtool/eee.c | 3 | ||||
-rw-r--r-- | net/ethtool/ioctl.c | 6 | ||||
-rw-r--r-- | net/ethtool/netlink.c | 2 |
3 files changed, 10 insertions, 1 deletions
diff --git a/net/ethtool/eee.c b/net/ethtool/eee.c index ded092d1b2b9..94aa19cff22f 100644 --- a/net/ethtool/eee.c +++ b/net/ethtool/eee.c @@ -192,6 +192,9 @@ int ethnl_set_eee(struct sk_buff *skb, struct genl_info *info) goto out_ops; ret = dev->ethtool_ops->set_eee(dev, &eee); + if (ret < 0) + goto out_ops; + ethtool_notify(dev, ETHTOOL_MSG_EEE_NTF, NULL); out_ops: ethnl_ops_complete(dev); diff --git a/net/ethtool/ioctl.c b/net/ethtool/ioctl.c index c7a039a6e11e..05a2bf64a96b 100644 --- a/net/ethtool/ioctl.c +++ b/net/ethtool/ioctl.c @@ -1354,6 +1354,7 @@ static int ethtool_get_eee(struct net_device *dev, char __user *useraddr) static int ethtool_set_eee(struct net_device *dev, char __user *useraddr) { struct ethtool_eee edata; + int ret; if (!dev->ethtool_ops->set_eee) return -EOPNOTSUPP; @@ -1361,7 +1362,10 @@ static int ethtool_set_eee(struct net_device *dev, char __user *useraddr) if (copy_from_user(&edata, useraddr, sizeof(edata))) return -EFAULT; - return dev->ethtool_ops->set_eee(dev, &edata); + ret = dev->ethtool_ops->set_eee(dev, &edata); + if (!ret) + ethtool_notify(dev, ETHTOOL_MSG_EEE_NTF, NULL); + return ret; } static int ethtool_nway_reset(struct net_device *dev) diff --git a/net/ethtool/netlink.c b/net/ethtool/netlink.c index 4630206837e0..e525c7b8ba4d 100644 --- a/net/ethtool/netlink.c +++ b/net/ethtool/netlink.c @@ -548,6 +548,7 @@ ethnl_default_notify_ops[ETHTOOL_MSG_KERNEL_MAX + 1] = { [ETHTOOL_MSG_CHANNELS_NTF] = ðnl_channels_request_ops, [ETHTOOL_MSG_COALESCE_NTF] = ðnl_coalesce_request_ops, [ETHTOOL_MSG_PAUSE_NTF] = ðnl_pause_request_ops, + [ETHTOOL_MSG_EEE_NTF] = ðnl_eee_request_ops, }; /* default notification handler */ @@ -639,6 +640,7 @@ static const ethnl_notify_handler_t ethnl_notify_handlers[] = { [ETHTOOL_MSG_CHANNELS_NTF] = ethnl_default_notify, [ETHTOOL_MSG_COALESCE_NTF] = ethnl_default_notify, [ETHTOOL_MSG_PAUSE_NTF] = ethnl_default_notify, + [ETHTOOL_MSG_EEE_NTF] = ethnl_default_notify, }; void ethtool_notify(struct net_device *dev, unsigned int cmd, const void *data) |