aboutsummaryrefslogtreecommitdiffstats
path: root/net/dccp/ipv4.c
diff options
context:
space:
mode:
authorDavid S. Miller <davem@davemloft.net>2008-04-14 05:30:23 -0400
committerDavid S. Miller <davem@davemloft.net>2008-04-14 05:30:23 -0400
commitdf39e8ba56a788733d369068c7319e04b1da3cd5 (patch)
tree1e9be853bdb455e341cdbf957656f342cfa2eb9e /net/dccp/ipv4.c
parentf5572855ec492334d8c3ec0e0e86c31865d5cf07 (diff)
parent159d83363b629c91d020734207c1bc788b96af5a (diff)
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
Conflicts: drivers/net/ehea/ehea_main.c drivers/net/wireless/iwlwifi/Kconfig drivers/net/wireless/rt2x00/rt61pci.c net/ipv4/inet_timewait_sock.c net/ipv6/raw.c net/mac80211/ieee80211_sta.c
Diffstat (limited to 'net/dccp/ipv4.c')
-rw-r--r--net/dccp/ipv4.c1
1 files changed, 0 insertions, 1 deletions
diff --git a/net/dccp/ipv4.c b/net/dccp/ipv4.c
index b9974669edb4..baa268d02e24 100644
--- a/net/dccp/ipv4.c
+++ b/net/dccp/ipv4.c
@@ -488,7 +488,6 @@ static int dccp_v4_send_response(struct sock *sk, struct request_sock *req)
488 488
489 dh->dccph_checksum = dccp_v4_csum_finish(skb, ireq->loc_addr, 489 dh->dccph_checksum = dccp_v4_csum_finish(skb, ireq->loc_addr,
490 ireq->rmt_addr); 490 ireq->rmt_addr);
491 memset(&(IPCB(skb)->opt), 0, sizeof(IPCB(skb)->opt));
492 err = ip_build_and_send_pkt(skb, sk, ireq->loc_addr, 491 err = ip_build_and_send_pkt(skb, sk, ireq->loc_addr,
493 ireq->rmt_addr, 492 ireq->rmt_addr,
494 ireq->opt); 493 ireq->opt);