diff options
author | Chuck Lever <chuck.lever@oracle.com> | 2014-05-28 10:34:16 -0400 |
---|---|---|
committer | Anna Schumaker <Anna.Schumaker@Netapp.com> | 2014-06-04 08:56:48 -0400 |
commit | 5bc4bc729275a0bfc2bfd04466e8ab7c85af2f6e (patch) | |
tree | 3fd8d7a481a2c6e2b9ca1be2c9bda0fa92f1c3b4 /net/sunrpc/xprtrdma | |
parent | ec62f40d3505a643497d105c297093bb90afd44e (diff) |
xprtrdma: Remove Tavor MTU setting
Clean up. Remove HCA-specific clutter in xprtrdma, which is
supposed to be device-independent.
Hal Rosenstock <hal@dev.mellanox.co.il> observes:
> Note that there is OpenSM option (enable_quirks) to return 1K MTU
> in SA PathRecord responses for Tavor so that can be used for this.
> The default setting for enable_quirks is FALSE so that would need
> changing.
Signed-off-by: Chuck Lever <chuck.lever@oracle.com>
Signed-off-by: Anna Schumaker <Anna.Schumaker@Netapp.com>
Diffstat (limited to 'net/sunrpc/xprtrdma')
-rw-r--r-- | net/sunrpc/xprtrdma/verbs.c | 14 |
1 files changed, 0 insertions, 14 deletions
diff --git a/net/sunrpc/xprtrdma/verbs.c b/net/sunrpc/xprtrdma/verbs.c index 54edf2ac48a1..515dfc14b731 100644 --- a/net/sunrpc/xprtrdma/verbs.c +++ b/net/sunrpc/xprtrdma/verbs.c | |||
@@ -48,7 +48,6 @@ | |||
48 | */ | 48 | */ |
49 | 49 | ||
50 | #include <linux/interrupt.h> | 50 | #include <linux/interrupt.h> |
51 | #include <linux/pci.h> /* for Tavor hack below */ | ||
52 | #include <linux/slab.h> | 51 | #include <linux/slab.h> |
53 | #include <asm/bitops.h> | 52 | #include <asm/bitops.h> |
54 | 53 | ||
@@ -920,19 +919,6 @@ retry: | |||
920 | } | 919 | } |
921 | } | 920 | } |
922 | 921 | ||
923 | /* XXX Tavor device performs badly with 2K MTU! */ | ||
924 | if (strnicmp(ia->ri_id->device->dma_device->bus->name, "pci", 3) == 0) { | ||
925 | struct pci_dev *pcid = to_pci_dev(ia->ri_id->device->dma_device); | ||
926 | if (pcid->device == PCI_DEVICE_ID_MELLANOX_TAVOR && | ||
927 | (pcid->vendor == PCI_VENDOR_ID_MELLANOX || | ||
928 | pcid->vendor == PCI_VENDOR_ID_TOPSPIN)) { | ||
929 | struct ib_qp_attr attr = { | ||
930 | .path_mtu = IB_MTU_1024 | ||
931 | }; | ||
932 | rc = ib_modify_qp(ia->ri_id->qp, &attr, IB_QP_PATH_MTU); | ||
933 | } | ||
934 | } | ||
935 | |||
936 | ep->rep_connected = 0; | 922 | ep->rep_connected = 0; |
937 | 923 | ||
938 | rc = rdma_connect(ia->ri_id, &ep->rep_remote_cma); | 924 | rc = rdma_connect(ia->ri_id, &ep->rep_remote_cma); |