mirror of
https://github.com/torvalds/linux
synced 2024-09-06 09:51:23 +00:00
[CCID]: More informative registration
The patch makes the registration messages of CCID 2/3 a bit more informative: instead of repeating the CCID number as currently done, "CCID: Registered CCID 2 (ccid2)" or "CCID: Registered CCID 3 (ccid3)", the descriptive names of the CCID's (from RFCs) are now used: "CCID: Registered CCID 2 (TCP-like)" and "CCID: Registered CCID 3 (TCP-Friendly Rate Control)". To allow spaces in the name, the slab name string has been changed to refer to the numeric CCID identifier, using the same format as before. Signed-off-by: Gerrit Renker <gerrit@erg.abdn.ac.uk> Signed-off-by: Ian McDonald <ian.mcdonald@jandi.co.nz> Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com> Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
parent
9cb2345a8c
commit
84a97b0af8
|
@ -92,15 +92,15 @@ int ccid_register(struct ccid_operations *ccid_ops)
|
|||
|
||||
ccid_ops->ccid_hc_rx_slab =
|
||||
ccid_kmem_cache_create(ccid_ops->ccid_hc_rx_obj_size,
|
||||
"%s_hc_rx_sock",
|
||||
ccid_ops->ccid_name);
|
||||
"ccid%u_hc_rx_sock",
|
||||
ccid_ops->ccid_id);
|
||||
if (ccid_ops->ccid_hc_rx_slab == NULL)
|
||||
goto out;
|
||||
|
||||
ccid_ops->ccid_hc_tx_slab =
|
||||
ccid_kmem_cache_create(ccid_ops->ccid_hc_tx_obj_size,
|
||||
"%s_hc_tx_sock",
|
||||
ccid_ops->ccid_name);
|
||||
"ccid%u_hc_tx_sock",
|
||||
ccid_ops->ccid_id);
|
||||
if (ccid_ops->ccid_hc_tx_slab == NULL)
|
||||
goto out_free_rx_slab;
|
||||
|
||||
|
|
|
@ -770,7 +770,7 @@ static void ccid2_hc_rx_packet_recv(struct sock *sk, struct sk_buff *skb)
|
|||
|
||||
static struct ccid_operations ccid2 = {
|
||||
.ccid_id = DCCPC_CCID2,
|
||||
.ccid_name = "ccid2",
|
||||
.ccid_name = "TCP-like",
|
||||
.ccid_owner = THIS_MODULE,
|
||||
.ccid_hc_tx_obj_size = sizeof(struct ccid2_hc_tx_sock),
|
||||
.ccid_hc_tx_init = ccid2_hc_tx_init,
|
||||
|
|
|
@ -943,7 +943,7 @@ static int ccid3_hc_rx_getsockopt(struct sock *sk, const int optname, int len,
|
|||
|
||||
static struct ccid_operations ccid3 = {
|
||||
.ccid_id = DCCPC_CCID3,
|
||||
.ccid_name = "ccid3",
|
||||
.ccid_name = "TCP-Friendly Rate Control",
|
||||
.ccid_owner = THIS_MODULE,
|
||||
.ccid_hc_tx_obj_size = sizeof(struct ccid3_hc_tx_sock),
|
||||
.ccid_hc_tx_init = ccid3_hc_tx_init,
|
||||
|
|
Loading…
Reference in a new issue