Pull kvm-patches into release branch

[linux-2.6] / net / dccp / output.c

diff --git a/net/dccp/output.c b/net/dccp/output.c
index 3b763db3d863bbdd941080a24a1c0c7abff607e7..3d7d628d870d394d391af91b63a8a69c3adbf5c0 100644 (file)
--- a/net/dccp/output.c
+++ b/net/dccp/output.c
@@ -126,7 +126,6 @@ static 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 = icsk->icsk_af_ops->queue_xmit(skb, 0);
                return net_xmit_eval(err);
        }