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

Commit 451677c4 authored by Jochen Friedrich's avatar Jochen Friedrich Committed by David S. Miller
Browse files

[LLC]: Make core block on remote busy. 



Signed-off-by: default avatarJochen Friedrich <jochen@scram.de>
Acked-by: default avatarArnaldo Carvalho de Melo <acme@mandriva.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 59c6196e

net/llc/af_llc.c

+4 −1
Original line number Diff line number Diff line
@@ -116,7 +116,9 @@ static int llc_ui_send_data(struct sock* sk, struct sk_buff *skb, int noblock) 
	struct llc_sock* llc = llc_sk(sk);

	int rc = 0;



	if (unlikely(llc_data_accept_state(llc->state) || llc->p_flag)) {

	if (unlikely(llc_data_accept_state(llc->state) || 

		     llc->remote_busy_flag ||

		     llc->p_flag)) {

		long timeout = sock_sndtimeo(sk, noblock);



		rc = llc_ui_wait_for_busy_core(sk, timeout);
@@ -542,6 +544,7 @@ static int llc_ui_wait_for_busy_core(struct sock *sk, long timeout) 
		if (sk_wait_event(sk, &timeout,

				  (sk->sk_shutdown & RCV_SHUTDOWN) ||

				  (!llc_data_accept_state(llc->state) &&

				   !llc->remote_busy_flag &&

				   !llc->p_flag)))

			break;

		rc = -ERESTARTSYS;