please pull infiniband.git
Subsystems (2)
Linus, please pull from
master.kernel.org:/pub/scm/linux/kernel/git/roland/infiniband.git for-linus
This tree is also available from kernel.org mirrors at:
git://git.kernel.org/pub/scm/linux/kernel/git/roland/infiniband.git for-linus
This will get a fix for a crash in IPoIB and new device IDs for mlx4:
Jack Morgenstein (1):
mlx4_core: Add new Mellanox device IDs
Ralph Campbell (1):
IPoIB/cm: Partial error clean up unmaps wrong address
drivers/infiniband/ulp/ipoib/ipoib_cm.c | 4 ++-- drivers/net/mlx4/main.c | 2 ++ 2 files changed, 4 insertions(+), 2 deletions(-)
drivers/infiniband/ulp/ipoib/ipoib_cm.c +2 -2
@@ -148,8 +148,8 @@ partial_error:ib_dma_unmap_single (priv->ca, mapping[0 ],IPOIB_CM_HEAD_SIZE ,DMA_FROM_DEVICE ); -for (; i >=0 ; --i) -ib_dma_unmap_single (priv->ca, mapping[i +1 ],PAGE_SIZE ,DMA_FROM_DEVICE ); +for (; i >0 ; --i) +ib_dma_unmap_single (priv->ca, mapping[i],PAGE_SIZE ,DMA_FROM_DEVICE );dev_kfree_skb_any (skb);return NULL ;
drivers/net/mlx4/main.c +2 -0
@@ -911,6 +911,8 @@ static struct pci_device_id mlx4_pci_table[] = { { PCI_VDEVICE(MELLANOX, 0x6340) }, /* MT25408 "Hermon" SDR */ { PCI_VDEVICE(MELLANOX, 0x634a) }, /* MT25408 "Hermon" DDR */ { PCI_VDEVICE(MELLANOX, 0x6354) }, /* MT25408 "Hermon" QDR */ + { PCI_VDEVICE(MELLANOX, 0x6732) }, /* MT25408 "Hermon" DDR PCIe gen2 */ + { PCI_VDEVICE(MELLANOX, 0x673c) }, /* MT25408 "Hermon" QDR PCIe gen2 */ { 0, } };