hwmon: (lm90) Add support for the LM99 16 degree offset

[linux-2.6-omap-h63xx.git] / net / dccp / output.c

diff --git a/net/dccp/output.c b/net/dccp/output.c
index dc96ecfbe6e817269c9e00dce99e3ded071dac35..809d803d5006ec6614821b9d0d48b63cf131a31f 100644 (file)
--- a/net/dccp/output.c
+++ b/net/dccp/output.c
@@ -347,7 +347,7 @@ struct sk_buff *dccp_make_response(struct sock *sk, struct dst_entry *dst,
        /* Build and checksum header */
        dh = dccp_zeroed_hdr(skb, dccp_header_size);
 
-       dh->dccph_sport = inet_sk(sk)->sport;
+       dh->dccph_sport = inet_rsk(req)->loc_port;
        dh->dccph_dport = inet_rsk(req)->rmt_port;
        dh->dccph_doff  = (dccp_header_size +
                           DCCP_SKB_CB(skb)->dccpd_opt_len) / 4;
@@ -469,10 +469,6 @@ int dccp_connect(struct sock *sk)
        struct sk_buff *skb;
        struct inet_connection_sock *icsk = inet_csk(sk);
 
-       /* do not connect if feature negotiation setup fails */
-       if (dccp_feat_finalise_settings(dccp_sk(sk)))
-               return -EPROTO;
-
        dccp_connect_init(sk);
 
        skb = alloc_skb(sk->sk_prot->max_header, sk->sk_allocation);