RDMA/ipoib: Use min_t() macro instead of min()

Use min_t() macro to avoid the casting when using min() macro, also fix
the type of "length" and "wc->byte_len" to be "unsigned int" and
"u32" which is the right type for each one of them.

Signed-off-by: Kamal Heib <kamalheib1@gmail.com>
Reviewed-by: Leon Romanovsky <leonro@mellanox.com>
Signed-off-by: Jason Gunthorpe <jgg@mellanox.com>

diff --git a/drivers/infiniband/ulp/ipoib/ipoib_cm.c b/drivers/infiniband/ulp/ipoib/ipoib_cm.c
index 23cb1adc636f741815653ea0748059ac18721a57..65b305d91ce32319f40d459c960eb375de9e1372 100644 (file)
--- a/drivers/infiniband/ulp/ipoib/ipoib_cm.c
+++ b/drivers/infiniband/ulp/ipoib/ipoib_cm.c
@@ -547,7 +547,7 @@ static void skb_put_frags(struct sk_buff *skb, unsigned int hdr_space,
                                           0, PAGE_SIZE);
                        --skb_shinfo(skb)->nr_frags;
                } else {
-                       size = min(length, (unsigned) PAGE_SIZE);
+                       size = min_t(unsigned int, length, PAGE_SIZE);
 
                        skb_frag_size_set(frag, size);
                        skb->data_len += size;
@@ -641,8 +641,9 @@ void ipoib_cm_handle_rx_wc(struct net_device *dev, struct ib_wc *wc)
                }
        }
 
-       frags = PAGE_ALIGN(wc->byte_len - min(wc->byte_len,
-                                             (unsigned)IPOIB_CM_HEAD_SIZE)) / PAGE_SIZE;
+       frags = PAGE_ALIGN(wc->byte_len -
+                          min_t(u32, wc->byte_len, IPOIB_CM_HEAD_SIZE)) /
+               PAGE_SIZE;
 
        newskb = ipoib_cm_alloc_rx_skb(dev, rx_ring, wr_id, frags,
                                       mapping, GFP_ATOMIC);