Merge patch series "Add non-coherent DMA support for AX45MP"

[platform/kernel/linux-starfive.git] / net / ethtool / pse-pd.c

diff --git a/net/ethtool/pse-pd.c b/net/ethtool/pse-pd.c
index 530b8b9..cc478af 100644 (file)
--- a/net/ethtool/pse-pd.c
+++ b/net/ethtool/pse-pd.c
@@ -53,8 +53,8 @@ static int pse_get_pse_attributes(struct net_device *dev,
 }
 
 static int pse_prepare_data(const struct ethnl_req_info *req_base,
-                              struct ethnl_reply_data *reply_base,
-                              struct genl_info *info)
+                           struct ethnl_reply_data *reply_base,
+                           const struct genl_info *info)
 {
        struct pse_reply_data *data = PSE_REPDATA(reply_base);
        struct net_device *dev = reply_base->dev;
@@ -64,7 +64,7 @@ static int pse_prepare_data(const struct ethnl_req_info *req_base,
        if (ret < 0)
                return ret;
 
-       ret = pse_get_pse_attributes(dev, info ? info->extack : NULL, data);
+       ret = pse_get_pse_attributes(dev, info->extack, data);
 
        ethnl_ops_complete(dev);