diff options
author | Stephen Hemminger <shemminger@osdl.org> | 2006-11-09 19:35:15 -0500 |
---|---|---|
committer | David S. Miller <davem@sunset.davemloft.net> | 2006-12-03 00:21:49 -0500 |
commit | ce7bc3bf15cbf5dc5a5587ccb6b04c5b4dde4336 (patch) | |
tree | 20ccf7f98ac5d1aabbc706fa876e8f361219db97 /include | |
parent | 3ff825b28d3345ef381eceae22bf9d92231f23dc (diff) |
[TCP]: Restrict congestion control choices.
Allow normal users to only choose among a restricted set of congestion
control choices. The default is reno and what ever has been configured
as default. But the policy can be changed by administrator at any time.
For example, to allow any choice:
cp /proc/sys/net/ipv4/tcp_available_congestion_control \
/proc/sys/net/ipv4/tcp_allowed_congestion_control
Signed-off-by: Stephen Hemminger <shemminger@osdl.org>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'include')
-rw-r--r-- | include/linux/sysctl.h | 1 | ||||
-rw-r--r-- | include/net/tcp.h | 3 |
2 files changed, 4 insertions, 0 deletions
diff --git a/include/linux/sysctl.h b/include/linux/sysctl.h index 28a48279654d..0725441621d0 100644 --- a/include/linux/sysctl.h +++ b/include/linux/sysctl.h | |||
@@ -427,6 +427,7 @@ enum | |||
427 | NET_CIPSOV4_RBM_OPTFMT=120, | 427 | NET_CIPSOV4_RBM_OPTFMT=120, |
428 | NET_CIPSOV4_RBM_STRICTVALID=121, | 428 | NET_CIPSOV4_RBM_STRICTVALID=121, |
429 | NET_TCP_AVAIL_CONG_CONTROL=122, | 429 | NET_TCP_AVAIL_CONG_CONTROL=122, |
430 | NET_TCP_ALLOWED_CONG_CONTROL=123, | ||
430 | }; | 431 | }; |
431 | 432 | ||
432 | enum { | 433 | enum { |
diff --git a/include/net/tcp.h b/include/net/tcp.h index 6af4baf5b769..e1a5d29d0a1f 100644 --- a/include/net/tcp.h +++ b/include/net/tcp.h | |||
@@ -625,6 +625,7 @@ enum tcp_ca_event { | |||
625 | 625 | ||
626 | struct tcp_congestion_ops { | 626 | struct tcp_congestion_ops { |
627 | struct list_head list; | 627 | struct list_head list; |
628 | int non_restricted; | ||
628 | 629 | ||
629 | /* initialize private data (optional) */ | 630 | /* initialize private data (optional) */ |
630 | void (*init)(struct sock *sk); | 631 | void (*init)(struct sock *sk); |
@@ -663,6 +664,8 @@ extern void tcp_cleanup_congestion_control(struct sock *sk); | |||
663 | extern int tcp_set_default_congestion_control(const char *name); | 664 | extern int tcp_set_default_congestion_control(const char *name); |
664 | extern void tcp_get_default_congestion_control(char *name); | 665 | extern void tcp_get_default_congestion_control(char *name); |
665 | extern void tcp_get_available_congestion_control(char *buf, size_t len); | 666 | extern void tcp_get_available_congestion_control(char *buf, size_t len); |
667 | extern void tcp_get_allowed_congestion_control(char *buf, size_t len); | ||
668 | extern int tcp_set_allowed_congestion_control(char *allowed); | ||
666 | extern int tcp_set_congestion_control(struct sock *sk, const char *name); | 669 | extern int tcp_set_congestion_control(struct sock *sk, const char *name); |
667 | extern void tcp_slow_start(struct tcp_sock *tp); | 670 | extern void tcp_slow_start(struct tcp_sock *tp); |
668 | 671 | ||