renegade-project/linux-next
2
0
Fork 0
mirror of https://github.com/edk2-porting/linux-next.git synced 2024-11-17 07:04:01 +08:00
Code

genetlink: make all genl_ops users const

Browse Source 
Now that genl_ops are no longer modified in place when
registering, they can be made const. This patch was done
mostly with spatch:

@@
identifier ops;
@@
+const
 struct genl_ops ops[] = {
 ...
 };

(except the struct thing in net/openvswitch/datapath.c)

Signed-off-by: Johannes Berg <johannes.berg@intel.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
Johannes Berg 2013-11-14 17:14:46 +01:00 committed by David S. Miller
parent f84f771d94
commit 4534de8305
17 changed files with 21 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
drivers/net/team/team.c
View File

@ -2644,7 +2644,7 @@ static int team_nl_cmd_port_list_get(struct sk_buff *skb,
return err; return err;
} }
static struct genl_ops team_nl_ops[] = { static const struct genl_ops team_nl_ops[] = {
{ {
.cmd = TEAM_CMD_NOOP, .cmd = TEAM_CMD_NOOP,
.doit = team_nl_cmd_noop, .doit = team_nl_cmd_noop,

2
drivers/net/wireless/mac80211_hwsim.c
View File

@ -2097,7 +2097,7 @@ out:
} }
/* Generic Netlink operations array */ /* Generic Netlink operations array */
static struct genl_ops hwsim_ops[] = { static const struct genl_ops hwsim_ops[] = {
{ {
.cmd = HWSIM_CMD_REGISTER, .cmd = HWSIM_CMD_REGISTER,
.policy = hwsim_genl_policy, .policy = hwsim_genl_policy,

2
kernel/taskstats.c
View File

@ -673,7 +673,7 @@ err:
nlmsg_free(rep_skb); nlmsg_free(rep_skb);
} }
static struct genl_ops taskstats_ops[] = { static const struct genl_ops taskstats_ops[] = {
{ {
.cmd = TASKSTATS_CMD_GET, .cmd = TASKSTATS_CMD_GET,
.doit = taskstats_user_cmd, .doit = taskstats_user_cmd,

2
net/core/drop_monitor.c
View File

@ -333,7 +333,7 @@ out:
return NOTIFY_DONE; return NOTIFY_DONE;
} }
static struct genl_ops dropmon_ops[] = { static const struct genl_ops dropmon_ops[] = {
{ {
.cmd = NET_DM_CMD_CONFIG, .cmd = NET_DM_CMD_CONFIG,
.doit = net_dm_cmd_config, .doit = net_dm_cmd_config,

2
net/hsr/hsr_netlink.c
View File

@ -389,7 +389,7 @@ fail:
} }
static struct genl_ops hsr_ops[] = { static const struct genl_ops hsr_ops[] = {
{ {
.cmd = HSR_C_GET_NODE_STATUS, .cmd = HSR_C_GET_NODE_STATUS,
.flags = 0, .flags = 0,

2
net/ieee802154/netlink.c
View File

@ -109,7 +109,7 @@ out:
return -ENOBUFS; return -ENOBUFS;
} }
static struct genl_ops ieee8021154_ops[] = { static const struct genl_ops ieee8021154_ops[] = {
/* see nl-phy.c */ /* see nl-phy.c */
IEEE802154_DUMP(IEEE802154_LIST_PHY, ieee802154_list_phy, IEEE802154_DUMP(IEEE802154_LIST_PHY, ieee802154_list_phy,
ieee802154_dump_phy), ieee802154_dump_phy),

2
net/ipv4/tcp_metrics.c
View File

@ -991,7 +991,7 @@ static int tcp_metrics_nl_cmd_del(struct sk_buff *skb, struct genl_info *info)
return 0; return 0;
} }
static struct genl_ops tcp_metrics_nl_ops[] = { static const struct genl_ops tcp_metrics_nl_ops[] = {
{ {
.cmd = TCP_METRICS_CMD_GET, .cmd = TCP_METRICS_CMD_GET,
.doit = tcp_metrics_nl_cmd_get, .doit = tcp_metrics_nl_cmd_get,

2
net/irda/irnetlink.c
View File

@ -131,7 +131,7 @@ static const struct nla_policy irda_nl_policy[IRDA_NL_ATTR_MAX + 1] = {
[IRDA_NL_ATTR_MODE] = { .type = NLA_U32 }, [IRDA_NL_ATTR_MODE] = { .type = NLA_U32 },
}; };
static struct genl_ops irda_nl_ops[] = { static const struct genl_ops irda_nl_ops[] = {
{ {
.cmd = IRDA_NL_CMD_SET_MODE, .cmd = IRDA_NL_CMD_SET_MODE,
.doit = irda_nl_set_mode, .doit = irda_nl_set_mode,

2
net/l2tp/l2tp_netlink.c
View File

@ -793,7 +793,7 @@ static struct nla_policy l2tp_nl_policy[L2TP_ATTR_MAX + 1] = {
}, },
}; };
static struct genl_ops l2tp_nl_ops[] = { static const struct genl_ops l2tp_nl_ops[] = {
{ {
.cmd = L2TP_CMD_NOOP, .cmd = L2TP_CMD_NOOP,
.doit = l2tp_nl_cmd_noop, .doit = l2tp_nl_cmd_noop,

2
net/netfilter/ipvs/ip_vs_ctl.c
View File

@ -3567,7 +3567,7 @@ out:
} }
static struct genl_ops ip_vs_genl_ops[] __read_mostly = { static const struct genl_ops ip_vs_genl_ops[] __read_mostly = {
{ {
.cmd = IPVS_CMD_NEW_SERVICE, .cmd = IPVS_CMD_NEW_SERVICE,
.flags = GENL_ADMIN_PERM, .flags = GENL_ADMIN_PERM,

2
net/netlabel/netlabel_cipso_v4.c
View File

@ -737,7 +737,7 @@ static int netlbl_cipsov4_remove(struct sk_buff *skb, struct genl_info *info)
* NetLabel Generic NETLINK Command Definitions * NetLabel Generic NETLINK Command Definitions
*/ */
static struct genl_ops netlbl_cipsov4_ops[] = { static const struct genl_ops netlbl_cipsov4_ops[] = {
{ {
.cmd = NLBL_CIPSOV4_C_ADD, .cmd = NLBL_CIPSOV4_C_ADD,
.flags = GENL_ADMIN_PERM, .flags = GENL_ADMIN_PERM,

2
net/netlabel/netlabel_mgmt.c
View File

@ -705,7 +705,7 @@ version_failure:
* NetLabel Generic NETLINK Command Definitions * NetLabel Generic NETLINK Command Definitions
*/ */
static struct genl_ops netlbl_mgmt_genl_ops[] = { static const struct genl_ops netlbl_mgmt_genl_ops[] = {
{ {
.cmd = NLBL_MGMT_C_ADD, .cmd = NLBL_MGMT_C_ADD,
.flags = GENL_ADMIN_PERM, .flags = GENL_ADMIN_PERM,

2
net/netlabel/netlabel_unlabeled.c
View File

@ -1323,7 +1323,7 @@ unlabel_staticlistdef_return:
* NetLabel Generic NETLINK Command Definitions * NetLabel Generic NETLINK Command Definitions
*/ */
static struct genl_ops netlbl_unlabel_genl_ops[] = { static const struct genl_ops netlbl_unlabel_genl_ops[] = {
{ {
.cmd = NLBL_UNLABEL_C_STATICADD, .cmd = NLBL_UNLABEL_C_STATICADD,
.flags = GENL_ADMIN_PERM, .flags = GENL_ADMIN_PERM,

2
net/nfc/netlink.c
View File

@ -1364,7 +1364,7 @@ static int nfc_genl_se_io(struct sk_buff *skb, struct genl_info *info)
return dev->ops->se_io(dev, se_idx, apdu, apdu_len, se_io_cb, ctx); return dev->ops->se_io(dev, se_idx, apdu, apdu_len, se_io_cb, ctx);
} }
static struct genl_ops nfc_genl_ops[] = { static const struct genl_ops nfc_genl_ops[] = {
{ {
.cmd = NFC_CMD_GET_DEVICE, .cmd = NFC_CMD_GET_DEVICE,
.doit = nfc_genl_get_device, .doit = nfc_genl_get_device,

10
net/openvswitch/datapath.c
View File

@ -557,7 +557,7 @@ static const struct nla_policy packet_policy[OVS_PACKET_ATTR_MAX + 1] = {
[OVS_PACKET_ATTR_ACTIONS] = { .type = NLA_NESTED }, [OVS_PACKET_ATTR_ACTIONS] = { .type = NLA_NESTED },
}; };
static struct genl_ops dp_packet_genl_ops[] = { static const struct genl_ops dp_packet_genl_ops[] = {
{ .cmd = OVS_PACKET_CMD_EXECUTE, { .cmd = OVS_PACKET_CMD_EXECUTE,
.flags = GENL_ADMIN_PERM, /* Requires CAP_NET_ADMIN privilege. */ .flags = GENL_ADMIN_PERM, /* Requires CAP_NET_ADMIN privilege. */
.policy = packet_policy, .policy = packet_policy,
@ -1034,7 +1034,7 @@ static int ovs_flow_cmd_dump(struct sk_buff *skb, struct netlink_callback *cb)
return skb->len; return skb->len;
} }
static struct genl_ops dp_flow_genl_ops[] = { static const struct genl_ops dp_flow_genl_ops[] = {
{ .cmd = OVS_FLOW_CMD_NEW, { .cmd = OVS_FLOW_CMD_NEW,
.flags = GENL_ADMIN_PERM, /* Requires CAP_NET_ADMIN privilege. */ .flags = GENL_ADMIN_PERM, /* Requires CAP_NET_ADMIN privilege. */
.policy = flow_policy, .policy = flow_policy,
@ -1392,7 +1392,7 @@ static int ovs_dp_cmd_dump(struct sk_buff *skb, struct netlink_callback *cb)
return skb->len; return skb->len;
} }
static struct genl_ops dp_datapath_genl_ops[] = { static const struct genl_ops dp_datapath_genl_ops[] = {
{ .cmd = OVS_DP_CMD_NEW, { .cmd = OVS_DP_CMD_NEW,
.flags = GENL_ADMIN_PERM, /* Requires CAP_NET_ADMIN privilege. */ .flags = GENL_ADMIN_PERM, /* Requires CAP_NET_ADMIN privilege. */
.policy = datapath_policy, .policy = datapath_policy,
@ -1753,7 +1753,7 @@ out:
return skb->len; return skb->len;
} }
static struct genl_ops dp_vport_genl_ops[] = { static const struct genl_ops dp_vport_genl_ops[] = {
{ .cmd = OVS_VPORT_CMD_NEW, { .cmd = OVS_VPORT_CMD_NEW,
.flags = GENL_ADMIN_PERM, /* Requires CAP_NET_ADMIN privilege. */ .flags = GENL_ADMIN_PERM, /* Requires CAP_NET_ADMIN privilege. */
.policy = vport_policy, .policy = vport_policy,
@ -1779,7 +1779,7 @@ static struct genl_ops dp_vport_genl_ops[] = {
struct genl_family_and_ops { struct genl_family_and_ops {
struct genl_family *family; struct genl_family *family;
struct genl_ops *ops; const struct genl_ops *ops;
int n_ops; int n_ops;
struct genl_multicast_group *group; struct genl_multicast_group *group;
}; };

2
net/wimax/stack.c
View File

@ -415,7 +415,7 @@ static const struct nla_policy wimax_gnl_policy[WIMAX_GNL_ATTR_MAX + 1] = {
}, },
}; };
static struct genl_ops wimax_gnl_ops[] = { static const struct genl_ops wimax_gnl_ops[] = {
{ {
.cmd = WIMAX_GNL_OP_MSG_FROM_USER, .cmd = WIMAX_GNL_OP_MSG_FROM_USER,
.flags = GENL_ADMIN_PERM, .flags = GENL_ADMIN_PERM,

2
net/wireless/nl80211.c
View File

@ -8937,7 +8937,7 @@ static void nl80211_post_doit(const struct genl_ops *ops, struct sk_buff *skb,
rtnl_unlock(); rtnl_unlock();
} }
static struct genl_ops nl80211_ops[] = { static const struct genl_ops nl80211_ops[] = {
{ {
.cmd = NL80211_CMD_GET_WIPHY, .cmd = NL80211_CMD_GET_WIPHY,
.doit = nl80211_get_wiphy, .doit = nl80211_get_wiphy,