Skip to content

Commit

Permalink
[NET]: Don't declare extern variables in net/core/sysctl_net_core.c
Browse files Browse the repository at this point in the history
Some are already declared in include/linux/netdevice.h, while
some others (xfrm ones) need to be declared.

The driver/net/rrunner.c just uses same extern as well, so
cleanup it also.

Signed-off-by: Pavel Emelyanov <xemul@openvz.org>
Signed-off-by: David S. Miller <davem@davemloft.net>
  • Loading branch information
Pavel Emelyanov authored and David S. Miller committed Oct 24, 2007
1 parent c1bd24b commit a37ae40
Show file tree
Hide file tree
Showing 3 changed files with 7 additions and 20 deletions.
8 changes: 3 additions & 5 deletions drivers/net/rrunner.c
Original file line number Diff line number Diff line change
Expand Up @@ -79,12 +79,10 @@ static char version[] __devinitdata = "rrunner.c: v0.50 11/11/2002 Jes Sorensen
*/

/*
* These are checked at init time to see if they are at least 256KB
* and increased to 256KB if they are not. This is done to avoid ending
* up with socket buffers smaller than the MTU size,
* sysctl_[wr]mem_max are checked at init time to see if they are at
* least 256KB and increased to 256KB if they are not. This is done to
* avoid ending up with socket buffers smaller than the MTU size,
*/
extern __u32 sysctl_wmem_max;
extern __u32 sysctl_rmem_max;

static int __devinit rr_init_one(struct pci_dev *pdev,
const struct pci_device_id *ent)
Expand Down
2 changes: 2 additions & 0 deletions include/net/xfrm.h
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,8 @@
extern struct sock *xfrm_nl;
extern u32 sysctl_xfrm_aevent_etime;
extern u32 sysctl_xfrm_aevent_rseqth;
extern int sysctl_xfrm_larval_drop;
extern u32 sysctl_xfrm_acq_expires;

extern struct mutex xfrm_cfg_mutex;

Expand Down
17 changes: 2 additions & 15 deletions net/core/sysctl_net_core.c
Original file line number Diff line number Diff line change
Expand Up @@ -9,25 +9,12 @@
#include <linux/sysctl.h>
#include <linux/module.h>
#include <linux/socket.h>
#include <linux/netdevice.h>
#include <net/sock.h>
#include <net/xfrm.h>

#ifdef CONFIG_SYSCTL

extern int netdev_max_backlog;
extern int weight_p;

extern __u32 sysctl_wmem_max;
extern __u32 sysctl_rmem_max;

extern int sysctl_core_destroy_delay;

#ifdef CONFIG_XFRM
extern u32 sysctl_xfrm_aevent_etime;
extern u32 sysctl_xfrm_aevent_rseqth;
extern int sysctl_xfrm_larval_drop;
extern u32 sysctl_xfrm_acq_expires;
#endif

ctl_table core_table[] = {
#ifdef CONFIG_NET
{
Expand Down

0 comments on commit a37ae40

Please sign in to comment.