Skip to content

Commit

Permalink
net: Kill ratelimit.h dependency in linux/net.h
Browse files Browse the repository at this point in the history
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: David S. Miller <davem@davemloft.net>
Acked-by: Ingo Molnar <mingo@elte.hu>
  • Loading branch information
davem330 committed May 27, 2011
1 parent bee9525 commit c5c177b
Show file tree
Hide file tree
Showing 4 changed files with 10 additions and 6 deletions.
6 changes: 0 additions & 6 deletions include/linux/net.h
Original file line number Diff line number Diff line change
Expand Up @@ -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 */
8 changes: 8 additions & 0 deletions include/net/net_ratelimit.h
Original file line number Diff line number Diff line change
@@ -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 */
1 change: 1 addition & 0 deletions net/core/sysctl_net_core.c
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down
1 change: 1 addition & 0 deletions net/core/utils.c
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down

0 comments on commit c5c177b

Please sign in to comment.