From b0b794691ef042d70dd7275d84617549e70fb1df Mon Sep 17 00:00:00 2001
From: Daniel Borkmann <dborkman@redhat.com>
Date: Tue, 16 Apr 2013 11:07:14 +0000
Subject: [PATCH] --- yaml --- r: 369269 b: refs/heads/master c:
 dacda32ee694d9139c336c5e1cdfb826f6296186 h: refs/heads/master i:   369267:
 28dc67f25a93a2cca206a15cad28491fd51a6fd1 v: v3

---
 [refs]                    | 2 +-
 trunk/net/sctp/outqueue.c | 5 ++---
 2 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/[refs] b/[refs]
index b561e4ef6c23..b471cb117f83 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 165a4c31278c980862b2c2ddec408cf30341f3ec
+refs/heads/master: dacda32ee694d9139c336c5e1cdfb826f6296186
diff --git a/trunk/net/sctp/outqueue.c b/trunk/net/sctp/outqueue.c
index d4c137e1ab85..32a4625fef77 100644
--- a/trunk/net/sctp/outqueue.c
+++ b/trunk/net/sctp/outqueue.c
@@ -701,11 +701,10 @@ static int sctp_outq_flush_rtx(struct sctp_outq *q, struct sctp_packet *pkt,
 /* Cork the outqueue so queued chunks are really queued. */
 int sctp_outq_uncork(struct sctp_outq *q)
 {
-	int error = 0;
 	if (q->cork)
 		q->cork = 0;
-	error = sctp_outq_flush(q, 0);
-	return error;
+
+	return sctp_outq_flush(q, 0);
 }