aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/infiniband/hw/nes
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2011-07-22 17:50:12 -0400
committerLinus Torvalds <torvalds@linux-foundation.org>2011-07-22 17:50:12 -0400
commitece236ce2fad9c27a6fd2530f899289025194bce (patch)
tree474b793205872206a2a3f7d409ff9b1f81f3a9a8 /drivers/infiniband/hw/nes
parent441c196e84b11aad3123baa9320eee7abc6b5c98 (diff)
parent4460207561290c3be7e6c7538f22690028170c1d (diff)
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/roland/infiniband
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/roland/infiniband: (26 commits) IB/qib: Defer HCA error events to tasklet mlx4_core: Bump the driver version to 1.0 RDMA/cxgb4: Use printk_ratelimited() instead of printk_ratelimit() IB/mlx4: Support PMA counters for IBoE IB/mlx4: Use flow counters on IBoE ports IB/pma: Add include file for IBA performance counters definitions mlx4_core: Add network flow counters mlx4_core: Fix location of counter index in QP context struct mlx4_core: Read extended capabilities into the flags field mlx4_core: Extend capability flags to 64 bits IB/mlx4: Generate GID change events in IBoE code IB/core: Add GID change event RDMA/cma: Don't allow IPoIB port space for IBoE RDMA: Allow for NULL .modify_device() and .modify_port() methods IB/qib: Update active link width IB/qib: Fix potential deadlock with link down interrupt IB/qib: Add sysfs interface to read free contexts IB/mthca: Remove unnecessary read of PCI_CAP_ID_EXP IB/qib: Remove double define IB/qib: Remove unnecessary read of PCI_CAP_ID_EXP ...
Diffstat (limited to 'drivers/infiniband/hw/nes')
-rw-r--r--drivers/infiniband/hw/nes/nes_verbs.c11
1 files changed, 0 insertions, 11 deletions
diff --git a/drivers/infiniband/hw/nes/nes_verbs.c b/drivers/infiniband/hw/nes/nes_verbs.c
index 95ca93ceedac..9f2f7d4b1197 100644
--- a/drivers/infiniband/hw/nes/nes_verbs.c
+++ b/drivers/infiniband/hw/nes/nes_verbs.c
@@ -605,16 +605,6 @@ static int nes_query_port(struct ib_device *ibdev, u8 port, struct ib_port_attr
605 605
606 606
607/** 607/**
608 * nes_modify_port
609 */
610static int nes_modify_port(struct ib_device *ibdev, u8 port,
611 int port_modify_mask, struct ib_port_modify *props)
612{
613 return 0;
614}
615
616
617/**
618 * nes_query_pkey 608 * nes_query_pkey
619 */ 609 */
620static int nes_query_pkey(struct ib_device *ibdev, u8 port, u16 index, u16 *pkey) 610static int nes_query_pkey(struct ib_device *ibdev, u8 port, u16 index, u16 *pkey)
@@ -3882,7 +3872,6 @@ struct nes_ib_device *nes_init_ofa_device(struct net_device *netdev)
3882 nesibdev->ibdev.dev.parent = &nesdev->pcidev->dev; 3872 nesibdev->ibdev.dev.parent = &nesdev->pcidev->dev;
3883 nesibdev->ibdev.query_device = nes_query_device; 3873 nesibdev->ibdev.query_device = nes_query_device;
3884 nesibdev->ibdev.query_port = nes_query_port; 3874 nesibdev->ibdev.query_port = nes_query_port;
3885 nesibdev->ibdev.modify_port = nes_modify_port;
3886 nesibdev->ibdev.query_pkey = nes_query_pkey; 3875 nesibdev->ibdev.query_pkey = nes_query_pkey;
3887 nesibdev->ibdev.query_gid = nes_query_gid; 3876 nesibdev->ibdev.query_gid = nes_query_gid;
3888 nesibdev->ibdev.alloc_ucontext = nes_alloc_ucontext; 3877 nesibdev->ibdev.alloc_ucontext = nes_alloc_ucontext;