Merge remote-tracking branch 'scsi-queue/drivers-for-3.19' into for-linus

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

diff --git a/net/dccp/ackvec.c b/net/dccp/ackvec.c
index ba07824af4c07950d8ee25c6abfccfb1fe919f5c..bd9e718c2a209b5d4b7e4859fc68f77c79541366 100644 (file)
--- a/net/dccp/ackvec.c
+++ b/net/dccp/ackvec.c
@@ -218,7 +218,7 @@ static void dccp_ackvec_add_new(struct dccp_ackvec *av, u32 num_packets,
                 * different underlying data structure.
                 */
                for (num_packets = num_cells = 1; lost_packets; ++num_cells) {
-                       u8 len = min(lost_packets, (u32)DCCPAV_MAX_RUNLEN);
+                       u8 len = min_t(u32, lost_packets, DCCPAV_MAX_RUNLEN);
 
                        av->av_buf_head = __ackvec_idx_sub(av->av_buf_head, 1);
                        av->av_buf[av->av_buf_head] = DCCPAV_NOT_RECEIVED | len;