From e9eb9f39a5fbcef3ba24215721654124ed7950af Mon Sep 17 00:00:00 2001
From: "David S. Miller" <davem@davemloft.net>
Date: Sun, 1 Apr 2012 20:23:06 -0400
Subject: [PATCH] --- yaml --- r: 300409 b: refs/heads/master c:
 ead9a76ceec34df18dc84cb22053253bd5564376 h: refs/heads/master i:   300407:
 5d54e8199497beb0a3dfb6459ba7d0bff576986e v: v3

---
 [refs]                      | 2 +-
 trunk/drivers/net/macvlan.c | 3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 16146faa80c1..78f0f8d685cf 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 1a106de6e6543e7d44dbe1bc5f37a8964607dfa6
+refs/heads/master: ead9a76ceec34df18dc84cb22053253bd5564376
diff --git a/trunk/drivers/net/macvlan.c b/trunk/drivers/net/macvlan.c
index f975afdc315c..b17fc9007099 100644
--- a/trunk/drivers/net/macvlan.c
+++ b/trunk/drivers/net/macvlan.c
@@ -773,7 +773,8 @@ static int macvlan_fill_info(struct sk_buff *skb,
 {
 	struct macvlan_dev *vlan = netdev_priv(dev);
 
-	NLA_PUT_U32(skb, IFLA_MACVLAN_MODE, vlan->mode);
+	if (nla_put_u32(skb, IFLA_MACVLAN_MODE, vlan->mode))
+		goto nla_put_failure;
 	return 0;
 
 nla_put_failure: