From dec85636db6d798dea8098dc08bced6d513e97b2 Mon Sep 17 00:00:00 2001
From: "David S. Miller" <davem@davemloft.net>
Date: Fri, 27 May 2011 13:41:33 -0400
Subject: [PATCH] --- yaml --- r: 252282 b: refs/heads/master c:
 c5c177b4aca83338781e72be2e6dd1601c560cb3 h: refs/heads/master v: v3

---
 [refs]                            | 2 +-
 trunk/include/linux/net.h         | 6 ------
 trunk/include/net/net_ratelimit.h | 8 ++++++++
 trunk/net/core/sysctl_net_core.c  | 1 +
 trunk/net/core/utils.c            | 1 +
 5 files changed, 11 insertions(+), 7 deletions(-)
 create mode 100644 trunk/include/net/net_ratelimit.h

diff --git a/[refs] b/[refs]
index 6a8c46ca4d66..2231fe85efe4 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: bee95250f015ffc3a6efb99516489e70d1b52da2
+refs/heads/master: c5c177b4aca83338781e72be2e6dd1601c560cb3
diff --git a/trunk/include/linux/net.h b/trunk/include/linux/net.h
index 1da55e9b6f01..b29923006b11 100644
--- a/trunk/include/linux/net.h
+++ b/trunk/include/linux/net.h
@@ -289,11 +289,5 @@ extern int kernel_sock_shutdown(struct socket *sock,
 	MODULE_ALIAS("net-pf-" __stringify(pf) "-proto-" __stringify(proto) \
 		     "-type-" __stringify(type))
 
-#ifdef CONFIG_SYSCTL
-#include <linux/sysctl.h>
-#include <linux/ratelimit.h>
-extern struct ratelimit_state net_ratelimit_state;
-#endif
-
 #endif /* __KERNEL__ */
 #endif	/* _LINUX_NET_H */
diff --git a/trunk/include/net/net_ratelimit.h b/trunk/include/net/net_ratelimit.h
new file mode 100644
index 000000000000..7727b4247daf
--- /dev/null
+++ b/trunk/include/net/net_ratelimit.h
@@ -0,0 +1,8 @@
+#ifndef _LINUX_NET_RATELIMIT_H
+#define _LINUX_NET_RATELIMIT_H
+
+#include <linux/ratelimit.h>
+
+extern struct ratelimit_state net_ratelimit_state;
+
+#endif	/* _LINUX_NET_RATELIMIT_H */
diff --git a/trunk/net/core/sysctl_net_core.c b/trunk/net/core/sysctl_net_core.c
index a829e3f60aeb..77a65f031488 100644
--- a/trunk/net/core/sysctl_net_core.c
+++ b/trunk/net/core/sysctl_net_core.c
@@ -17,6 +17,7 @@
 
 #include <net/ip.h>
 #include <net/sock.h>
+#include <net/net_ratelimit.h>
 
 #ifdef CONFIG_RPS
 static int rps_sock_flow_sysctl(ctl_table *table, int write,
diff --git a/trunk/net/core/utils.c b/trunk/net/core/utils.c
index 2012bc797f9c..386e263f6066 100644
--- a/trunk/net/core/utils.c
+++ b/trunk/net/core/utils.c
@@ -27,6 +27,7 @@
 #include <linux/ratelimit.h>
 
 #include <net/sock.h>
+#include <net/net_ratelimit.h>
 
 #include <asm/byteorder.h>
 #include <asm/system.h>