1 files changed, 21 insertions, 21 deletions
diff --git a/net/tipc/bearer.c b/net/tipc/bearer.c
index fd8e4e83f5e0..2bed6589f41e 100644
--- a/net/tipc/bearer.c
+++ b/net/tipc/bearer.c
@@ -776,9 +776,9 @@ int tipc_nl_bearer_get(struct sk_buff *skb, struct genl_info *info)
        if (!info->attrs[TIPC_NLA_BEARER])
                return -EINVAL;
-        err = nla_parse_nested(attrs, TIPC_NLA_BEARER_MAX,
+        err = nla_parse_nested_deprecated(attrs, TIPC_NLA_BEARER_MAX,
-                               info->attrs[TIPC_NLA_BEARER],
+                                          info->attrs[TIPC_NLA_BEARER],
-                               tipc_nl_bearer_policy, info->extack);
+                                          tipc_nl_bearer_policy, info->extack);
        if (err)
                return err;
@@ -825,9 +825,9 @@ int __tipc_nl_bearer_disable(struct sk_buff *skb, struct genl_info *info)
        if (!info->attrs[TIPC_NLA_BEARER])
                return -EINVAL;
-        err = nla_parse_nested(attrs, TIPC_NLA_BEARER_MAX,
+        err = nla_parse_nested_deprecated(attrs, TIPC_NLA_BEARER_MAX,
-                               info->attrs[TIPC_NLA_BEARER],
+                                          info->attrs[TIPC_NLA_BEARER],
-                               tipc_nl_bearer_policy, info->extack);
+                                          tipc_nl_bearer_policy, info->extack);
        if (err)
                return err;
@@ -870,9 +870,9 @@ int __tipc_nl_bearer_enable(struct sk_buff *skb, struct genl_info *info)
        if (!info->attrs[TIPC_NLA_BEARER])
                return -EINVAL;
-        err = nla_parse_nested(attrs, TIPC_NLA_BEARER_MAX,
+        err = nla_parse_nested_deprecated(attrs, TIPC_NLA_BEARER_MAX,
-                               info->attrs[TIPC_NLA_BEARER],
+                                          info->attrs[TIPC_NLA_BEARER],
-                               tipc_nl_bearer_policy, info->extack);
+                                          tipc_nl_bearer_policy, info->extack);
        if (err)
                return err;
@@ -921,9 +921,9 @@ int tipc_nl_bearer_add(struct sk_buff *skb, struct genl_info *info)
        if (!info->attrs[TIPC_NLA_BEARER])
                return -EINVAL;
-        err = nla_parse_nested(attrs, TIPC_NLA_BEARER_MAX,
+        err = nla_parse_nested_deprecated(attrs, TIPC_NLA_BEARER_MAX,
-                               info->attrs[TIPC_NLA_BEARER],
+                                          info->attrs[TIPC_NLA_BEARER],
-                               tipc_nl_bearer_policy, info->extack);
+                                          tipc_nl_bearer_policy, info->extack);
        if (err)
                return err;
@@ -964,9 +964,9 @@ int __tipc_nl_bearer_set(struct sk_buff *skb, struct genl_info *info)
        if (!info->attrs[TIPC_NLA_BEARER])
                return -EINVAL;
-        err = nla_parse_nested(attrs, TIPC_NLA_BEARER_MAX,
+        err = nla_parse_nested_deprecated(attrs, TIPC_NLA_BEARER_MAX,
-                               info->attrs[TIPC_NLA_BEARER],
+                                          info->attrs[TIPC_NLA_BEARER],
-                               tipc_nl_bearer_policy, info->extack);
+                                          tipc_nl_bearer_policy, info->extack);
        if (err)
                return err;
@@ -1107,9 +1107,9 @@ int tipc_nl_media_get(struct sk_buff *skb, struct genl_info *info)
        if (!info->attrs[TIPC_NLA_MEDIA])
                return -EINVAL;
-        err = nla_parse_nested(attrs, TIPC_NLA_MEDIA_MAX,
+        err = nla_parse_nested_deprecated(attrs, TIPC_NLA_MEDIA_MAX,
-                               info->attrs[TIPC_NLA_MEDIA],
+                                          info->attrs[TIPC_NLA_MEDIA],
-                               tipc_nl_media_policy, info->extack);
+                                          tipc_nl_media_policy, info->extack);
        if (err)
                return err;
@@ -1155,9 +1155,9 @@ int __tipc_nl_media_set(struct sk_buff *skb, struct genl_info *info)
        if (!info->attrs[TIPC_NLA_MEDIA])
                return -EINVAL;
-        err = nla_parse_nested(attrs, TIPC_NLA_MEDIA_MAX,
+        err = nla_parse_nested_deprecated(attrs, TIPC_NLA_MEDIA_MAX,
-                               info->attrs[TIPC_NLA_MEDIA],
+                                          info->attrs[TIPC_NLA_MEDIA],
-                               tipc_nl_media_policy, info->extack);
+                                          tipc_nl_media_policy, info->extack);
        if (!attrs[TIPC_NLA_MEDIA_NAME])
                return -EINVAL;

diff --git a/net/tipc/bearer.c b/net/tipc/bearer.c index fd8e4e83f5e0..2bed6589f41e 100644 --- a/net/tipc/bearer.c +++ b/net/tipc/bearer.c
@@ -776,9 +776,9 @@ int tipc_nl_bearer_get(struct sk_buff skb, struct genl_info info)
776	if (!info->attrs[TIPC_NLA_BEARER])	776	if (!info->attrs[TIPC_NLA_BEARER])
777	return -EINVAL;	777	return -EINVAL;
778		778
779	err = nla_parse_nested(attrs, TIPC_NLA_BEARER_MAX,	779	err = nla_parse_nested_deprecated(attrs, TIPC_NLA_BEARER_MAX,
780	info->attrs[TIPC_NLA_BEARER],	780	info->attrs[TIPC_NLA_BEARER],
781	tipc_nl_bearer_policy, info->extack);	781	tipc_nl_bearer_policy, info->extack);
782	if (err)	782	if (err)
783	return err;	783	return err;
784		784
@@ -825,9 +825,9 @@ int __tipc_nl_bearer_disable(struct sk_buff skb, struct genl_info info)
825	if (!info->attrs[TIPC_NLA_BEARER])	825	if (!info->attrs[TIPC_NLA_BEARER])
826	return -EINVAL;	826	return -EINVAL;
827		827
828	err = nla_parse_nested(attrs, TIPC_NLA_BEARER_MAX,	828	err = nla_parse_nested_deprecated(attrs, TIPC_NLA_BEARER_MAX,
829	info->attrs[TIPC_NLA_BEARER],	829	info->attrs[TIPC_NLA_BEARER],
830	tipc_nl_bearer_policy, info->extack);	830	tipc_nl_bearer_policy, info->extack);
831	if (err)	831	if (err)
832	return err;	832	return err;
833		833
@@ -870,9 +870,9 @@ int __tipc_nl_bearer_enable(struct sk_buff skb, struct genl_info info)
870	if (!info->attrs[TIPC_NLA_BEARER])	870	if (!info->attrs[TIPC_NLA_BEARER])
871	return -EINVAL;	871	return -EINVAL;
872		872
873	err = nla_parse_nested(attrs, TIPC_NLA_BEARER_MAX,	873	err = nla_parse_nested_deprecated(attrs, TIPC_NLA_BEARER_MAX,
874	info->attrs[TIPC_NLA_BEARER],	874	info->attrs[TIPC_NLA_BEARER],
875	tipc_nl_bearer_policy, info->extack);	875	tipc_nl_bearer_policy, info->extack);
876	if (err)	876	if (err)
877	return err;	877	return err;
878		878
@@ -921,9 +921,9 @@ int tipc_nl_bearer_add(struct sk_buff skb, struct genl_info info)
921	if (!info->attrs[TIPC_NLA_BEARER])	921	if (!info->attrs[TIPC_NLA_BEARER])
922	return -EINVAL;	922	return -EINVAL;
923		923
924	err = nla_parse_nested(attrs, TIPC_NLA_BEARER_MAX,	924	err = nla_parse_nested_deprecated(attrs, TIPC_NLA_BEARER_MAX,
925	info->attrs[TIPC_NLA_BEARER],	925	info->attrs[TIPC_NLA_BEARER],
926	tipc_nl_bearer_policy, info->extack);	926	tipc_nl_bearer_policy, info->extack);
927	if (err)	927	if (err)
928	return err;	928	return err;
929		929
@@ -964,9 +964,9 @@ int __tipc_nl_bearer_set(struct sk_buff skb, struct genl_info info)
964	if (!info->attrs[TIPC_NLA_BEARER])	964	if (!info->attrs[TIPC_NLA_BEARER])
965	return -EINVAL;	965	return -EINVAL;
966		966
967	err = nla_parse_nested(attrs, TIPC_NLA_BEARER_MAX,	967	err = nla_parse_nested_deprecated(attrs, TIPC_NLA_BEARER_MAX,
968	info->attrs[TIPC_NLA_BEARER],	968	info->attrs[TIPC_NLA_BEARER],
969	tipc_nl_bearer_policy, info->extack);	969	tipc_nl_bearer_policy, info->extack);
970	if (err)	970	if (err)
971	return err;	971	return err;
972		972
@@ -1107,9 +1107,9 @@ int tipc_nl_media_get(struct sk_buff skb, struct genl_info info)
1107	if (!info->attrs[TIPC_NLA_MEDIA])	1107	if (!info->attrs[TIPC_NLA_MEDIA])
1108	return -EINVAL;	1108	return -EINVAL;
1109		1109
1110	err = nla_parse_nested(attrs, TIPC_NLA_MEDIA_MAX,	1110	err = nla_parse_nested_deprecated(attrs, TIPC_NLA_MEDIA_MAX,
1111	info->attrs[TIPC_NLA_MEDIA],	1111	info->attrs[TIPC_NLA_MEDIA],
1112	tipc_nl_media_policy, info->extack);	1112	tipc_nl_media_policy, info->extack);
1113	if (err)	1113	if (err)
1114	return err;	1114	return err;
1115		1115
@@ -1155,9 +1155,9 @@ int __tipc_nl_media_set(struct sk_buff skb, struct genl_info info)
1155	if (!info->attrs[TIPC_NLA_MEDIA])	1155	if (!info->attrs[TIPC_NLA_MEDIA])
1156	return -EINVAL;	1156	return -EINVAL;
1157		1157
1158	err = nla_parse_nested(attrs, TIPC_NLA_MEDIA_MAX,	1158	err = nla_parse_nested_deprecated(attrs, TIPC_NLA_MEDIA_MAX,
1159	info->attrs[TIPC_NLA_MEDIA],	1159	info->attrs[TIPC_NLA_MEDIA],
1160	tipc_nl_media_policy, info->extack);	1160	tipc_nl_media_policy, info->extack);
1161		1161
1162	if (!attrs[TIPC_NLA_MEDIA_NAME])	1162	if (!attrs[TIPC_NLA_MEDIA_NAME])
1163	return -EINVAL;	1163	return -EINVAL;