Merge tag 'fs_for_v5.12-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/jack...

[linux-block.git] / net / ethtool / linkstate.c

diff --git a/net/ethtool/linkstate.c b/net/ethtool/linkstate.c
index 4834091ec24c426c3ef6a81334856f4c275f1a3c..fb676f349455aed52ebc5cc5d8c5d42bf9c2b9f1 100644 (file)
--- a/net/ethtool/linkstate.c
+++ b/net/ethtool/linkstate.c
@@ -20,15 +20,9 @@ struct linkstate_reply_data {
 #define LINKSTATE_REPDATA(__reply_base) \
        container_of(__reply_base, struct linkstate_reply_data, base)
 
-static const struct nla_policy
-linkstate_get_policy[ETHTOOL_A_LINKSTATE_MAX + 1] = {
-       [ETHTOOL_A_LINKSTATE_UNSPEC]            = { .type = NLA_REJECT },
-       [ETHTOOL_A_LINKSTATE_HEADER]            = { .type = NLA_NESTED },
-       [ETHTOOL_A_LINKSTATE_LINK]              = { .type = NLA_REJECT },
-       [ETHTOOL_A_LINKSTATE_SQI]               = { .type = NLA_REJECT },
-       [ETHTOOL_A_LINKSTATE_SQI_MAX]           = { .type = NLA_REJECT },
-       [ETHTOOL_A_LINKSTATE_EXT_STATE]         = { .type = NLA_REJECT },
-       [ETHTOOL_A_LINKSTATE_EXT_SUBSTATE]      = { .type = NLA_REJECT },
+const struct nla_policy ethnl_linkstate_get_policy[] = {
+       [ETHTOOL_A_LINKSTATE_HEADER]            =
+               NLA_POLICY_NESTED(ethnl_header_policy),
 };
 
 static int linkstate_get_sqi(struct net_device *dev)
@@ -179,10 +173,8 @@ const struct ethnl_request_ops ethnl_linkstate_request_ops = {
        .request_cmd            = ETHTOOL_MSG_LINKSTATE_GET,
        .reply_cmd              = ETHTOOL_MSG_LINKSTATE_GET_REPLY,
        .hdr_attr               = ETHTOOL_A_LINKSTATE_HEADER,
-       .max_attr               = ETHTOOL_A_LINKSTATE_MAX,
        .req_info_size          = sizeof(struct linkstate_req_info),
        .reply_data_size        = sizeof(struct linkstate_reply_data),
-       .request_policy         = linkstate_get_policy,
 
        .prepare_data           = linkstate_prepare_data,
        .reply_size             = linkstate_reply_size,