From 164753ed637aa955a1fd0667f981ceaeeec303b9 Mon Sep 17 00:00:00 2001
From: Herbert Xu <herbert@gondor.apana.org.au>
Date: Tue, 18 Oct 2005 12:03:28 +1000
Subject: [PATCH] --- yaml --- r: 10045 b: refs/heads/master c:
 49c5bfaffe8ae6e6440dc4bf78b03800960d93f5 h: refs/heads/master i:   10043:
 ee844a2631f1b0f926cda331bfdf0520739dddcc v: v3

---
 [refs]                  | 2 +-
 trunk/net/dccp/ipv4.c   | 2 ++
 trunk/net/dccp/output.c | 1 +
 3 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index 98dc18839843..0b9c32cc9e6e 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: ffa29347dfbc158d1f47f5925324a6f5713659c1
+refs/heads/master: 49c5bfaffe8ae6e6440dc4bf78b03800960d93f5
diff --git a/trunk/net/dccp/ipv4.c b/trunk/net/dccp/ipv4.c
index ae088d1347af..6298cf58ff9e 100644
--- a/trunk/net/dccp/ipv4.c
+++ b/trunk/net/dccp/ipv4.c
@@ -463,6 +463,7 @@ static int dccp_v4_send_response(struct sock *sk, struct request_sock *req,
 	if (skb != NULL) {
 		const struct inet_request_sock *ireq = inet_rsk(req);
 
+		memset(&(IPCB(skb)->opt), 0, sizeof(IPCB(skb)->opt));
 		err = ip_build_and_send_pkt(skb, sk, ireq->loc_addr,
 					    ireq->rmt_addr,
 					    ireq->opt);
@@ -647,6 +648,7 @@ int dccp_v4_send_reset(struct sock *sk, enum dccp_reset_codes code)
 	if (skb != NULL) {
 		const struct inet_sock *inet = inet_sk(sk);
 
+		memset(&(IPCB(skb)->opt), 0, sizeof(IPCB(skb)->opt));
 		err = ip_build_and_send_pkt(skb, sk,
 					    inet->saddr, inet->daddr, NULL);
 		if (err == NET_XMIT_CN)
diff --git a/trunk/net/dccp/output.c b/trunk/net/dccp/output.c
index 7006549f7050..29250749f16f 100644
--- a/trunk/net/dccp/output.c
+++ b/trunk/net/dccp/output.c
@@ -100,6 +100,7 @@ int dccp_transmit_skb(struct sock *sk, struct sk_buff *skb)
 
 		DCCP_INC_STATS(DCCP_MIB_OUTSEGS);
 
+		memset(&(IPCB(skb)->opt), 0, sizeof(IPCB(skb)->opt));
 		err = ip_queue_xmit(skb, 0);
 		if (err <= 0)
 			return err;