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>

diff --git a/Documentation/networking/ethtool-netlink.rst b/Documentation/networking/ethtool-netlink.rst
index 856c4b5bcd6a075f559c6faabcd9a98acb8b3ac4..f1950a0a6c9366f3365f4188c8765b05b9b24572 100644 (file)
--- a/Documentation/networking/ethtool-netlink.rst
+++ b/Documentation/networking/ethtool-netlink.rst
@@ -232,6 +232,7 @@ Kernel to userspace:
   ``ETHTOOL_MSG_PAUSE_GET_REPLY``       pause parameters
   ``ETHTOOL_MSG_PAUSE_NTF``             pause parameters
   ``ETHTOOL_MSG_EEE_GET_REPLY``         EEE settings
+  ``ETHTOOL_MSG_EEE_NTF``               EEE settings
   ===================================== =================================
 
 ``GET`` requests are sent by userspace applications to retrieve device

diff --git a/include/uapi/linux/ethtool_netlink.h b/include/uapi/linux/ethtool_netlink.h
index 8959bc899f3cd58fc173f5f021c621f8306c4db8..bacdd5363510e027145b447455118c170ce27cdd 100644 (file)
--- a/include/uapi/linux/ethtool_netlink.h
+++ b/include/uapi/linux/ethtool_netlink.h
@@ -71,6 +71,7 @@ enum {
        ETHTOOL_MSG_PAUSE_GET_REPLY,
        ETHTOOL_MSG_PAUSE_NTF,
        ETHTOOL_MSG_EEE_GET_REPLY,
+       ETHTOOL_MSG_EEE_NTF,
 
        /* add new constants above here */
        __ETHTOOL_MSG_KERNEL_CNT,

diff --git a/net/ethtool/eee.c b/net/ethtool/eee.c
index ded092d1b2b9653ddfdb5027a87e41a850fbb1eb..94aa19cff22f04804c3a3e1f93e93d81b99c2bcf 100644 (file)
--- 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 c7a039a6e11eec476f25bd159eaaa2eb9b2ec5f3..05a2bf64a96b3f4428853e3d943b5543c4b4221b 100644 (file)
--- 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 4630206837e003d57b29e289f44002d3646595a3..e525c7b8ba4d4e18851ae686f5ecd877f5033989 100644 (file)
--- 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]      = &ethnl_channels_request_ops,
        [ETHTOOL_MSG_COALESCE_NTF]      = &ethnl_coalesce_request_ops,
        [ETHTOOL_MSG_PAUSE_NTF]         = &ethnl_pause_request_ops,
+       [ETHTOOL_MSG_EEE_NTF]           = &ethnl_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)