From 07ab2a03260b64da03f71dab25a39da300b1fbdc Mon Sep 17 00:00:00 2001
From: "Eric W. Biederman" <ebiederm@xmission.com>
Date: Wed, 13 May 2009 16:58:17 +0000
Subject: [PATCH] --- yaml --- r: 150317 b: refs/heads/master c:
 5007392d8512e666107dc356d4c2e05627b9029b h: refs/heads/master i:   150315:
 7dbc2fefe89b2df076e3452fecdd056491b45c3f v: v3

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

diff --git a/[refs] b/[refs]
index be7a6463cfe9..6c6910e49947 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 336ca57c3b4e2b58ea3273e6d978ab3dfa387b4c
+refs/heads/master: 5007392d8512e666107dc356d4c2e05627b9029b
diff --git a/trunk/net/ipv6/addrconf.c b/trunk/net/ipv6/addrconf.c
index a8218bc1806a..9eb61c7cae57 100644
--- a/trunk/net/ipv6/addrconf.c
+++ b/trunk/net/ipv6/addrconf.c
@@ -503,7 +503,7 @@ static int addrconf_fixup_forwarding(struct ctl_table *table, int *p, int old)
 		return 0;
 
 	if (!rtnl_trylock())
-		return -ERESTARTSYS;
+		return restart_syscall();
 
 	if (p == &net->ipv6.devconf_all->forwarding) {
 		__s32 newf = net->ipv6.devconf_all->forwarding;