diff options
author | Jeff Garzik <jgarzik@pobox.com> | 2005-10-26 01:08:05 -0400 |
---|---|---|
committer | Jeff Garzik <jgarzik@pobox.com> | 2005-10-26 01:08:05 -0400 |
commit | ccd7bc2f67fdfa9c47ceae64f1117d1fb6cb8737 (patch) | |
tree | 33b13cd5582c419f8ae098edb24ca355974a7ccf /net/dccp/ipv4.c | |
parent | 6f0ef4fa57b9ba27d7b1c330bad041f1665501fe (diff) | |
parent | 6693e74a16ef563960764bd963f1048392135c3c (diff) | |
download | kernel-crypto-ccd7bc2f67fdfa9c47ceae64f1117d1fb6cb8737.tar.gz kernel-crypto-ccd7bc2f67fdfa9c47ceae64f1117d1fb6cb8737.tar.xz kernel-crypto-ccd7bc2f67fdfa9c47ceae64f1117d1fb6cb8737.zip |
Merge branch 'master'
Diffstat (limited to 'net/dccp/ipv4.c')
-rw-r--r-- | net/dccp/ipv4.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/net/dccp/ipv4.c b/net/dccp/ipv4.c index ae088d1347a..6298cf58ff9 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) |