From 573fc936cb964f3df9673ef371254b22f9c977ed Mon Sep 17 00:00:00 2001 From: Sjur Braendeland Date: Tue, 21 Sep 2010 11:44:44 +0000 Subject: [PATCH] --- yaml --- r: 214606 b: refs/heads/master c: b04367df66eb63444d38c43d15f5e39499d85ae6 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/net/caif/caif_socket.c | 8 ++------ trunk/net/caif/cfcnfg.c | 2 +- 3 files changed, 4 insertions(+), 8 deletions(-) diff --git a/[refs] b/[refs] index 3c6c0b62bcf0..4526f893788f 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 9c44c9fa78c5a449699491f0355189e2a09c242a +refs/heads/master: b04367df66eb63444d38c43d15f5e39499d85ae6 diff --git a/trunk/net/caif/caif_socket.c b/trunk/net/caif/caif_socket.c index fd1f5df0827c..3943398f70cd 100644 --- a/trunk/net/caif/caif_socket.c +++ b/trunk/net/caif/caif_socket.c @@ -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); } diff --git a/trunk/net/caif/cfcnfg.c b/trunk/net/caif/cfcnfg.c index ef93a131310b..41adafd18914 100644 --- a/trunk/net/caif/cfcnfg.c +++ b/trunk/net/caif/cfcnfg.c @@ -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; }