Skip to contentSkip to conversation

constify nla_policy

PATCH In review Stephen Hemminger 2 participants 4 messages Jul 18, 2018 – Jul 20, 2018

Subsystems (5)
Networking Network drivers Block layer Network block device (NBD) +1 more subsystems
lore
Share & tools
lore

Stephen Hemminger

author
#0 lore raw

cover constify nla_policy

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(-)
Signature · 1 line
2.18.0
author
#1 lore raw

PATCH 1/2 nbd: constify nla_policy

The netlink policy should be const like other drivers.

Signed-off-by Stephen Hemminger <[email protected]>
---
 drivers/block/nbd.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)
drivers/block/nbd.c +3 -3
index 74a05561b620..e07401d3901d 100644
@@ -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 },
Signature · 1 line
2.18.0
author
#2 lore raw

PATCH 2/2 gtp: constify nla_policy

In reply to Stephen Hemminger

The netlink policy structure can be constant like other drivers.

Signed-off-by Stephen Hemminger <[email protected]>
---
 drivers/net/gtp.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/net/gtp.c +1 -1
index ec629a730005..7a145172d503 100644
@@ -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, },
Signature · 1 line
2.18.0