From 8bf04263df06ccdf20ec31ce3a6e31f5f0ed79ab Mon Sep 17 00:00:00 2001
From: Zheng Yan <zheng.z.yan@intel.com>
Date: Fri, 28 Oct 2011 00:26:00 -0400
Subject: [PATCH] --- yaml --- r: 271618 b: refs/heads/master c:
 504744e4edc24f6f16eed44a59b39bffcc0c1391 h: refs/heads/master v: v3

---
 [refs]                      | 2 +-
 trunk/net/ipv6/ip6_output.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 9e0f7ce55237..32bed41eb442 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 3c20f72f9108b2fcf30ec63d8a4203736c01ccd0
+refs/heads/master: 504744e4edc24f6f16eed44a59b39bffcc0c1391
diff --git a/trunk/net/ipv6/ip6_output.c b/trunk/net/ipv6/ip6_output.c
index ff300474bee7..84d0bd5cac93 100644
--- a/trunk/net/ipv6/ip6_output.c
+++ b/trunk/net/ipv6/ip6_output.c
@@ -1123,7 +1123,7 @@ static inline int ip6_ufo_append_data(struct sock *sk,
 			hh_len + fragheaderlen + transhdrlen + 20,
 			(flags & MSG_DONTWAIT), &err);
 		if (skb == NULL)
-			return -ENOMEM;
+			return err;
 
 		/* reserve space for Hardware header */
 		skb_reserve(skb, hh_len);