Merge branch 'for-2.6.36' of git://git.kernel.dk/linux-2.6-block

[firefly-linux-kernel-4.4.55.git] / net / dccp / ackvec.c

diff --git a/net/dccp/ackvec.c b/net/dccp/ackvec.c
index 01e4d39fa23274a3fe57c49342ab10db7af7a1f5..92a6fcb40d7daa4c3e1bc3b8e2b5a49c4948cf3d 100644 (file)
--- a/net/dccp/ackvec.c
+++ b/net/dccp/ackvec.c
@@ -82,7 +82,7 @@ int dccp_insert_option_ackvec(struct sock *sk, struct sk_buff *skb)
        elapsed_time = delta / 10;
 
        if (elapsed_time != 0 &&
-           dccp_insert_option_elapsed_time(sk, skb, elapsed_time))
+           dccp_insert_option_elapsed_time(skb, elapsed_time))
                return -1;
 
        avr = dccp_ackvec_record_new();
@@ -201,7 +201,7 @@ static inline int dccp_ackvec_set_buf_head_state(struct dccp_ackvec *av,
                                                 const unsigned int packets,
                                                 const unsigned char state)
 {
-       unsigned int gap;
+       long gap;
        long new_head;
 
        if (av->av_vec_len + packets > DCCP_MAX_ACKVEC_LEN)