From f2ffdcdf5af3cd28ba6cf4b7edd6dc02033aa7b7 Mon Sep 17 00:00:00 2001
From: Pavel Emelyanov <xemul@openvz.org>
Date: Sun, 16 Dec 2007 13:30:07 -0800
Subject: [PATCH] --- yaml --- r: 78470 b: refs/heads/master c:
 ea40b324d791d86a42b858d073007de4d133227e h: refs/heads/master v: v3

---
 [refs]                   | 2 +-
 trunk/net/ipv4/devinet.c | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/[refs] b/[refs]
index e002ee748c87..482de59ca234 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 8afd351c772d1815347d5c46716b099fde00a579
+refs/heads/master: ea40b324d791d86a42b858d073007de4d133227e
diff --git a/trunk/net/ipv4/devinet.c b/trunk/net/ipv4/devinet.c
index 2dc2f7ed6bbe..82def2c1c650 100644
--- a/trunk/net/ipv4/devinet.c
+++ b/trunk/net/ipv4/devinet.c
@@ -1454,8 +1454,8 @@ static struct devinet_sysctl_table {
 	},
 };
 
-static void __devinet_sysctl_register(char *dev_name, int ctl_name,
-		struct ipv4_devconf *p)
+static int __devinet_sysctl_register(struct net *net, char *dev_name,
+		int ctl_name, struct ipv4_devconf *p)
 {
 	int i;
 	struct devinet_sysctl_table *t;
@@ -1497,14 +1497,14 @@ static void __devinet_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 __devinet_sysctl_unregister(struct ipv4_devconf *cnf)