From e6908350a8ab4ff7f52d345c20e9d2b03f13ada0 Mon Sep 17 00:00:00 2001
From: Vlad Yasevich <vladislav.yasevich@hp.com>
Date: Wed, 9 May 2007 13:52:35 -0700
Subject: [PATCH] --- yaml --- r: 55959 b: refs/heads/master c:
 ac40e41f4ddec8882d3f7bc8fa98a4fce8796aff h: refs/heads/master i:   55957:
 7ba0a8840bdc84b5d43e67933c611ed7adc91866   55955:
 7ac780226f4db632ee4bd42ed569c812e0fcc779   55951:
 2957ed7b65e61b26e75a5c0b02d055ad3dde753e v: v3

---
 [refs]                    |  2 +-
 trunk/net/sctp/ulpevent.c | 11 ++---------
 2 files changed, 3 insertions(+), 10 deletions(-)

diff --git a/[refs] b/[refs]
index 780676da8b6d..c991bb3dbbf4 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 70b57b814ed5a93bf21d9dc5f8a7d23620a77e44
+refs/heads/master: ac40e41f4ddec8882d3f7bc8fa98a4fce8796aff
diff --git a/trunk/net/sctp/ulpevent.c b/trunk/net/sctp/ulpevent.c
index 661ea2dd78ba..bfecb353ab3d 100644
--- a/trunk/net/sctp/ulpevent.c
+++ b/trunk/net/sctp/ulpevent.c
@@ -141,11 +141,6 @@ struct sctp_ulpevent  *sctp_ulpevent_make_assoc_change(
 	 * an ABORT, so we need to include it in the sac_info.
 	 */
 	if (chunk) {
-		/* sctp_inqu_pop() has allready pulled off the chunk
-		 * header.  We need to put it back temporarily
-		 */
-		skb_push(chunk->skb, sizeof(sctp_chunkhdr_t));
-
 		/* Copy the chunk data to a new skb and reserve enough
 		 * head room to use as notification.
 		 */
@@ -155,9 +150,6 @@ struct sctp_ulpevent  *sctp_ulpevent_make_assoc_change(
 		if (!skb)
 			goto fail;
 
-		/* put back the chunk header now that we have a copy */
-		skb_pull(chunk->skb, sizeof(sctp_chunkhdr_t));
-
 		/* Embed the event fields inside the cloned skb.  */
 		event = sctp_skb2event(skb);
 		sctp_ulpevent_init(event, MSG_NOTIFICATION, skb->truesize);
@@ -168,7 +160,8 @@ struct sctp_ulpevent  *sctp_ulpevent_make_assoc_change(
 
 		/* Trim the buffer to the right length.  */
 		skb_trim(skb, sizeof(struct sctp_assoc_change) +
-			 ntohs(chunk->chunk_hdr->length));
+			 ntohs(chunk->chunk_hdr->length) -
+			 sizeof(sctp_chunkhdr_t));
 	} else {
 		event = sctp_ulpevent_new(sizeof(struct sctp_assoc_change),
 				  MSG_NOTIFICATION, gfp);