Commit 84a97b0a authored by Gerrit Renker's avatar Gerrit Renker Committed by David S. Miller
Browse files

[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: default avatarGerrit Renker <gerrit@erg.abdn.ac.uk>
Signed-off-by: default avatarIan McDonald <ian.mcdonald@jandi.co.nz>
Signed-off-by: default avatarArnaldo Carvalho de Melo <acme@redhat.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 9cb2345a

net/dccp/ccid.c

+4 −4
Original line number Diff line number Diff line
@@ -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;

net/dccp/ccids/ccid2.c

+1 −1
Original line number Diff line number Diff line
@@ -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,

net/dccp/ccids/ccid3.c

+1 −1
Original line number Diff line number Diff line
@@ -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,

CRA Git | Maintained and supported by SUSTech CRA and CCSE