Don't declare extern variables in net/core/sysctl_net_core.c
Subsystems (3)
PATCH 1/3 Don't declare extern variables in net/core/sysctl_net_core.c
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 <[email protected]>
---
drivers/net/rrunner.c +3 -5
@@ -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)
include/net/xfrm.h +2 -0
@@ -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;
net/core/sysctl_net_core.c +2 -15
@@ -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 {
Signature · 1 line
1.5.3.4
From: Pavel Emelyanov <[email protected]>
Date: Mon, 22 Oct 2007 19:22:43 +0400
Quoted 7 lines
Some are already declared in
include/linux/netdevice.h, while some others (xfrm ones) need to be declared.The
driver/net/rrunner.cjust uses same extern as well, so cleanup it also.Signed-off-by Pavel Emelyanov <[email protected]>
Applied, thanks!