aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDavid S. Miller <davem@sunset.davemloft.net>2006-08-22 22:20:14 -0700
committerDavid S. Miller <davem@sunset.davemloft.net>2006-09-22 14:55:40 -0700
commita57d27fc7107ddcc655ba2812cfebfce3163fd62 (patch)
tree98f5e6816bf1771e9489aa50e781c21bb36d21ca
parent2809486424df58043b380aeb9d7f402c031c46f6 (diff)
[RTNETLINK]: Don't return error on no-metrics.
Instead just cancel the nested attribute and return 0. Signed-off-by: David S. Miller <davem@davemloft.net>
-rw-r--r--net/core/rtnetlink.c6
1 files changed, 4 insertions, 2 deletions
diff --git a/net/core/rtnetlink.c b/net/core/rtnetlink.c
index eeff0b23e94..8f225499e32 100644
--- a/net/core/rtnetlink.c
+++ b/net/core/rtnetlink.c
@@ -202,8 +202,10 @@ int rtnetlink_put_metrics(struct sk_buff *skb, u32 *metrics)
}
}
- if (!valid)
- goto nla_put_failure;
+ if (!valid) {
+ nla_nest_cancel(skb, mx);
+ return 0;
+ }
return nla_nest_end(skb, mx);