Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit b1b63970 authored by Kamal Heib's avatar Kamal Heib Committed by Jason Gunthorpe
Browse files

RDMA/ipoib: Fix use of sizeof() 



Make sure to use sizeof(...) instead of sizeof ... which is more
preferred.

Signed-off-by: default avatarKamal Heib <kamalheib1@gmail.com>
Reviewed-by: default avatarLeon Romanovsky <leonro@mellanox.com>
Signed-off-by: default avatarJason Gunthorpe <jgg@mellanox.com>
parent 0578cdad

drivers/infiniband/ulp/ipoib/ipoib_cm.c

+8 −8
Original line number Diff line number Diff line
@@ -363,7 +363,7 @@ static int ipoib_cm_nonsrq_init_rx(struct net_device *dev, struct ib_cm_id *cm_i 
	if (!rx->rx_ring)

		return -ENOMEM;



	t = kmalloc(sizeof *t, GFP_KERNEL);

	t = kmalloc(sizeof(*t), GFP_KERNEL);

	if (!t) {

		ret = -ENOMEM;

		goto err_free_1;
@@ -432,7 +432,7 @@ static int ipoib_cm_send_rep(struct net_device *dev, struct ib_cm_id *cm_id, 
	data.mtu = cpu_to_be32(IPOIB_CM_BUF_SIZE);



	rep.private_data = &data;

	rep.private_data_len = sizeof data;

	rep.private_data_len = sizeof(data);

	rep.flow_control = 0;

	rep.rnr_retry_count = req->rnr_retry_count;

	rep.srq = ipoib_cm_has_srq(dev);
@@ -450,7 +450,7 @@ static int ipoib_cm_req_handler(struct ib_cm_id *cm_id, struct ib_cm_event *even 
	int ret;



	ipoib_dbg(priv, "REQ arrived\n");

	p = kzalloc(sizeof *p, GFP_KERNEL);

	p = kzalloc(sizeof(*p), GFP_KERNEL);

	if (!p)

		return -ENOMEM;

	p->dev = dev;
@@ -658,7 +658,7 @@ void ipoib_cm_handle_rx_wc(struct net_device *dev, struct ib_wc *wc) 
	}



	ipoib_cm_dma_unmap_rx(priv, frags, rx_ring[wr_id].mapping);

	memcpy(rx_ring[wr_id].mapping, mapping, (frags + 1) * sizeof *mapping);

	memcpy(rx_ring[wr_id].mapping, mapping, (frags + 1) * sizeof(*mapping));



	ipoib_dbg_data(priv, "received %d bytes, SLID 0x%04x\n",

		       wc->byte_len, wc->slid);
@@ -1095,7 +1095,7 @@ static int ipoib_cm_send_req(struct net_device *dev, 
	req.qp_num			= qp->qp_num;

	req.qp_type			= qp->qp_type;

	req.private_data		= &data;

	req.private_data_len		= sizeof data;

	req.private_data_len		= sizeof(data);

	req.flow_control		= 0;



	req.starting_psn		= 0; /* FIXME */
@@ -1153,7 +1153,7 @@ static int ipoib_cm_tx_init(struct ipoib_cm_tx *p, u32 qpn, 
		ret = -ENOMEM;

		goto err_tx;

	}

	memset(p->tx_ring, 0, ipoib_sendq_size * sizeof *p->tx_ring);

	memset(p->tx_ring, 0, ipoib_sendq_size * sizeof(*p->tx_ring));



	p->qp = ipoib_cm_create_tx_qp(p->dev, p);

	memalloc_noio_restore(noio_flag);
@@ -1306,7 +1306,7 @@ struct ipoib_cm_tx *ipoib_cm_create_tx(struct net_device *dev, struct ipoib_path 
	struct ipoib_dev_priv *priv = ipoib_priv(dev);

	struct ipoib_cm_tx *tx;



	tx = kzalloc(sizeof *tx, GFP_ATOMIC);

	tx = kzalloc(sizeof(*tx), GFP_ATOMIC);

	if (!tx)

		return NULL;
@@ -1371,7 +1371,7 @@ static void ipoib_cm_tx_start(struct work_struct *work) 
				neigh->daddr + QPN_AND_OPTIONS_OFFSET);

			goto free_neigh;

		}

		memcpy(&pathrec, &p->path->pathrec, sizeof pathrec);

		memcpy(&pathrec, &p->path->pathrec, sizeof(pathrec));



		spin_unlock_irqrestore(&priv->lock, flags);

		netif_tx_unlock_bh(dev);

drivers/infiniband/ulp/ipoib/ipoib_fs.c

+3 −3
Original line number Diff line number Diff line
@@ -262,15 +262,15 @@ static const struct file_operations ipoib_path_fops = { 
void ipoib_create_debug_files(struct net_device *dev)

{

	struct ipoib_dev_priv *priv = ipoib_priv(dev);

	char name[IFNAMSIZ + sizeof "_path"];

	char name[IFNAMSIZ + sizeof("_path")];



	snprintf(name, sizeof name, "%s_mcg", dev->name);

	snprintf(name, sizeof(name), "%s_mcg", dev->name);

	priv->mcg_dentry = debugfs_create_file(name, S_IFREG | S_IRUGO,

					       ipoib_root, dev, &ipoib_mcg_fops);

	if (!priv->mcg_dentry)

		ipoib_warn(priv, "failed to create mcg debug file\n");



	snprintf(name, sizeof name, "%s_path", dev->name);

	snprintf(name, sizeof(name), "%s_path", dev->name);

	priv->path_dentry = debugfs_create_file(name, S_IFREG | S_IRUGO,

						ipoib_root, dev, &ipoib_path_fops);

	if (!priv->path_dentry)

drivers/infiniband/ulp/ipoib/ipoib_ib.c

+2 −2
Original line number Diff line number Diff line
@@ -58,7 +58,7 @@ struct ipoib_ah *ipoib_create_ah(struct net_device *dev, 
	struct ipoib_ah *ah;

	struct ib_ah *vah;



	ah = kmalloc(sizeof *ah, GFP_KERNEL);

	ah = kmalloc(sizeof(*ah), GFP_KERNEL);

	if (!ah)

		return ERR_PTR(-ENOMEM);
@@ -203,7 +203,7 @@ static void ipoib_ib_handle_rx_wc(struct net_device *dev, struct ib_wc *wc) 
	}



	memcpy(mapping, priv->rx_ring[wr_id].mapping,

	       IPOIB_UD_RX_SG * sizeof *mapping);

	       IPOIB_UD_RX_SG * sizeof(*mapping));



	/*

	 * If we can't allocate a new RX buffer, dump

drivers/infiniband/ulp/ipoib/ipoib_main.c

+5 −5
Original line number Diff line number Diff line
@@ -634,7 +634,7 @@ struct ipoib_path_iter *ipoib_path_iter_init(struct net_device *dev) 
{

	struct ipoib_path_iter *iter;



	iter = kmalloc(sizeof *iter, GFP_KERNEL);

	iter = kmalloc(sizeof(*iter), GFP_KERNEL);

	if (!iter)

		return NULL;
@@ -885,7 +885,7 @@ static struct ipoib_path *path_rec_create(struct net_device *dev, void *gid) 
	if (!priv->broadcast)

		return NULL;



	path = kzalloc(sizeof *path, GFP_ATOMIC);

	path = kzalloc(sizeof(*path), GFP_ATOMIC);

	if (!path)

		return NULL;
@@ -1207,7 +1207,7 @@ static int ipoib_hard_header(struct sk_buff *skb, 
{

	struct ipoib_header *header;



	header = skb_push(skb, sizeof *header);

	header = skb_push(skb, sizeof(*header));



	header->proto = htons(type);

	header->reserved = 0;
@@ -1375,7 +1375,7 @@ static struct ipoib_neigh *ipoib_neigh_ctor(u8 *daddr, 
{

	struct ipoib_neigh *neigh;



	neigh = kzalloc(sizeof *neigh, GFP_ATOMIC);

	neigh = kzalloc(sizeof(*neigh), GFP_ATOMIC);

	if (!neigh)

		return NULL;
@@ -2366,7 +2366,7 @@ static void ipoib_add_one(struct ib_device *device) 
	int p;

	int count = 0;



	dev_list = kmalloc(sizeof *dev_list, GFP_KERNEL);

	dev_list = kmalloc(sizeof(*dev_list), GFP_KERNEL);

	if (!dev_list)

		return;

drivers/infiniband/ulp/ipoib/ipoib_multicast.c

+3 −3
Original line number Diff line number Diff line
@@ -140,7 +140,7 @@ static struct ipoib_mcast *ipoib_mcast_alloc(struct net_device *dev, 
{

	struct ipoib_mcast *mcast;



	mcast = kzalloc(sizeof *mcast, can_sleep ? GFP_KERNEL : GFP_ATOMIC);

	mcast = kzalloc(sizeof(*mcast), can_sleep ? GFP_KERNEL : GFP_ATOMIC);

	if (!mcast)

		return NULL;
@@ -917,7 +917,7 @@ void ipoib_mcast_restart_task(struct work_struct *work) 
		if (!ipoib_mcast_addr_is_valid(ha->addr, dev->broadcast))

			continue;



		memcpy(mgid.raw, ha->addr + 4, sizeof mgid);

		memcpy(mgid.raw, ha->addr + 4, sizeof(mgid));



		mcast = __ipoib_mcast_find(dev, &mgid);

		if (!mcast || test_bit(IPOIB_MCAST_FLAG_SENDONLY, &mcast->flags)) {
@@ -997,7 +997,7 @@ struct ipoib_mcast_iter *ipoib_mcast_iter_init(struct net_device *dev) 
{

	struct ipoib_mcast_iter *iter;



	iter = kmalloc(sizeof *iter, GFP_KERNEL);

	iter = kmalloc(sizeof(*iter), GFP_KERNEL);

	if (!iter)

		return NULL;