mirror of
https://github.com/Fishwaldo/Star64_linux.git
synced 2025-06-23 23:21:46 +00:00
net: Remove CONFIG_KMOD from net/ (towards removing CONFIG_KMOD entirely)
Some code here depends on CONFIG_KMOD to not try to load protocol modules or similar, replace by CONFIG_MODULES where more than just request_module depends on CONFIG_KMOD and and also use try_then_request_module in ebtables. Signed-off-by: Johannes Berg <johannes@sipsolutions.net> Signed-off-by: Rusty Russell <rusty@rustcorp.com.au> Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
parent
00269b54ed
commit
95a5afca4a
20 changed files with 20 additions and 46 deletions
|
@ -115,7 +115,7 @@ int tcp_set_default_congestion_control(const char *name)
|
|||
|
||||
spin_lock(&tcp_cong_list_lock);
|
||||
ca = tcp_ca_find(name);
|
||||
#ifdef CONFIG_KMOD
|
||||
#ifdef CONFIG_MODULES
|
||||
if (!ca && capable(CAP_SYS_MODULE)) {
|
||||
spin_unlock(&tcp_cong_list_lock);
|
||||
|
||||
|
@ -244,7 +244,7 @@ int tcp_set_congestion_control(struct sock *sk, const char *name)
|
|||
if (ca == icsk->icsk_ca_ops)
|
||||
goto out;
|
||||
|
||||
#ifdef CONFIG_KMOD
|
||||
#ifdef CONFIG_MODULES
|
||||
/* not found attempt to autoload module */
|
||||
if (!ca && capable(CAP_SYS_MODULE)) {
|
||||
rcu_read_unlock();
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue