Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit a37ae408 authored by Pavel Emelyanov's avatar Pavel Emelyanov Committed by David S. Miller
Browse files

[NET]: 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: default avatarPavel Emelyanov <xemul@openvz.org>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent c1bd24b7

drivers/net/rrunner.c

+3 −5
Original line number Original line Diff line number Diff line
@@ -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

 * sysctl_[wr]mem_max are checked at init time to see if they are at

 * and increased to 256KB if they are not. This is done to avoid ending

 * least 256KB and increased to 256KB if they are not. This is done to

 * up with socket buffers smaller than the MTU size,

 * 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,

static int __devinit rr_init_one(struct pci_dev *pdev,

	const struct pci_device_id *ent)

	const struct pci_device_id *ent)

include/net/xfrm.h

+2 −0
Original line number Original line Diff line number Diff line
@@ -37,6 +37,8 @@ 
extern struct sock *xfrm_nl;

extern struct sock *xfrm_nl;

extern u32 sysctl_xfrm_aevent_etime;

extern u32 sysctl_xfrm_aevent_etime;

extern u32 sysctl_xfrm_aevent_rseqth;

extern u32 sysctl_xfrm_aevent_rseqth;

extern int sysctl_xfrm_larval_drop;

extern u32 sysctl_xfrm_acq_expires;





extern struct mutex xfrm_cfg_mutex;

extern struct mutex xfrm_cfg_mutex;

net/core/sysctl_net_core.c

+2 −15
Original line number Original line Diff line number Diff line
@@ -9,25 +9,12 @@ 
#include <linux/sysctl.h>

#include <linux/sysctl.h>

#include <linux/module.h>

#include <linux/module.h>

#include <linux/socket.h>

#include <linux/socket.h>

#include <linux/netdevice.h>

#include <net/sock.h>

#include <net/sock.h>

#include <net/xfrm.h>





#ifdef CONFIG_SYSCTL

#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[] = {

ctl_table core_table[] = {

#ifdef CONFIG_NET

#ifdef CONFIG_NET

	{

	{