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

Commit 1a98214f authored by Rémi Denis-Courmont's avatar Rémi Denis-Courmont Committed by David S. Miller
Browse files

Phonet: restore flow control credits when sending fails 



Signed-off-by: default avatarRémi Denis-Courmont <remi.denis-courmont@nokia.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 1f0f6388

net/phonet/pep.c

+5 −1
Original line number Original line Diff line number Diff line
@@ -834,6 +834,7 @@ static int pipe_skb_send(struct sock *sk, struct sk_buff *skb) 
{

{

	struct pep_sock *pn = pep_sk(sk);

	struct pep_sock *pn = pep_sk(sk);

	struct pnpipehdr *ph;

	struct pnpipehdr *ph;

	int err;





	if (pn_flow_safe(pn->tx_fc) &&

	if (pn_flow_safe(pn->tx_fc) &&

	    !atomic_add_unless(&pn->tx_credits, -1, 0)) {

	    !atomic_add_unless(&pn->tx_credits, -1, 0)) {
@@ -852,7 +853,10 @@ static int pipe_skb_send(struct sock *sk, struct sk_buff *skb) 
		ph->message_id = PNS_PIPE_DATA;

		ph->message_id = PNS_PIPE_DATA;

	ph->pipe_handle = pn->pipe_handle;

	ph->pipe_handle = pn->pipe_handle;





	return pn_skb_send(sk, skb, &pipe_srv);

	err = pn_skb_send(sk, skb, &pipe_srv);

	if (err && pn_flow_safe(pn->tx_fc))

		atomic_inc(&pn->tx_credits);

	return err;

}

}





static int pep_sendmsg(struct kiocb *iocb, struct sock *sk,

static int pep_sendmsg(struct kiocb *iocb, struct sock *sk,