Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
tjh.dev
kernel
os
linux
Merge branch 'for-linus' of master.kernel.org:/pub/scm/linux/kernel/git/roland/infiniband
+21
-24
drivers/infiniband/hw/mthca/mthca_main.c
+21
-24
drivers/infiniband/hw/mthca/mthca_main.c
···
503
503
return err;
504
504
}
505
505
506
+
static void mthca_free_icms(struct mthca_dev *mdev)
507
+
{
508
+
u8 status;
509
+
510
+
mthca_free_icm_table(mdev, mdev->mcg_table.table);
511
+
if (mdev->mthca_flags & MTHCA_FLAG_SRQ)
512
+
mthca_free_icm_table(mdev, mdev->srq_table.table);
513
+
mthca_free_icm_table(mdev, mdev->cq_table.table);
514
+
mthca_free_icm_table(mdev, mdev->qp_table.rdb_table);
515
+
mthca_free_icm_table(mdev, mdev->qp_table.eqp_table);
516
+
mthca_free_icm_table(mdev, mdev->qp_table.qp_table);
517
+
mthca_free_icm_table(mdev, mdev->mr_table.mpt_table);
518
+
mthca_free_icm_table(mdev, mdev->mr_table.mtt_table);
519
+
mthca_unmap_eq_icm(mdev);
520
+
521
+
mthca_UNMAP_ICM_AUX(mdev, &status);
522
+
mthca_free_icm(mdev, mdev->fw.arbel.aux_icm);
523
+
}
524
+
506
525
static int __devinit mthca_init_arbel(struct mthca_dev *mdev)
507
526
{
508
527
struct mthca_dev_lim dev_lim;
···
599
580
return 0;
600
581
601
582
err_free_icm:
602
-
if (mdev->mthca_flags & MTHCA_FLAG_SRQ)
603
-
mthca_free_icm_table(mdev, mdev->srq_table.table);
604
-
mthca_free_icm_table(mdev, mdev->cq_table.table);
605
-
mthca_free_icm_table(mdev, mdev->qp_table.rdb_table);
606
-
mthca_free_icm_table(mdev, mdev->qp_table.eqp_table);
607
-
mthca_free_icm_table(mdev, mdev->qp_table.qp_table);
608
-
mthca_free_icm_table(mdev, mdev->mr_table.mpt_table);
609
-
mthca_free_icm_table(mdev, mdev->mr_table.mtt_table);
610
-
mthca_unmap_eq_icm(mdev);
611
-
612
-
mthca_UNMAP_ICM_AUX(mdev, &status);
613
-
mthca_free_icm(mdev, mdev->fw.arbel.aux_icm);
583
+
mthca_free_icms(mdev);
614
584
615
585
err_stop_fw:
616
586
mthca_UNMAP_FA(mdev, &status);
···
619
611
mthca_CLOSE_HCA(mdev, 0, &status);
620
612
621
613
if (mthca_is_memfree(mdev)) {
622
-
if (mdev->mthca_flags & MTHCA_FLAG_SRQ)
623
-
mthca_free_icm_table(mdev, mdev->srq_table.table);
624
-
mthca_free_icm_table(mdev, mdev->cq_table.table);
625
-
mthca_free_icm_table(mdev, mdev->qp_table.rdb_table);
626
-
mthca_free_icm_table(mdev, mdev->qp_table.eqp_table);
627
-
mthca_free_icm_table(mdev, mdev->qp_table.qp_table);
628
-
mthca_free_icm_table(mdev, mdev->mr_table.mpt_table);
629
-
mthca_free_icm_table(mdev, mdev->mr_table.mtt_table);
630
-
mthca_unmap_eq_icm(mdev);
631
-
632
-
mthca_UNMAP_ICM_AUX(mdev, &status);
633
-
mthca_free_icm(mdev, mdev->fw.arbel.aux_icm);
614
+
mthca_free_icms(mdev);
634
615
635
616
mthca_UNMAP_FA(mdev, &status);
636
617
mthca_free_icm(mdev, mdev->fw.arbel.fw_icm);
+2
-2
drivers/infiniband/ulp/ipoib/ipoib_main.c
+2
-2
drivers/infiniband/ulp/ipoib/ipoib_main.c
···
474
474
spin_unlock(&priv->lock);
475
475
}
476
476
477
-
static void path_lookup(struct sk_buff *skb, struct net_device *dev)
477
+
static void ipoib_path_lookup(struct sk_buff *skb, struct net_device *dev)
478
478
{
479
479
struct ipoib_dev_priv *priv = netdev_priv(skb->dev);
480
480
···
569
569
570
570
if (skb->dst && skb->dst->neighbour) {
571
571
if (unlikely(!*to_ipoib_neigh(skb->dst->neighbour))) {
572
-
path_lookup(skb, dev);
572
+
ipoib_path_lookup(skb, dev);
573
573
goto out;
574
574
}
575
575