summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorThomas Graf <tgraf@suug.ch>2012-06-26 23:36:14 +0000
committerDavid S. Miller <davem@davemloft.net>2012-06-27 15:36:44 -0700
commit74a0bd7d0ef4ed11345aaebc29bf4578ccf44087 (patch)
tree28398e84e848715ea11e2680077b3c11c3259217
parent92a395e52f0c97f38ff675d7c698404bfc812dc2 (diff)
downloadlinux-3.10-74a0bd7d0ef4ed11345aaebc29bf4578ccf44087.tar.gz
linux-3.10-74a0bd7d0ef4ed11345aaebc29bf4578ccf44087.tar.bz2
linux-3.10-74a0bd7d0ef4ed11345aaebc29bf4578ccf44087.zip
ip6mr: Do not use RTA_PUT() macros
Signed-off-by: Thomas Graf <tgraf@suug.ch> Signed-off-by: David S. Miller <davem@davemloft.net>
-rw-r--r--net/ipv6/ip6mr.c5
1 files changed, 3 insertions, 2 deletions
diff --git a/net/ipv6/ip6mr.c b/net/ipv6/ip6mr.c
index 461e47c8e95..4532973f0dd 100644
--- a/net/ipv6/ip6mr.c
+++ b/net/ipv6/ip6mr.c
@@ -2104,8 +2104,9 @@ static int __ip6mr_fill_mroute(struct mr6_table *mrt, struct sk_buff *skb,
if (c->mf6c_parent >= MAXMIFS)
return -ENOENT;
- if (MIF_EXISTS(mrt, c->mf6c_parent))
- RTA_PUT(skb, RTA_IIF, 4, &mrt->vif6_table[c->mf6c_parent].dev->ifindex);
+ if (MIF_EXISTS(mrt, c->mf6c_parent) &&
+ nla_put_u32(skb, RTA_IIF, mrt->vif6_table[c->mf6c_parent].dev->ifindex) < 0)
+ return -EMSGSIZE;
mp_head = (struct rtattr *)skb_put(skb, RTA_LENGTH(0));