lne390: convert to net_device_ops

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

diff --git a/net/dccp/input.c b/net/dccp/input.c
index 803933ab396d41af9e50d8d0e5e0d903708b9c05..3070015edc7535fc5c299c0b0a9f00c8af99d9dd 100644 (file)
--- a/net/dccp/input.c
+++ b/net/dccp/input.c
@@ -370,7 +370,7 @@ int dccp_rcv_established(struct sock *sk, struct sk_buff *skb,
                goto discard;
 
        if (dccp_parse_options(sk, NULL, skb))
-               goto discard;
+               return 1;
 
        if (DCCP_SKB_CB(skb)->dccpd_ack_seq != DCCP_PKT_WITHOUT_ACK_SEQ)
                dccp_event_ack_recv(sk, skb);
@@ -590,8 +590,6 @@ int dccp_rcv_state_process(struct sock *sk, struct sk_buff *skb,
                        if (inet_csk(sk)->icsk_af_ops->conn_request(sk,
                                                                    skb) < 0)
                                return 1;
-
-                       /* FIXME: do congestion control initialization */
                        goto discard;
                }
                if (dh->dccph_type == DCCP_PKT_RESET)
@@ -610,7 +608,7 @@ int dccp_rcv_state_process(struct sock *sk, struct sk_buff *skb,
                 * Step 8: Process options and mark acknowledgeable
                 */
                if (dccp_parse_options(sk, NULL, skb))
-                       goto discard;
+                       return 1;
 
                if (dcb->dccpd_ack_seq != DCCP_PKT_WITHOUT_ACK_SEQ)
                        dccp_event_ack_recv(sk, skb);