summaryrefslogtreecommitdiff
path: root/net/dccp/ipv4.c
diff options
context:
space:
mode:
authorJeff Garzik <jgarzik@pobox.com>2005-10-26 09:06:45 +0400
committerJeff Garzik <jgarzik@pobox.com>2005-10-26 09:06:45 +0400
commit1f57389a38dc1e8be167ec601f39f78f0bed3a96 (patch)
tree5f33d00a046597ae33855cee13d17d77048ba712 /net/dccp/ipv4.c
parent077783f87708b24054452e5c07685ead2c28b1eb (diff)
parent6693e74a16ef563960764bd963f1048392135c3c (diff)
downloadlinux-1f57389a38dc1e8be167ec601f39f78f0bed3a96.tar.xz
Merge branch 'master'
Diffstat (limited to 'net/dccp/ipv4.c')
-rw-r--r--net/dccp/ipv4.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/net/dccp/ipv4.c b/net/dccp/ipv4.c
index ae088d1347af..6298cf58ff9e 100644
--- a/net/dccp/ipv4.c
+++ b/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)