diff options
| author | David S. Miller <davem@davemloft.net> | 2013-03-20 12:46:26 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2013-03-20 12:46:26 -0400 |
| commit | 61816596d1c9026d0ecb20c44f90452c41596ffe (patch) | |
| tree | 3027ed6dc62f71e14b9d525405747fa0eb8f074d /drivers/infiniband/hw/mlx4/cm.c | |
| parent | 23a9072e3af0d9538e25837fb2b56bb94e4a8e67 (diff) | |
| parent | da2191e31409d1058dcbed44e8f53e39a40e86b3 (diff) | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
Pull in the 'net' tree to get Daniel Borkmann's flow dissector
infrastructure change.
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/infiniband/hw/mlx4/cm.c')
| -rw-r--r-- | drivers/infiniband/hw/mlx4/cm.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/drivers/infiniband/hw/mlx4/cm.c b/drivers/infiniband/hw/mlx4/cm.c index e0d79b2395e4..add98d01476c 100644 --- a/drivers/infiniband/hw/mlx4/cm.c +++ b/drivers/infiniband/hw/mlx4/cm.c | |||
| @@ -362,7 +362,6 @@ void mlx4_ib_cm_paravirt_init(struct mlx4_ib_dev *dev) | |||
| 362 | INIT_LIST_HEAD(&dev->sriov.cm_list); | 362 | INIT_LIST_HEAD(&dev->sriov.cm_list); |
| 363 | dev->sriov.sl_id_map = RB_ROOT; | 363 | dev->sriov.sl_id_map = RB_ROOT; |
| 364 | idr_init(&dev->sriov.pv_id_table); | 364 | idr_init(&dev->sriov.pv_id_table); |
| 365 | idr_pre_get(&dev->sriov.pv_id_table, GFP_KERNEL); | ||
| 366 | } | 365 | } |
| 367 | 366 | ||
| 368 | /* slave = -1 ==> all slaves */ | 367 | /* slave = -1 ==> all slaves */ |