From 8f1519b6366ce55bb51cc03223bbd89f4a006f7e Mon Sep 17 00:00:00 2001
From: Sascha Hlusiak <contact@saschahlusiak.de>
Date: Tue, 19 May 2009 12:56:50 +0000
Subject: [PATCH] --- yaml --- r: 150336 b: refs/heads/master c:
 4b2796017487f3c1e423b8e1ada6c94c0a8ea815 h: refs/heads/master v: v3

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

diff --git a/[refs] b/[refs]
index 857b20b8d484..e57ee422ff44 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 4fddbf5d7854b0a615c6481988895016f5d038d2
+refs/heads/master: 4b2796017487f3c1e423b8e1ada6c94c0a8ea815
diff --git a/trunk/net/ipv6/sit.c b/trunk/net/ipv6/sit.c
index dfedd56ee104..3fd060076e7a 100644
--- a/trunk/net/ipv6/sit.c
+++ b/trunk/net/ipv6/sit.c
@@ -368,7 +368,7 @@ ipip6_tunnel_del_prl(struct ip_tunnel *t, struct ip_tunnel_prl *a)
 	}
 out:
 	write_unlock(&ipip6_lock);
-	return 0;
+	return err;
 }
 
 static int