From: Russell King <rmk+kernel@arm.linux.org.uk>
Date: Mon, 3 Oct 2005 21:16:34 +0000 (-0700)
Subject: [NET]: Fix "sysctl_net.c:36: error: 'core_table' undeclared here"
X-Git-Tag: v2.6.14-rc4~78
X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=496a22b08fa326bf17c11eb900e0505aa9da3506;p=linux-2.6

[NET]: Fix "sysctl_net.c:36: error: 'core_table' undeclared here"

During the build for ARM machine type "fortunet", this error occurred:

  CC      net/sysctl_net.o
net/sysctl_net.c:36: error: 'core_table' undeclared here (not in a function)

It appears that the following configuration settings cause this error
due to a missing include:
CONFIG_SYSCTL=y
CONFIG_NET=y
# CONFIG_INET is not set

core_table appears to be declared in net/sock.h.  if CONFIG_INET were
defined, net/sock.h would have been included via:
  sysctl_net.c -> net/ip.h -> linux/ip.h -> net/sock.h

so include it directly.

Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
Signed-off-by: David S. Miller <davem@davemloft.net>
---

diff --git a/net/sysctl_net.c b/net/sysctl_net.c
index c5241fcbb9..55538f6b60 100644
--- a/net/sysctl_net.c
+++ b/net/sysctl_net.c
@@ -16,6 +16,8 @@
 #include <linux/mm.h>
 #include <linux/sysctl.h>
 
+#include <net/sock.h>
+
 #ifdef CONFIG_INET
 #include <net/ip.h>
 #endif