diff options
| author | Ingo Molnar <mingo@elte.hu> | 2008-06-16 05:25:56 -0400 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2008-06-16 05:25:56 -0400 |
| commit | c444debaaa22011b4a84e58e5333575b3f800a33 (patch) | |
| tree | 896a9589aa9e701896da7ea1ae6a24cb04495b8f /net/core/rtnetlink.c | |
| parent | 70ef6d595b6e51618a0cbe44b848d8c9db11a010 (diff) | |
| parent | 066519068ad2fbe98c7f45552b1f592903a9c8c8 (diff) | |
Merge branch 'linus' into timers/hpet
Diffstat (limited to 'net/core/rtnetlink.c')
| -rw-r--r-- | net/core/rtnetlink.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/net/core/rtnetlink.c b/net/core/rtnetlink.c index cf857c4dc7b1..a9a77216310e 100644 --- a/net/core/rtnetlink.c +++ b/net/core/rtnetlink.c | |||
| @@ -498,7 +498,8 @@ int rtnetlink_put_metrics(struct sk_buff *skb, u32 *metrics) | |||
| 498 | return nla_nest_end(skb, mx); | 498 | return nla_nest_end(skb, mx); |
| 499 | 499 | ||
| 500 | nla_put_failure: | 500 | nla_put_failure: |
| 501 | return nla_nest_cancel(skb, mx); | 501 | nla_nest_cancel(skb, mx); |
| 502 | return -EMSGSIZE; | ||
| 502 | } | 503 | } |
| 503 | 504 | ||
| 504 | int rtnl_put_cacheinfo(struct sk_buff *skb, struct dst_entry *dst, u32 id, | 505 | int rtnl_put_cacheinfo(struct sk_buff *skb, struct dst_entry *dst, u32 id, |