RDMA/ipoib: Prefer unsigned int to bare use of unsigned

This commit replaces all the unsigned definitions in favour of 'unsigned
int' which is preferred.

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.h b/drivers/infiniband/ulp/ipoib/ipoib.h
index a50b062..3dd130a 100644 (file)
--- a/drivers/infiniband/ulp/ipoib/ipoib.h
+++ b/drivers/infiniband/ulp/ipoib/ipoib.h
@@ -252,11 +252,11 @@ struct ipoib_cm_tx {
        struct ipoib_neigh  *neigh;
        struct ipoib_path   *path;
        struct ipoib_tx_buf *tx_ring;
-       unsigned             tx_head;
-       unsigned             tx_tail;
+       unsigned int         tx_head;
+       unsigned int         tx_tail;
        unsigned long        flags;
        u32                  mtu;
-       unsigned             max_send_sge;
+       unsigned int         max_send_sge;
 };
 
 struct ipoib_cm_rx_buf {
@@ -373,8 +373,8 @@ struct ipoib_dev_priv {
        struct ipoib_rx_buf *rx_ring;
 
        struct ipoib_tx_buf *tx_ring;
-       unsigned             tx_head;
-       unsigned             tx_tail;
+       unsigned int         tx_head;
+       unsigned int         tx_tail;
        struct ib_sge        tx_sge[MAX_SKB_FRAGS + 1];
        struct ib_ud_wr      tx_wr;
        struct ib_wc         send_wc[MAX_SEND_CQE];
@@ -404,7 +404,7 @@ struct ipoib_dev_priv {
 #endif
        u64     hca_caps;
        struct ipoib_ethtool_st ethtool;
-       unsigned max_send_sge;
+       unsigned int max_send_sge;
        bool sm_fullmember_sendonly_support;
        const struct net_device_ops     *rn_ops;
 };
@@ -414,7 +414,7 @@ struct ipoib_ah {
        struct ib_ah      *ah;
        struct list_head   list;
        struct kref        ref;
-       unsigned           last_send;
+       unsigned int       last_send;
        int                valid;
 };
 

diff --git a/drivers/infiniband/ulp/ipoib/ipoib_cm.c b/drivers/infiniband/ulp/ipoib/ipoib_cm.c
index 65b305d..9b374ce 100644 (file)
--- a/drivers/infiniband/ulp/ipoib/ipoib_cm.c
+++ b/drivers/infiniband/ulp/ipoib/ipoib_cm.c
@@ -275,7 +275,7 @@ static struct ib_qp *ipoib_cm_create_rx_qp(struct net_device *dev,
 
 static int ipoib_cm_modify_rx_qp(struct net_device *dev,
                                 struct ib_cm_id *cm_id, struct ib_qp *qp,
-                                unsigned psn)
+                                unsigned int psn)
 {
        struct ipoib_dev_priv *priv = ipoib_priv(dev);
        struct ib_qp_attr qp_attr;
@@ -422,7 +422,7 @@ err_free_1:
 
 static int ipoib_cm_send_rep(struct net_device *dev, struct ib_cm_id *cm_id,
                             struct ib_qp *qp, struct ib_cm_req_event_param *req,
-                            unsigned psn)
+                            unsigned int psn)
 {
        struct ipoib_dev_priv *priv = ipoib_priv(dev);
        struct ipoib_cm_data data = {};
@@ -446,7 +446,7 @@ static int ipoib_cm_req_handler(struct ib_cm_id *cm_id, struct ib_cm_event *even
        struct net_device *dev = cm_id->context;
        struct ipoib_dev_priv *priv = ipoib_priv(dev);
        struct ipoib_cm_rx *p;
-       unsigned psn;
+       unsigned int psn;
        int ret;
 
        ipoib_dbg(priv, "REQ arrived\n");
@@ -713,7 +713,7 @@ void ipoib_cm_send(struct net_device *dev, struct sk_buff *skb, struct ipoib_cm_
        struct ipoib_dev_priv *priv = ipoib_priv(dev);
        struct ipoib_tx_buf *tx_req;
        int rc;
-       unsigned usable_sge = tx->max_send_sge - !!skb_headlen(skb);
+       unsigned int usable_sge = tx->max_send_sge - !!skb_headlen(skb);
 
        if (unlikely(skb->len > tx->mtu)) {
                ipoib_warn(priv, "packet len %d (> %d) too long to send, dropping\n",
@@ -1429,7 +1429,7 @@ static void ipoib_cm_skb_reap(struct work_struct *work)
        struct net_device *dev = priv->dev;
        struct sk_buff *skb;
        unsigned long flags;
-       unsigned mtu = priv->mcast_mtu;
+       unsigned int mtu = priv->mcast_mtu;
 
        netif_tx_lock_bh(dev);
        spin_lock_irqsave(&priv->lock, flags);

diff --git a/drivers/infiniband/ulp/ipoib/ipoib_ib.c b/drivers/infiniband/ulp/ipoib/ipoib_ib.c
index fb3728b..f782f4b 100644 (file)
--- a/drivers/infiniband/ulp/ipoib/ipoib_ib.c
+++ b/drivers/infiniband/ulp/ipoib/ipoib_ib.c
@@ -569,7 +569,7 @@ int ipoib_send(struct net_device *dev, struct sk_buff *skb,
        struct ipoib_tx_buf *tx_req;
        int hlen, rc;
        void *phead;
-       unsigned usable_sge = priv->max_send_sge - !!skb_headlen(skb);
+       unsigned int usable_sge = priv->max_send_sge - !!skb_headlen(skb);
 
        if (skb_is_gso(skb)) {
                hlen = skb_transport_offset(skb) + tcp_hdrlen(skb);

diff --git a/drivers/infiniband/ulp/ipoib/ipoib_main.c b/drivers/infiniband/ulp/ipoib/ipoib_main.c
index 983e52b..15344f9 100644 (file)
--- a/drivers/infiniband/ulp/ipoib/ipoib_main.c
+++ b/drivers/infiniband/ulp/ipoib/ipoib_main.c
@@ -1201,7 +1201,9 @@ static void ipoib_timeout(struct net_device *dev)
 static int ipoib_hard_header(struct sk_buff *skb,
                             struct net_device *dev,
                             unsigned short type,
-                            const void *daddr, const void *saddr, unsigned len)
+                            const void *daddr,
+                            const void *saddr,
+                            unsigned int len)
 {
        struct ipoib_header *header;