projects
/
cascardo
/
linux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
mlx4_core: Add "native" argument to mlx4_cmd and its callers (where needed)
[cascardo/linux.git]
/
drivers
/
infiniband
/
hw
/
mlx4
/
main.c
diff --git
a/drivers/infiniband/hw/mlx4/main.c
b/drivers/infiniband/hw/mlx4/main.c
index
77f3dbc
..
34f8a5d
100644
(file)
--- a/
drivers/infiniband/hw/mlx4/main.c
+++ b/
drivers/infiniband/hw/mlx4/main.c
@@
-177,7
+177,7
@@
mlx4_ib_port_link_layer(struct ib_device *device, u8 port_num)
{
struct mlx4_dev *dev = to_mdev(device)->dev;
{
struct mlx4_dev *dev = to_mdev(device)->dev;
- return dev->caps.port_mask
& (1 << (port_num - 1))
?
+ return dev->caps.port_mask
[port_num] == MLX4_PORT_TYPE_IB
?
IB_LINK_LAYER_INFINIBAND : IB_LINK_LAYER_ETHERNET;
}
IB_LINK_LAYER_INFINIBAND : IB_LINK_LAYER_ETHERNET;
}
@@
-434,7
+434,7
@@
static int mlx4_ib_modify_device(struct ib_device *ibdev, int mask,
memset(mailbox->buf, 0, 256);
memcpy(mailbox->buf, props->node_desc, 64);
mlx4_cmd(to_mdev(ibdev)->dev, mailbox->dma, 1, 0,
memset(mailbox->buf, 0, 256);
memcpy(mailbox->buf, props->node_desc, 64);
mlx4_cmd(to_mdev(ibdev)->dev, mailbox->dma, 1, 0,
- MLX4_CMD_SET_NODE, MLX4_CMD_TIME_CLASS_A);
+ MLX4_CMD_SET_NODE, MLX4_CMD_TIME_CLASS_A
, MLX4_CMD_WRAPPED
);
mlx4_free_cmd_mailbox(to_mdev(ibdev)->dev, mailbox);
mlx4_free_cmd_mailbox(to_mdev(ibdev)->dev, mailbox);
@@
-463,7
+463,7
@@
static int mlx4_SET_PORT(struct mlx4_ib_dev *dev, u8 port, int reset_qkey_viols,
}
err = mlx4_cmd(dev->dev, mailbox->dma, port, is_eth, MLX4_CMD_SET_PORT,
}
err = mlx4_cmd(dev->dev, mailbox->dma, port, is_eth, MLX4_CMD_SET_PORT,
- MLX4_CMD_TIME_CLASS_B);
+ MLX4_CMD_TIME_CLASS_B
, MLX4_CMD_NATIVE
);
mlx4_free_cmd_mailbox(dev->dev, mailbox);
return err;
mlx4_free_cmd_mailbox(dev->dev, mailbox);
return err;
@@
-899,7
+899,8
@@
static void update_gids_task(struct work_struct *work)
memcpy(gids, gw->gids, sizeof gw->gids);
err = mlx4_cmd(dev, mailbox->dma, MLX4_SET_PORT_GID_TABLE << 8 | gw->port,
memcpy(gids, gw->gids, sizeof gw->gids);
err = mlx4_cmd(dev, mailbox->dma, MLX4_SET_PORT_GID_TABLE << 8 | gw->port,
- 1, MLX4_CMD_SET_PORT, MLX4_CMD_TIME_CLASS_B);
+ 1, MLX4_CMD_SET_PORT, MLX4_CMD_TIME_CLASS_B,
+ MLX4_CMD_NATIVE);
if (err)
printk(KERN_WARNING "set port command failed\n");
else {
if (err)
printk(KERN_WARNING "set port command failed\n");
else {