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

Commit e2bcabec authored by Eric Dumazet's avatar Eric Dumazet Committed by David S. Miller
Browse files

net: remove sk_init() helper 



It seems sk_init() has no value today and even does strange things :

# grep . /proc/sys/net/core/?mem_*
/proc/sys/net/core/rmem_default:212992
/proc/sys/net/core/rmem_max:131071
/proc/sys/net/core/wmem_default:212992
/proc/sys/net/core/wmem_max:131071

We can remove it completely.

Signed-off-by: default avatarEric Dumazet <edumazet@google.com>
Reviewed-by: default avatarShan Wei <davidshan@tencent.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent f54ba779

include/net/sock.h

+0 −2
Original line number Original line Diff line number Diff line
@@ -2229,8 +2229,6 @@ extern int net_msg_warn; 
extern __u32 sysctl_wmem_max;

extern __u32 sysctl_wmem_max;

extern __u32 sysctl_rmem_max;

extern __u32 sysctl_rmem_max;





extern void sk_init(void);



extern int sysctl_optmem_max;

extern int sysctl_optmem_max;





extern __u32 sysctl_wmem_default;

extern __u32 sysctl_wmem_default;

net/core/sock.c

+0 −13
Original line number Original line Diff line number Diff line
@@ -1464,19 +1464,6 @@ void sk_setup_caps(struct sock *sk, struct dst_entry *dst) 
}

}

EXPORT_SYMBOL_GPL(sk_setup_caps);

EXPORT_SYMBOL_GPL(sk_setup_caps);





void __init sk_init(void)

{

	if (totalram_pages <= 4096) {

		sysctl_wmem_max = 32767;

		sysctl_rmem_max = 32767;

		sysctl_wmem_default = 32767;

		sysctl_rmem_default = 32767;

	} else if (totalram_pages >= 131072) {

		sysctl_wmem_max = 131071;

		sysctl_rmem_max = 131071;

	}

}



/*

/*

 *	Simple resource managers for sockets.

 *	Simple resource managers for sockets.

 */

 */

net/socket.c

+0 −6
Original line number Original line Diff line number Diff line
@@ -2600,12 +2600,6 @@ static int __init sock_init(void) 
	if (err)

	if (err)

		goto out;

		goto out;





	/*

	 *      Initialize sock SLAB cache.

	 */



	sk_init();



	/*

	/*

	 *      Initialize skbuff SLAB cache

	 *      Initialize skbuff SLAB cache

	 */

	 */