redonkable/remarkable-linux
redonkable/remarkable-linux
1
0
Fork 0
Code Releases Activity

[DCCP]: Introduce a consistent naming scheme for sysctls

Browse source 
In order to make their function clearer and obtain a consistent naming
scheme to identify sysctls, all existing DCCP sysctls have been prefixed
with `sysctl_dccp', following the same convention as used by TCP.

Feature-specific sysctls retain the `feat' in the middle, although the
`default' has been dropped, since it is obvious from use.

Also removed a duplicate `dccp_feat_default_sequence_window' in ipv4.c.

Signed-off-by: Gerrit Renker <gerrit@erg.abdn.ac.uk>
Signed-off-by: Arnaldo Carvalho de Melo <acme@mandriva.com>
This commit is contained in:
Gerrit Renker 2006-11-13 13:25:41 -02:00 committed by David S. Miller
parent 2e2e9e92bd
commit afb0a34dd3
5 changed files with 32 additions and 33 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
net/dccp/dccp.h
View file

@ -68,12 +68,12 @@ extern void dccp_time_wait(struct sock *sk, int state, int timeo);
extern int sysctl_dccp_request_retries; extern int sysctl_dccp_request_retries;
extern int sysctl_dccp_retries1; extern int sysctl_dccp_retries1;
extern int sysctl_dccp_retries2; extern int sysctl_dccp_retries2;
extern int dccp_feat_default_sequence_window; extern int sysctl_dccp_feat_sequence_window;
extern int dccp_feat_default_rx_ccid; extern int sysctl_dccp_feat_rx_ccid;
extern int dccp_feat_default_tx_ccid; extern int sysctl_dccp_feat_tx_ccid;
extern int dccp_feat_default_ack_ratio; extern int sysctl_dccp_feat_ack_ratio;
extern int dccp_feat_default_send_ack_vector; extern int sysctl_dccp_feat_send_ack_vector;
extern int dccp_feat_default_send_ndp_count; extern int sysctl_dccp_feat_send_ndp_count;
/* is seq1 < seq2 ? */ /* is seq1 < seq2 ? */
static inline int before48(const u64 seq1, const u64 seq2) static inline int before48(const u64 seq1, const u64 seq2)

1
net/dccp/ipv4.c
View file

@ -651,7 +651,6 @@ int dccp_v4_conn_request(struct sock *sk, struct sk_buff *skb)
ireq = inet_rsk(req); ireq = inet_rsk(req);
ireq->loc_addr = skb->nh.iph->daddr; ireq->loc_addr = skb->nh.iph->daddr;
ireq->rmt_addr = skb->nh.iph->saddr; ireq->rmt_addr = skb->nh.iph->saddr;
req->rcv_wnd = dccp_feat_default_sequence_window;
ireq->opt = NULL; ireq->opt = NULL;
/* /*

2
net/dccp/minisocks.c
View file

@ -300,7 +300,7 @@ void dccp_reqsk_init(struct request_sock *req, struct sk_buff *skb)
{ {
inet_rsk(req)->rmt_port = dccp_hdr(skb)->dccph_sport; inet_rsk(req)->rmt_port = dccp_hdr(skb)->dccph_sport;
inet_rsk(req)->acked = 0; inet_rsk(req)->acked = 0;
req->rcv_wnd = dccp_feat_default_sequence_window; req->rcv_wnd = sysctl_dccp_feat_sequence_window;
} }
EXPORT_SYMBOL_GPL(dccp_reqsk_init); EXPORT_SYMBOL_GPL(dccp_reqsk_init);

26
net/dccp/options.c
View file

@ -22,23 +22,23 @@
#include "dccp.h" #include "dccp.h"
#include "feat.h" #include "feat.h"
int dccp_feat_default_sequence_window = DCCPF_INITIAL_SEQUENCE_WINDOW; int sysctl_dccp_feat_sequence_window = DCCPF_INITIAL_SEQUENCE_WINDOW;
int dccp_feat_default_rx_ccid = DCCPF_INITIAL_CCID; int sysctl_dccp_feat_rx_ccid = DCCPF_INITIAL_CCID;
int dccp_feat_default_tx_ccid = DCCPF_INITIAL_CCID; int sysctl_dccp_feat_tx_ccid = DCCPF_INITIAL_CCID;
int dccp_feat_default_ack_ratio = DCCPF_INITIAL_ACK_RATIO; int sysctl_dccp_feat_ack_ratio = DCCPF_INITIAL_ACK_RATIO;
int dccp_feat_default_send_ack_vector = DCCPF_INITIAL_SEND_ACK_VECTOR; int sysctl_dccp_feat_send_ack_vector = DCCPF_INITIAL_SEND_ACK_VECTOR;
int dccp_feat_default_send_ndp_count = DCCPF_INITIAL_SEND_NDP_COUNT; int sysctl_dccp_feat_send_ndp_count = DCCPF_INITIAL_SEND_NDP_COUNT;
EXPORT_SYMBOL_GPL(dccp_feat_default_sequence_window); EXPORT_SYMBOL_GPL(sysctl_dccp_feat_sequence_window);
void dccp_minisock_init(struct dccp_minisock *dmsk) void dccp_minisock_init(struct dccp_minisock *dmsk)
{ {
dmsk->dccpms_sequence_window = dccp_feat_default_sequence_window; dmsk->dccpms_sequence_window = sysctl_dccp_feat_sequence_window;
dmsk->dccpms_rx_ccid = dccp_feat_default_rx_ccid; dmsk->dccpms_rx_ccid = sysctl_dccp_feat_rx_ccid;
dmsk->dccpms_tx_ccid = dccp_feat_default_tx_ccid; dmsk->dccpms_tx_ccid = sysctl_dccp_feat_tx_ccid;
dmsk->dccpms_ack_ratio = dccp_feat_default_ack_ratio; dmsk->dccpms_ack_ratio = sysctl_dccp_feat_ack_ratio;
dmsk->dccpms_send_ack_vector = dccp_feat_default_send_ack_vector; dmsk->dccpms_send_ack_vector = sysctl_dccp_feat_send_ack_vector;
dmsk->dccpms_send_ndp_count = dccp_feat_default_send_ndp_count; dmsk->dccpms_send_ndp_count = sysctl_dccp_feat_send_ndp_count;
} }
static u32 dccp_decode_value_var(const unsigned char *bf, const u8 len) static u32 dccp_decode_value_var(const unsigned char *bf, const u8 len)

24
net/dccp/sysctl.c
View file

@ -22,48 +22,48 @@ static struct ctl_table dccp_default_table[] = {
{ {
.ctl_name = NET_DCCP_DEFAULT_SEQ_WINDOW, .ctl_name = NET_DCCP_DEFAULT_SEQ_WINDOW,
.procname = "seq_window", .procname = "seq_window",
.data = &dccp_feat_default_sequence_window, .data = &sysctl_dccp_feat_sequence_window,
.maxlen = sizeof(dccp_feat_default_sequence_window), .maxlen = sizeof(sysctl_dccp_feat_sequence_window),
.mode = 0644, .mode = 0644,
.proc_handler = proc_dointvec, .proc_handler = proc_dointvec,
}, },
{ {
.ctl_name = NET_DCCP_DEFAULT_RX_CCID, .ctl_name = NET_DCCP_DEFAULT_RX_CCID,
.procname = "rx_ccid", .procname = "rx_ccid",
.data = &dccp_feat_default_rx_ccid, .data = &sysctl_dccp_feat_rx_ccid,
.maxlen = sizeof(dccp_feat_default_rx_ccid), .maxlen = sizeof(sysctl_dccp_feat_rx_ccid),
.mode = 0644, .mode = 0644,
.proc_handler = proc_dointvec, .proc_handler = proc_dointvec,
}, },
{ {
.ctl_name = NET_DCCP_DEFAULT_TX_CCID, .ctl_name = NET_DCCP_DEFAULT_TX_CCID,
.procname = "tx_ccid", .procname = "tx_ccid",
.data = &dccp_feat_default_tx_ccid, .data = &sysctl_dccp_feat_tx_ccid,
.maxlen = sizeof(dccp_feat_default_tx_ccid), .maxlen = sizeof(sysctl_dccp_feat_tx_ccid),
.mode = 0644, .mode = 0644,
.proc_handler = proc_dointvec, .proc_handler = proc_dointvec,
}, },
{ {
.ctl_name = NET_DCCP_DEFAULT_ACK_RATIO, .ctl_name = NET_DCCP_DEFAULT_ACK_RATIO,
.procname = "ack_ratio", .procname = "ack_ratio",
.data = &dccp_feat_default_ack_ratio, .data = &sysctl_dccp_feat_ack_ratio,
.maxlen = sizeof(dccp_feat_default_ack_ratio), .maxlen = sizeof(sysctl_dccp_feat_ack_ratio),
.mode = 0644, .mode = 0644,
.proc_handler = proc_dointvec, .proc_handler = proc_dointvec,
}, },
{ {
.ctl_name = NET_DCCP_DEFAULT_SEND_ACKVEC, .ctl_name = NET_DCCP_DEFAULT_SEND_ACKVEC,
.procname = "send_ackvec", .procname = "send_ackvec",
.data = &dccp_feat_default_send_ack_vector, .data = &sysctl_dccp_feat_send_ack_vector,
.maxlen = sizeof(dccp_feat_default_send_ack_vector), .maxlen = sizeof(sysctl_dccp_feat_send_ack_vector),
.mode = 0644, .mode = 0644,
.proc_handler = proc_dointvec, .proc_handler = proc_dointvec,
}, },
{ {
.ctl_name = NET_DCCP_DEFAULT_SEND_NDP, .ctl_name = NET_DCCP_DEFAULT_SEND_NDP,
.procname = "send_ndp", .procname = "send_ndp",
.data = &dccp_feat_default_send_ndp_count, .data = &sysctl_dccp_feat_send_ndp_count,
.maxlen = sizeof(dccp_feat_default_send_ndp_count), .maxlen = sizeof(sysctl_dccp_feat_send_ndp_count),
.mode = 0644, .mode = 0644,
.proc_handler = proc_dointvec, .proc_handler = proc_dointvec,
}, },