From bb04a5c0bc4d093fcfbba0787e2257be718ac420 Mon Sep 17 00:00:00 2001 From: Pavel Emelyanov Date: Thu, 10 Jan 2008 17:41:45 -0800 Subject: [PATCH] --- yaml --- r: 78755 b: refs/heads/master c: 9589731220edfebeb6a05c52d0838a99dee20893 h: refs/heads/master i: 78753: 74b11cc9ed49c19820132f368f55437b8c83086b 78751: a4ac4783dd9e22d951468cd8f1a260ba11143a7e v: v3 --- [refs] | 2 +- trunk/net/ipv6/addrconf.c | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index a9827f3c8fed..8600f1ac0522 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 408c4768cd0843f43a13a442c76215dd9cadf23d +refs/heads/master: 9589731220edfebeb6a05c52d0838a99dee20893 diff --git a/trunk/net/ipv6/addrconf.c b/trunk/net/ipv6/addrconf.c index 27b35ddeeabf..18d43349013e 100644 --- a/trunk/net/ipv6/addrconf.c +++ b/trunk/net/ipv6/addrconf.c @@ -4044,7 +4044,7 @@ static struct addrconf_sysctl_table }, }; -static void __addrconf_sysctl_register(char *dev_name, int ctl_name, +static int __addrconf_sysctl_register(char *dev_name, int ctl_name, struct inet6_dev *idev, struct ipv6_devconf *p) { int i; @@ -4088,14 +4088,14 @@ static void __addrconf_sysctl_register(char *dev_name, int ctl_name, goto free_procname; p->sysctl = t; - return; + return 0; free_procname: kfree(t->dev_name); free: kfree(t); out: - return; + return -ENOBUFS; } static void __addrconf_sysctl_unregister(struct ipv6_devconf *p)