diff options
Diffstat (limited to 'net/tipc/netlink_compat.c')
-rw-r--r-- | net/tipc/netlink_compat.c | 24 |
1 files changed, 12 insertions, 12 deletions
diff --git a/net/tipc/netlink_compat.c b/net/tipc/netlink_compat.c index 340a6e7c43a7..36fe2dbb6d87 100644 --- a/net/tipc/netlink_compat.c +++ b/net/tipc/netlink_compat.c | |||
@@ -399,7 +399,7 @@ static int tipc_nl_compat_bearer_enable(struct tipc_nl_compat_cmd_doit *cmd, | |||
399 | 399 | ||
400 | b = (struct tipc_bearer_config *)TLV_DATA(msg->req); | 400 | b = (struct tipc_bearer_config *)TLV_DATA(msg->req); |
401 | 401 | ||
402 | bearer = nla_nest_start(skb, TIPC_NLA_BEARER); | 402 | bearer = nla_nest_start_noflag(skb, TIPC_NLA_BEARER); |
403 | if (!bearer) | 403 | if (!bearer) |
404 | return -EMSGSIZE; | 404 | return -EMSGSIZE; |
405 | 405 | ||
@@ -419,7 +419,7 @@ static int tipc_nl_compat_bearer_enable(struct tipc_nl_compat_cmd_doit *cmd, | |||
419 | return -EMSGSIZE; | 419 | return -EMSGSIZE; |
420 | 420 | ||
421 | if (ntohl(b->priority) <= TIPC_MAX_LINK_PRI) { | 421 | if (ntohl(b->priority) <= TIPC_MAX_LINK_PRI) { |
422 | prop = nla_nest_start(skb, TIPC_NLA_BEARER_PROP); | 422 | prop = nla_nest_start_noflag(skb, TIPC_NLA_BEARER_PROP); |
423 | if (!prop) | 423 | if (!prop) |
424 | return -EMSGSIZE; | 424 | return -EMSGSIZE; |
425 | if (nla_put_u32(skb, TIPC_NLA_PROP_PRIO, ntohl(b->priority))) | 425 | if (nla_put_u32(skb, TIPC_NLA_PROP_PRIO, ntohl(b->priority))) |
@@ -441,7 +441,7 @@ static int tipc_nl_compat_bearer_disable(struct tipc_nl_compat_cmd_doit *cmd, | |||
441 | 441 | ||
442 | name = (char *)TLV_DATA(msg->req); | 442 | name = (char *)TLV_DATA(msg->req); |
443 | 443 | ||
444 | bearer = nla_nest_start(skb, TIPC_NLA_BEARER); | 444 | bearer = nla_nest_start_noflag(skb, TIPC_NLA_BEARER); |
445 | if (!bearer) | 445 | if (!bearer) |
446 | return -EMSGSIZE; | 446 | return -EMSGSIZE; |
447 | 447 | ||
@@ -685,7 +685,7 @@ static int tipc_nl_compat_media_set(struct sk_buff *skb, | |||
685 | 685 | ||
686 | lc = (struct tipc_link_config *)TLV_DATA(msg->req); | 686 | lc = (struct tipc_link_config *)TLV_DATA(msg->req); |
687 | 687 | ||
688 | media = nla_nest_start(skb, TIPC_NLA_MEDIA); | 688 | media = nla_nest_start_noflag(skb, TIPC_NLA_MEDIA); |
689 | if (!media) | 689 | if (!media) |
690 | return -EMSGSIZE; | 690 | return -EMSGSIZE; |
691 | 691 | ||
@@ -696,7 +696,7 @@ static int tipc_nl_compat_media_set(struct sk_buff *skb, | |||
696 | if (nla_put_string(skb, TIPC_NLA_MEDIA_NAME, lc->name)) | 696 | if (nla_put_string(skb, TIPC_NLA_MEDIA_NAME, lc->name)) |
697 | return -EMSGSIZE; | 697 | return -EMSGSIZE; |
698 | 698 | ||
699 | prop = nla_nest_start(skb, TIPC_NLA_MEDIA_PROP); | 699 | prop = nla_nest_start_noflag(skb, TIPC_NLA_MEDIA_PROP); |
700 | if (!prop) | 700 | if (!prop) |
701 | return -EMSGSIZE; | 701 | return -EMSGSIZE; |
702 | 702 | ||
@@ -717,7 +717,7 @@ static int tipc_nl_compat_bearer_set(struct sk_buff *skb, | |||
717 | 717 | ||
718 | lc = (struct tipc_link_config *)TLV_DATA(msg->req); | 718 | lc = (struct tipc_link_config *)TLV_DATA(msg->req); |
719 | 719 | ||
720 | bearer = nla_nest_start(skb, TIPC_NLA_BEARER); | 720 | bearer = nla_nest_start_noflag(skb, TIPC_NLA_BEARER); |
721 | if (!bearer) | 721 | if (!bearer) |
722 | return -EMSGSIZE; | 722 | return -EMSGSIZE; |
723 | 723 | ||
@@ -728,7 +728,7 @@ static int tipc_nl_compat_bearer_set(struct sk_buff *skb, | |||
728 | if (nla_put_string(skb, TIPC_NLA_BEARER_NAME, lc->name)) | 728 | if (nla_put_string(skb, TIPC_NLA_BEARER_NAME, lc->name)) |
729 | return -EMSGSIZE; | 729 | return -EMSGSIZE; |
730 | 730 | ||
731 | prop = nla_nest_start(skb, TIPC_NLA_BEARER_PROP); | 731 | prop = nla_nest_start_noflag(skb, TIPC_NLA_BEARER_PROP); |
732 | if (!prop) | 732 | if (!prop) |
733 | return -EMSGSIZE; | 733 | return -EMSGSIZE; |
734 | 734 | ||
@@ -748,14 +748,14 @@ static int __tipc_nl_compat_link_set(struct sk_buff *skb, | |||
748 | 748 | ||
749 | lc = (struct tipc_link_config *)TLV_DATA(msg->req); | 749 | lc = (struct tipc_link_config *)TLV_DATA(msg->req); |
750 | 750 | ||
751 | link = nla_nest_start(skb, TIPC_NLA_LINK); | 751 | link = nla_nest_start_noflag(skb, TIPC_NLA_LINK); |
752 | if (!link) | 752 | if (!link) |
753 | return -EMSGSIZE; | 753 | return -EMSGSIZE; |
754 | 754 | ||
755 | if (nla_put_string(skb, TIPC_NLA_LINK_NAME, lc->name)) | 755 | if (nla_put_string(skb, TIPC_NLA_LINK_NAME, lc->name)) |
756 | return -EMSGSIZE; | 756 | return -EMSGSIZE; |
757 | 757 | ||
758 | prop = nla_nest_start(skb, TIPC_NLA_LINK_PROP); | 758 | prop = nla_nest_start_noflag(skb, TIPC_NLA_LINK_PROP); |
759 | if (!prop) | 759 | if (!prop) |
760 | return -EMSGSIZE; | 760 | return -EMSGSIZE; |
761 | 761 | ||
@@ -811,7 +811,7 @@ static int tipc_nl_compat_link_reset_stats(struct tipc_nl_compat_cmd_doit *cmd, | |||
811 | 811 | ||
812 | name = (char *)TLV_DATA(msg->req); | 812 | name = (char *)TLV_DATA(msg->req); |
813 | 813 | ||
814 | link = nla_nest_start(skb, TIPC_NLA_LINK); | 814 | link = nla_nest_start_noflag(skb, TIPC_NLA_LINK); |
815 | if (!link) | 815 | if (!link) |
816 | return -EMSGSIZE; | 816 | return -EMSGSIZE; |
817 | 817 | ||
@@ -973,7 +973,7 @@ static int tipc_nl_compat_publ_dump(struct tipc_nl_compat_msg *msg, u32 sock) | |||
973 | return -EMSGSIZE; | 973 | return -EMSGSIZE; |
974 | } | 974 | } |
975 | 975 | ||
976 | nest = nla_nest_start(args, TIPC_NLA_SOCK); | 976 | nest = nla_nest_start_noflag(args, TIPC_NLA_SOCK); |
977 | if (!nest) { | 977 | if (!nest) { |
978 | kfree_skb(args); | 978 | kfree_skb(args); |
979 | return -EMSGSIZE; | 979 | return -EMSGSIZE; |
@@ -1100,7 +1100,7 @@ static int tipc_nl_compat_net_set(struct tipc_nl_compat_cmd_doit *cmd, | |||
1100 | 1100 | ||
1101 | val = ntohl(*(__be32 *)TLV_DATA(msg->req)); | 1101 | val = ntohl(*(__be32 *)TLV_DATA(msg->req)); |
1102 | 1102 | ||
1103 | net = nla_nest_start(skb, TIPC_NLA_NET); | 1103 | net = nla_nest_start_noflag(skb, TIPC_NLA_NET); |
1104 | if (!net) | 1104 | if (!net) |
1105 | return -EMSGSIZE; | 1105 | return -EMSGSIZE; |
1106 | 1106 | ||