---

yaml
---
r: 14255
b: refs/heads/master
c: 451677c
h: refs/heads/master
i:
  14253: d3ac96f
  14251: 809b2dd
  14247: 53b9cf5
  14239: 701a886
v: v3

[refs]

@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 59c6196e59a4b85d9c994e70ff20a460cdbaa003
+refs/heads/master: 451677c46feb5fb39cb7f71035b8716064fcbd57

trunk/net/llc/af_llc.c

@@ -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;