From stephen at networkplumber.org Wed Jul 18 16:32:42 2018 From: stephen at networkplumber.org (Stephen Hemminger) Date: Wed, 18 Jul 2018 09:32:42 -0700 Subject: [PATCH net-next 0/2] constify nla_policy Message-ID: <20180718163244.1590-1-sthemmin@microsoft.com> Almost all places that use nla_policy declare it const. A couple of drivers didn't but that is fixable. Stephen Hemminger (2): nbd: constify nla_policy gtp: constify nla_policy drivers/block/nbd.c | 6 +++--- drivers/net/gtp.c | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) -- 2.18.0 From stephen at networkplumber.org Wed Jul 18 16:32:43 2018 From: stephen at networkplumber.org (Stephen Hemminger) Date: Wed, 18 Jul 2018 09:32:43 -0700 Subject: [PATCH net-next 1/2] nbd: constify nla_policy In-Reply-To: <20180718163244.1590-1-sthemmin@microsoft.com> References: <20180718163244.1590-1-sthemmin@microsoft.com> Message-ID: <20180718163244.1590-2-sthemmin@microsoft.com> The netlink policy should be const like other drivers. Signed-off-by: Stephen Hemminger --- drivers/block/nbd.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/drivers/block/nbd.c b/drivers/block/nbd.c index 74a05561b620..e07401d3901d 100644 --- a/drivers/block/nbd.c +++ b/drivers/block/nbd.c @@ -1571,7 +1571,7 @@ static int find_free_cb(int id, void *ptr, void *data) } /* Netlink interface. */ -static struct nla_policy nbd_attr_policy[NBD_ATTR_MAX + 1] = { +static const struct nla_policy nbd_attr_policy[NBD_ATTR_MAX + 1] = { [NBD_ATTR_INDEX] = { .type = NLA_U32 }, [NBD_ATTR_SIZE_BYTES] = { .type = NLA_U64 }, [NBD_ATTR_BLOCK_SIZE_BYTES] = { .type = NLA_U64 }, @@ -1583,14 +1583,14 @@ static struct nla_policy nbd_attr_policy[NBD_ATTR_MAX + 1] = { [NBD_ATTR_DEVICE_LIST] = { .type = NLA_NESTED}, }; -static struct nla_policy nbd_sock_policy[NBD_SOCK_MAX + 1] = { +static const struct nla_policy nbd_sock_policy[NBD_SOCK_MAX + 1] = { [NBD_SOCK_FD] = { .type = NLA_U32 }, }; /* We don't use this right now since we don't parse the incoming list, but we * still want it here so userspace knows what to expect. */ -static struct nla_policy __attribute__((unused)) +static const struct nla_policy __attribute__((unused)) nbd_device_policy[NBD_DEVICE_ATTR_MAX + 1] = { [NBD_DEVICE_INDEX] = { .type = NLA_U32 }, [NBD_DEVICE_CONNECTED] = { .type = NLA_U8 }, -- 2.18.0 From stephen at networkplumber.org Wed Jul 18 16:32:44 2018 From: stephen at networkplumber.org (Stephen Hemminger) Date: Wed, 18 Jul 2018 09:32:44 -0700 Subject: [PATCH net-next 2/2] gtp: constify nla_policy In-Reply-To: <20180718163244.1590-1-sthemmin@microsoft.com> References: <20180718163244.1590-1-sthemmin@microsoft.com> Message-ID: <20180718163244.1590-3-sthemmin@microsoft.com> The netlink policy structure can be constant like other drivers. Signed-off-by: Stephen Hemminger --- drivers/net/gtp.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/net/gtp.c b/drivers/net/gtp.c index ec629a730005..7a145172d503 100644 --- a/drivers/net/gtp.c +++ b/drivers/net/gtp.c @@ -1255,7 +1255,7 @@ static int gtp_genl_dump_pdp(struct sk_buff *skb, return skb->len; } -static struct nla_policy gtp_genl_policy[GTPA_MAX + 1] = { +static const struct nla_policy gtp_genl_policy[GTPA_MAX + 1] = { [GTPA_LINK] = { .type = NLA_U32, }, [GTPA_VERSION] = { .type = NLA_U32, }, [GTPA_TID] = { .type = NLA_U64, }, -- 2.18.0