aboutsummaryrefslogtreecommitdiff
path: root/net/netlink/genetlink.c
diff options
context:
space:
mode:
authorJohannes Berg <johannes.berg@intel.com>2013-11-18 20:54:58 +0100
committerDavid S. Miller <davem@davemloft.net>2013-11-18 15:34:00 -0500
commit029b234fb34d53e11cadd8c1f530107f557e1aca (patch)
tree27bd2ee5ec4653385c91f271529049563f94879e /net/netlink/genetlink.c
parentbceaa90240b6019ed73b49965eac7d167610be69 (diff)
downloadlinux-029b234fb34d53e11cadd8c1f530107f557e1aca.tar.gz
genetlink: rename shadowed variable
Sparse pointed out that the new flags variable I had added shadowed an existing one, rename the new one to avoid that, making the code clearer. Signed-off-by: Johannes Berg <johannes.berg@intel.com> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/netlink/genetlink.c')
-rw-r--r--net/netlink/genetlink.c10
1 files changed, 5 insertions, 5 deletions
diff --git a/net/netlink/genetlink.c b/net/netlink/genetlink.c
index f07eb568a1d..f54215d7b8f 100644
--- a/net/netlink/genetlink.c
+++ b/net/netlink/genetlink.c
@@ -647,21 +647,21 @@ static int ctrl_fill_info(struct genl_family *family, u32 portid, u32 seq,
for (i = 0; i < family->n_ops; i++) {
struct nlattr *nest;
const struct genl_ops *ops = &family->ops[i];
- u32 flags = ops->flags;
+ u32 op_flags = ops->flags;
if (ops->dumpit)
- flags |= GENL_CMD_CAP_DUMP;
+ op_flags |= GENL_CMD_CAP_DUMP;
if (ops->doit)
- flags |= GENL_CMD_CAP_DO;
+ op_flags |= GENL_CMD_CAP_DO;
if (ops->policy)
- flags |= GENL_CMD_CAP_HASPOL;
+ op_flags |= GENL_CMD_CAP_HASPOL;
nest = nla_nest_start(skb, i + 1);
if (nest == NULL)
goto nla_put_failure;
if (nla_put_u32(skb, CTRL_ATTR_OP_ID, ops->cmd) ||
- nla_put_u32(skb, CTRL_ATTR_OP_FLAGS, flags))
+ nla_put_u32(skb, CTRL_ATTR_OP_FLAGS, op_flags))
goto nla_put_failure;
nla_nest_end(skb, nest);