From b42d7a32165c9fd10e202e7572c8ead95169c018 Mon Sep 17 00:00:00 2001
From: "David S. Miller" <davem@sunset.davemloft.net>
Date: Fri, 20 Oct 2006 19:44:17 -0700
Subject: [PATCH] --- yaml --- r: 40190 b: refs/heads/master c:
 fd169f15a67b47f23bd1704919c719a8e8409a73 h: refs/heads/master v: v3

---
 [refs]                | 2 +-
 trunk/net/dccp/ipv6.c | 8 ++++++++
 2 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index fde000af00d6..07cb7523cae7 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 82709531a800fcf8de71bb8c5d8e92462fb81f84
+refs/heads/master: fd169f15a67b47f23bd1704919c719a8e8409a73
diff --git a/trunk/net/dccp/ipv6.c b/trunk/net/dccp/ipv6.c
index 91e7b12df13b..c8bf89bfb088 100644
--- a/trunk/net/dccp/ipv6.c
+++ b/trunk/net/dccp/ipv6.c
@@ -995,6 +995,10 @@ static int dccp_v6_do_rcv(struct sock *sk, struct sk_buff *skb)
 	if (sk->sk_state == DCCP_OPEN) { /* Fast path */
 		if (dccp_rcv_established(sk, skb, dccp_hdr(skb), skb->len))
 			goto reset;
+		if (opt_skb) {
+			/* This is where we would goto ipv6_pktoptions. */
+			__kfree_skb(opt_skb);
+		}
 		return 0;
 	}
 
@@ -1019,6 +1023,10 @@ static int dccp_v6_do_rcv(struct sock *sk, struct sk_buff *skb)
 
 	if (dccp_rcv_state_process(sk, skb, dccp_hdr(skb), skb->len))
 		goto reset;
+	if (opt_skb) {
+		/* This is where we would goto ipv6_pktoptions. */
+		__kfree_skb(opt_skb);
+	}
 	return 0;
 
 reset: