Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fixup! net-tcp-bbr1: for testing, a copy of BBRv1 #10

Open
wants to merge 1 commit into
base: v3
Choose a base branch
from
Open

fixup! net-tcp-bbr1: for testing, a copy of BBRv1 #10

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions net/ipv4/tcp_bbr1.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1163,7 +1163,7 @@ static struct tcp_congestion_ops tcp_bbr_cong_ops __read_mostly = {
.set_state = bbr_set_state,
};

BTF_SET8_START(tcp_bbr_check_kfunc_ids)
BTF_SET8_START(tcp_bbr1_check_kfunc_ids)
#ifdef CONFIG_X86
#ifdef CONFIG_DYNAMIC_FTRACE
BTF_ID_FLAGS(func, bbr_init)
Expand All @@ -1176,11 +1176,11 @@ BTF_ID_FLAGS(func, bbr_min_tso_segs)
BTF_ID_FLAGS(func, bbr_set_state)
#endif
#endif
BTF_SET8_END(tcp_bbr_check_kfunc_ids)
BTF_SET8_END(tcp_bbr1_check_kfunc_ids)

static const struct btf_kfunc_id_set tcp_bbr_kfunc_set = {
.owner = THIS_MODULE,
.set = &tcp_bbr_check_kfunc_ids,
.set = &tcp_bbr1_check_kfunc_ids,
};

static int __init bbr_register(void)
Expand Down
1 change: 1 addition & 0 deletions net/ipv4/tcp_output.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2002,6 +2002,7 @@ u32 tcp_tso_autosize(const struct sock *sk, unsigned int mss_now,

return max_t(u32, bytes / mss_now, min_tso_segs);
}
EXPORT_SYMBOL(tcp_tso_autosize);

/* Return the number of segments we want in the skb we are transmitting.
* See if congestion control module wants to decide; otherwise, autosize.
Expand Down