Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit b04367df authored by Sjur Braendeland's avatar Sjur Braendeland Committed by David S. Miller
Browse files

caif: Minor fixes in log prints. 



Use pr_debug for flow control printouts, and refine an error printout.

Signed-off-by: default avatarSjur Braendeland <sjur.brandeland@stericsson.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 9c44c9fa

net/caif/caif_socket.c

+2 −6
Original line number Diff line number Diff line
@@ -159,9 +159,7 @@ static int caif_queue_rcv_skb(struct sock *sk, struct sk_buff *skb) 


	if (atomic_read(&sk->sk_rmem_alloc) + skb->truesize >=

		(unsigned)sk->sk_rcvbuf && rx_flow_is_on(cf_sk)) {

		trace_printk("CAIF: %s(): "

			"sending flow OFF (queue len = %d %d)\n",

			__func__,

		pr_debug("sending flow OFF (queue len = %d %d)\n",

			atomic_read(&cf_sk->sk.sk_rmem_alloc),

			sk_rcvbuf_lowwater(cf_sk));

		set_rx_flow_off(cf_sk);
@@ -174,9 +172,7 @@ static int caif_queue_rcv_skb(struct sock *sk, struct sk_buff *skb) 
		return err;

	if (!sk_rmem_schedule(sk, skb->truesize) && rx_flow_is_on(cf_sk)) {

		set_rx_flow_off(cf_sk);

		trace_printk("CAIF: %s(): "

			"sending flow OFF due to rmem_schedule\n",

			__func__);

		pr_debug("sending flow OFF due to rmem_schedule\n");

		dbfs_atomic_inc(&cnt.num_rx_flow_off);

		caif_flow_ctrl(sk, CAIF_MODEMCMD_FLOW_OFF_REQ);

	}

net/caif/cfcnfg.c

+1 −1
Original line number Diff line number Diff line
@@ -197,7 +197,7 @@ int cfcnfg_disconn_adapt_layer(struct cfcnfg *cnfg, struct cflayer *adap_layer) 
	caif_assert(adap_layer != NULL);

	channel_id = adap_layer->id;

	if (adap_layer->dn == NULL || channel_id == 0) {

		pr_err("adap_layer->id is 0\n");

		pr_err("adap_layer->dn == NULL or adap_layer->id is 0\n");

		ret = -ENOTCONN;

		goto end;

	}