aboutsummaryrefslogtreecommitdiffstats
path: root/net/dccp/ipv4.c
diff options
context:
space:
mode:
authorDave Airlie <airlied@starflyer.(none)>2005-10-22 15:24:35 +1000
committerDave Airlie <airlied@linux.ie>2005-10-22 15:24:35 +1000
commit23bfc1a339e98510f2ce25a2764a0cfe195faa9e (patch)
tree51652ad15f85d9d1367ae6f9b8641dfe46b4c501 /net/dccp/ipv4.c
parent312f5726055534be1dc9dd369be13aabd2943fcb (diff)
parent63172cb3d5ef762dcb60a292bc7f016b85cf6e1f (diff)
downloadkernel_samsung_smdk4412-23bfc1a339e98510f2ce25a2764a0cfe195faa9e.zip
kernel_samsung_smdk4412-23bfc1a339e98510f2ce25a2764a0cfe195faa9e.tar.gz
kernel_samsung_smdk4412-23bfc1a339e98510f2ce25a2764a0cfe195faa9e.tar.bz2
merge linus head to drm-mm branch
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 ae088d1..6298cf5 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)