[linux-next] LinuxNextTracking branch, master, updated. next-20160905

batman at open-mesh.org batman at open-mesh.org
Tue Sep 6 00:15:45 CEST 2016


The following commit has been merged in the master branch:
commit deeb91f59dbcdcb8044c6109b3d7b11448d9a72d
Author: stephen hemminger <stephen at networkplumber.org>
Date:   Wed Aug 31 15:17:00 2016 -0700

    batman: make netlink attributes const
    
    Signed-off-by: Stephen Hemminger <stephen at networkplumber.org>
    Signed-off-by: David S. Miller <davem at davemloft.net>

diff --git a/net/batman-adv/netlink.c b/net/batman-adv/netlink.c
index 18831e7..64cb6ac 100644
--- a/net/batman-adv/netlink.c
+++ b/net/batman-adv/netlink.c
@@ -62,11 +62,11 @@ enum batadv_netlink_multicast_groups {
 	BATADV_NL_MCGRP_TPMETER,
 };
 
-static struct genl_multicast_group batadv_netlink_mcgrps[] = {
+static const struct genl_multicast_group batadv_netlink_mcgrps[] = {
 	[BATADV_NL_MCGRP_TPMETER] = { .name = BATADV_NL_MCAST_GROUP_TPMETER },
 };
 
-static struct nla_policy batadv_netlink_policy[NUM_BATADV_ATTR] = {
+static const struct nla_policy batadv_netlink_policy[NUM_BATADV_ATTR] = {
 	[BATADV_ATTR_VERSION]		= { .type = NLA_STRING },
 	[BATADV_ATTR_ALGO_NAME]		= { .type = NLA_STRING },
 	[BATADV_ATTR_MESH_IFINDEX]	= { .type = NLA_U32 },

-- 
LinuxNextTracking


More information about the linux-merge mailing list