Commit:     b0d045ca45a44d9f8bd66d0a10558b10c60f895a
Parent:     e155d7692290f7bc539ccb8ebc3450ec964e53fd
Author:     Gerrit Renker <[EMAIL PROTECTED]>
AuthorDate: Tue Sep 25 22:42:27 2007 -0700
Committer:  David S. Miller <[EMAIL PROTECTED]>
CommitDate: Wed Oct 10 16:52:37 2007 -0700

    [DCCP]: Parameter renaming
    The parameter `seq' of dccp_send_sync() is in fact an acknowledgement number
    and not a sequence number - thus renamed by this patch into `ackno'.
    Secondly, a `critical' warning is added when a Sync/SyncAck could not be 
    Sanity: I have checked all other functions that are called in 
            there are no clashes with the use of dccpd_ack_seq; no other 
function is
            using this slot at the same time.
    Signed-off-by: Gerrit Renker <[EMAIL PROTECTED]>
    Signed-off-by: Ian McDonald <[EMAIL PROTECTED]>
    Signed-off-by: Arnaldo Carvalho de Melo <[EMAIL PROTECTED]>
    Signed-off-by: David S. Miller <[EMAIL PROTECTED]>
 net/dccp/output.c |   10 ++++++----
 1 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/net/dccp/output.c b/net/dccp/output.c
index c8d843e..6e23d5b 100644
--- a/net/dccp/output.c
+++ b/net/dccp/output.c
@@ -69,7 +69,7 @@ static int dccp_transmit_skb(struct sock *sk, struct sk_buff 
                case DCCP_PKT_SYNC:
                case DCCP_PKT_SYNCACK:
-                       ackno = dcb->dccpd_seq;
+                       ackno = dcb->dccpd_ack_seq;
                        /* fall through */
@@ -507,7 +507,7 @@ void dccp_send_delayed_ack(struct sock *sk)
        sk_reset_timer(sk, &icsk->icsk_delack_timer, timeout);
-void dccp_send_sync(struct sock *sk, const u64 seq,
+void dccp_send_sync(struct sock *sk, const u64 ackno,
                    const enum dccp_pkt_type pkt_type)
@@ -517,14 +517,16 @@ void dccp_send_sync(struct sock *sk, const u64 seq,
        struct sk_buff *skb = alloc_skb(sk->sk_prot->max_header, GFP_ATOMIC);
-       if (skb == NULL)
+       if (skb == NULL) {
                /* FIXME: how to make sure the sync is sent? */
+               DCCP_CRIT("could not send %s", dccp_packet_name(pkt_type));
+       }
        /* Reserve space for headers and prepare control bits. */
        skb_reserve(skb, sk->sk_prot->max_header);
        DCCP_SKB_CB(skb)->dccpd_type = pkt_type;
-       DCCP_SKB_CB(skb)->dccpd_seq = seq;
+       DCCP_SKB_CB(skb)->dccpd_ack_seq = ackno;
        dccp_transmit_skb(sk, skb);
To unsubscribe from this list: send the line "unsubscribe git-commits-head" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at

Reply via email to