From 63bd4a74956bdd01e5b8eead00dafe32956fad63 Mon Sep 17 00:00:00 2001
From: Arnaldo Carvalho de Melo <acme@mandriva.com>
Date: Thu, 22 Sep 2005 03:38:15 -0300
Subject: [PATCH] --- yaml --- r: 9328 b: refs/heads/master c:
 bdcc66cca89cc2e97e93054d139b2e9a2b2ec1a7 h: refs/heads/master v: v3

---
 [refs]                   |  2 +-
 trunk/net/llc/llc_c_ac.c | 10 ++--------
 2 files changed, 3 insertions(+), 9 deletions(-)

diff --git a/[refs] b/[refs]
index 960f4d804d6d..4aac26c62615 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 1d67e6501b8dba54ef8dcabebe2ad049b8ad0d67
+refs/heads/master: bdcc66cca89cc2e97e93054d139b2e9a2b2ec1a7
diff --git a/trunk/net/llc/llc_c_ac.c b/trunk/net/llc/llc_c_ac.c
index db98ea2113a5..309c5682e58d 100644
--- a/trunk/net/llc/llc_c_ac.c
+++ b/trunk/net/llc/llc_c_ac.c
@@ -120,10 +120,8 @@ int llc_conn_ac_disc_ind(struct sock *sk, struct sk_buff *skb)
 			reason = LLC_DISC_REASON_RX_DISC_CMD_PDU;
 	} else if (ev->type == LLC_CONN_EV_TYPE_ACK_TMR)
 		reason = LLC_DISC_REASON_ACK_TMR_EXP;
-	else {
-		reason = 0;
+	else
 		rc = -EINVAL;
-	}
 	if (!rc) {
 		ev->reason   = reason;
 		ev->ind_prim = LLC_DISC_PRIM;
@@ -160,9 +158,6 @@ int llc_conn_ac_rst_ind(struct sock *sk, struct sk_buff *skb)
 			   LLC_U_PDU_CMD(pdu) == LLC_2_PDU_CMD_SABME) {
 			reason = LLC_RESET_REASON_REMOTE;
 			rc = 0;
-		} else {
-			reason = 0;
-			rc  = 1;
 		}
 		break;
 	case LLC_CONN_EV_TYPE_ACK_TMR:
@@ -172,8 +167,7 @@ int llc_conn_ac_rst_ind(struct sock *sk, struct sk_buff *skb)
 		if (llc->retry_count > llc->n2) {
 			reason = LLC_RESET_REASON_LOCAL;
 			rc = 0;
-		} else
-			rc = 1;
+		}
 		break;
 	}
 	if (!rc) {