[DCCP]: Simplified conditions due to use of enum:8 states

[powerpc.git] / net / dccp / output.c

diff --git a/net/dccp/output.c b/net/dccp/output.c
index 08ee554..bfd9c57 100644 (file)
--- a/net/dccp/output.c
+++ b/net/dccp/output.c
@@ -125,16 +125,7 @@ static int dccp_transmit_skb(struct sock *sk, struct sk_buff *skb)
 
                memset(&(IPCB(skb)->opt), 0, sizeof(IPCB(skb)->opt));
                err = icsk->icsk_af_ops->queue_xmit(skb, sk, 0);
-               if (err <= 0)
-                       return err;
-
-               /* NET_XMIT_CN is special. It does not guarantee,
-                * that this packet is lost. It tells that device
-                * is about to start to drop packets or already
-                * drops some packets of the same priority and
-                * invokes us to send less aggressively.
-                */
-               return err == NET_XMIT_CN ? 0 : err;
+               return net_xmit_eval(err);
        }
        return -ENOBUFS;
 }
@@ -266,11 +257,8 @@ void dccp_write_xmit(struct sock *sk, int block)
                                err = dccp_wait_for_ccid(sk, skb, &timeo);
                                timeo = DCCP_XMIT_TIMEO;
                        }
-                       if (err) {
-                               printk(KERN_CRIT "%s:err at dccp_wait_for_ccid"
-                                                " %d\n", __FUNCTION__, err);
-                               dump_stack();
-                       }
+                       if (err)
+                               DCCP_BUG("err=%d after dccp_wait_for_ccid", err);
                }
 
                skb_dequeue(&sk->sk_write_queue);
@@ -292,12 +280,9 @@ void dccp_write_xmit(struct sock *sk, int block)
 
                        err = dccp_transmit_skb(sk, skb);
                        ccid_hc_tx_packet_sent(dp->dccps_hc_tx_ccid, sk, 0, len);
-                       if (err) {
-                               printk(KERN_CRIT "%s:err from "
-                                                "ccid_hc_tx_packet_sent %d\n",
-                                                __FUNCTION__, err);
-                               dump_stack();
-                       }
+                       if (err)
+                               DCCP_BUG("err=%d after ccid_hc_tx_packet_sent",
+                                        err);
                } else
                        kfree(skb);
        }
@@ -342,6 +327,7 @@ struct sk_buff *dccp_make_response(struct sock *sk, struct dst_entry *dst,
                return NULL;
        }
 
+       /* Build and checksum header */
        dh = dccp_zeroed_hdr(skb, dccp_header_size);
 
        dh->dccph_sport = inet_sk(sk)->sport;
@@ -426,8 +412,7 @@ int dccp_send_reset(struct sock *sk, enum dccp_reset_codes code)
                if (skb != NULL) {
                        memset(&(IPCB(skb)->opt), 0, sizeof(IPCB(skb)->opt));
                        err = inet_csk(sk)->icsk_af_ops->queue_xmit(skb, sk, 0);
-                       if (err == NET_XMIT_CN)
-                               err = 0;
+                       return net_xmit_eval(err);
                }
        }
 
@@ -448,7 +433,6 @@ static inline void dccp_connect_init(struct sock *sk)
        
        dccp_sync_mss(sk, dst_mtu(dst));
 
-       dccp_update_gss(sk, dp->dccps_iss);
        /*
         * SWL and AWL are initially adjusted so that they are not less than
         * the initial Sequence Numbers received and sent, respectively:
@@ -457,8 +441,13 @@ static inline void dccp_connect_init(struct sock *sk)
         * These adjustments MUST be applied only at the beginning of the
         * connection.
         */
+       dccp_update_gss(sk, dp->dccps_iss);
        dccp_set_seqno(&dp->dccps_awl, max48(dp->dccps_awl, dp->dccps_iss));
 
+       /* S.GAR - greatest valid acknowledgement number received on a non-Sync;
+        *         initialized to S.ISS (sec. 8.5)                            */
+       dp->dccps_gar = dp->dccps_iss;
+
        icsk->icsk_retransmits = 0;
        init_timer(&dp->dccps_xmit_timer);
        dp->dccps_xmit_timer.data = (unsigned long)sk;