diff options
Diffstat (limited to 'net/tipc/udp_media.c')
-rw-r--r-- | net/tipc/udp_media.c | 13 |
1 files changed, 5 insertions, 8 deletions
diff --git a/net/tipc/udp_media.c b/net/tipc/udp_media.c index 24d7c79598bb..7fc02d84c4f1 100644 --- a/net/tipc/udp_media.c +++ b/net/tipc/udp_media.c | |||
@@ -447,9 +447,9 @@ int tipc_udp_nl_dump_remoteip(struct sk_buff *skb, struct netlink_callback *cb) | |||
447 | if (!attrs[TIPC_NLA_BEARER]) | 447 | if (!attrs[TIPC_NLA_BEARER]) |
448 | return -EINVAL; | 448 | return -EINVAL; |
449 | 449 | ||
450 | err = nla_parse_nested(battrs, TIPC_NLA_BEARER_MAX, | 450 | err = nla_parse_nested_deprecated(battrs, TIPC_NLA_BEARER_MAX, |
451 | attrs[TIPC_NLA_BEARER], | 451 | attrs[TIPC_NLA_BEARER], |
452 | tipc_nl_bearer_policy, NULL); | 452 | tipc_nl_bearer_policy, NULL); |
453 | if (err) | 453 | if (err) |
454 | return err; | 454 | return err; |
455 | 455 | ||
@@ -601,8 +601,7 @@ int tipc_udp_nl_bearer_add(struct tipc_bearer *b, struct nlattr *attr) | |||
601 | struct nlattr *opts[TIPC_NLA_UDP_MAX + 1]; | 601 | struct nlattr *opts[TIPC_NLA_UDP_MAX + 1]; |
602 | struct udp_media_addr *dst; | 602 | struct udp_media_addr *dst; |
603 | 603 | ||
604 | if (nla_parse_nested(opts, TIPC_NLA_UDP_MAX, attr, | 604 | if (nla_parse_nested_deprecated(opts, TIPC_NLA_UDP_MAX, attr, tipc_nl_udp_policy, NULL)) |
605 | tipc_nl_udp_policy, NULL)) | ||
606 | return -EINVAL; | 605 | return -EINVAL; |
607 | 606 | ||
608 | if (!opts[TIPC_NLA_UDP_REMOTE]) | 607 | if (!opts[TIPC_NLA_UDP_REMOTE]) |
@@ -655,9 +654,7 @@ static int tipc_udp_enable(struct net *net, struct tipc_bearer *b, | |||
655 | if (!attrs[TIPC_NLA_BEARER_UDP_OPTS]) | 654 | if (!attrs[TIPC_NLA_BEARER_UDP_OPTS]) |
656 | goto err; | 655 | goto err; |
657 | 656 | ||
658 | if (nla_parse_nested(opts, TIPC_NLA_UDP_MAX, | 657 | if (nla_parse_nested_deprecated(opts, TIPC_NLA_UDP_MAX, attrs[TIPC_NLA_BEARER_UDP_OPTS], tipc_nl_udp_policy, NULL)) |
659 | attrs[TIPC_NLA_BEARER_UDP_OPTS], | ||
660 | tipc_nl_udp_policy, NULL)) | ||
661 | goto err; | 658 | goto err; |
662 | 659 | ||
663 | if (!opts[TIPC_NLA_UDP_LOCAL] || !opts[TIPC_NLA_UDP_REMOTE]) { | 660 | if (!opts[TIPC_NLA_UDP_LOCAL] || !opts[TIPC_NLA_UDP_REMOTE]) { |