Commit c5c177b4 authored by David S. Miller's avatar David S. Miller

net: Kill ratelimit.h dependency in linux/net.h

Ingo Molnar noticed that we have this unnecessary ratelimit.h
dependency in linux/net.h, which hid compilation problems from
people doing builds only with CONFIG_NET enabled.

Move this stuff out to a seperate net/net_ratelimit.h file and
include that in the only two places where this thing is needed.
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
Acked-by: default avatarIngo Molnar <mingo@elte.hu>
parent bee95250
...@@ -289,11 +289,5 @@ extern int kernel_sock_shutdown(struct socket *sock, ...@@ -289,11 +289,5 @@ extern int kernel_sock_shutdown(struct socket *sock,
MODULE_ALIAS("net-pf-" __stringify(pf) "-proto-" __stringify(proto) \ MODULE_ALIAS("net-pf-" __stringify(pf) "-proto-" __stringify(proto) \
"-type-" __stringify(type)) "-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 /* __KERNEL__ */
#endif /* _LINUX_NET_H */ #endif /* _LINUX_NET_H */
#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 */
...@@ -17,6 +17,7 @@ ...@@ -17,6 +17,7 @@
#include <net/ip.h> #include <net/ip.h>
#include <net/sock.h> #include <net/sock.h>
#include <net/net_ratelimit.h>
#ifdef CONFIG_RPS #ifdef CONFIG_RPS
static int rps_sock_flow_sysctl(ctl_table *table, int write, static int rps_sock_flow_sysctl(ctl_table *table, int write,
......
...@@ -27,6 +27,7 @@ ...@@ -27,6 +27,7 @@
#include <linux/ratelimit.h> #include <linux/ratelimit.h>
#include <net/sock.h> #include <net/sock.h>
#include <net/net_ratelimit.h>
#include <asm/byteorder.h> #include <asm/byteorder.h>
#include <asm/system.h> #include <asm/system.h>
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment