aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGerrit Renker <gerrit@erg.abdn.ac.uk>2007-12-13 20:33:25 -0500
committerDavid S. Miller <davem@davemloft.net>2008-01-28 17:57:58 -0500
commit84a97b0af8c29aa5a47cc5271968a9c6004fb91e (patch)
tree8fb3da66a7c0cc0933b714de884f210f0ecb90e0
parent9cb2345a8c49ea380437d02bb9fd9f291c0a005d (diff)
[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>
-rw-r--r--net/dccp/ccid.c8
-rw-r--r--net/dccp/ccids/ccid2.c2
-rw-r--r--net/dccp/ccids/ccid3.c2
3 files changed, 6 insertions, 6 deletions
diff --git a/net/dccp/ccid.c b/net/dccp/ccid.c
index c45088b5e6fb..4809753d12ae 100644
--- a/net/dccp/ccid.c
+++ b/net/dccp/ccid.c
@@ -92,15 +92,15 @@ int ccid_register(struct ccid_operations *ccid_ops)
92 92
93 ccid_ops->ccid_hc_rx_slab = 93 ccid_ops->ccid_hc_rx_slab =
94 ccid_kmem_cache_create(ccid_ops->ccid_hc_rx_obj_size, 94 ccid_kmem_cache_create(ccid_ops->ccid_hc_rx_obj_size,
95 "%s_hc_rx_sock", 95 "ccid%u_hc_rx_sock",
96 ccid_ops->ccid_name); 96 ccid_ops->ccid_id);
97 if (ccid_ops->ccid_hc_rx_slab == NULL) 97 if (ccid_ops->ccid_hc_rx_slab == NULL)
98 goto out; 98 goto out;
99 99
100 ccid_ops->ccid_hc_tx_slab = 100 ccid_ops->ccid_hc_tx_slab =
101 ccid_kmem_cache_create(ccid_ops->ccid_hc_tx_obj_size, 101 ccid_kmem_cache_create(ccid_ops->ccid_hc_tx_obj_size,
102 "%s_hc_tx_sock", 102 "ccid%u_hc_tx_sock",
103 ccid_ops->ccid_name); 103 ccid_ops->ccid_id);
104 if (ccid_ops->ccid_hc_tx_slab == NULL) 104 if (ccid_ops->ccid_hc_tx_slab == NULL)
105 goto out_free_rx_slab; 105 goto out_free_rx_slab;
106 106
diff --git a/net/dccp/ccids/ccid2.c b/net/dccp/ccids/ccid2.c
index 48eeb4494e8d..b5b52ebb2693 100644
--- a/net/dccp/ccids/ccid2.c
+++ b/net/dccp/ccids/ccid2.c
@@ -770,7 +770,7 @@ static void ccid2_hc_rx_packet_recv(struct sock *sk, struct sk_buff *skb)
770 770
771static struct ccid_operations ccid2 = { 771static struct ccid_operations ccid2 = {
772 .ccid_id = DCCPC_CCID2, 772 .ccid_id = DCCPC_CCID2,
773 .ccid_name = "ccid2", 773 .ccid_name = "TCP-like",
774 .ccid_owner = THIS_MODULE, 774 .ccid_owner = THIS_MODULE,
775 .ccid_hc_tx_obj_size = sizeof(struct ccid2_hc_tx_sock), 775 .ccid_hc_tx_obj_size = sizeof(struct ccid2_hc_tx_sock),
776 .ccid_hc_tx_init = ccid2_hc_tx_init, 776 .ccid_hc_tx_init = ccid2_hc_tx_init,
diff --git a/net/dccp/ccids/ccid3.c b/net/dccp/ccids/ccid3.c
index 8f112d18d450..cd9b9ffe2ec4 100644
--- a/net/dccp/ccids/ccid3.c
+++ b/net/dccp/ccids/ccid3.c
@@ -943,7 +943,7 @@ static int ccid3_hc_rx_getsockopt(struct sock *sk, const int optname, int len,
943 943
944static struct ccid_operations ccid3 = { 944static struct ccid_operations ccid3 = {
945 .ccid_id = DCCPC_CCID3, 945 .ccid_id = DCCPC_CCID3,
946 .ccid_name = "ccid3", 946 .ccid_name = "TCP-Friendly Rate Control",
947 .ccid_owner = THIS_MODULE, 947 .ccid_owner = THIS_MODULE,
948 .ccid_hc_tx_obj_size = sizeof(struct ccid3_hc_tx_sock), 948 .ccid_hc_tx_obj_size = sizeof(struct ccid3_hc_tx_sock),
949 .ccid_hc_tx_init = ccid3_hc_tx_init, 949 .ccid_hc_tx_init = ccid3_hc_tx_init,