Merge branch 'kvm-updates/2.6.28' of git://git.kernel.org/pub/scm/linux/kernel/git...

[linux-2.6-omap-h63xx.git] / drivers / infiniband / hw / ipath / ipath_mad.c

diff --git a/drivers/infiniband/hw/ipath/ipath_mad.c b/drivers/infiniband/hw/ipath/ipath_mad.c
index 5f9315d77a437b912622110b70cfdf7beaaf1b6e..be4fc9ada8e7f1e872b740686a74404ae53525fc 100644 (file)
--- a/drivers/infiniband/hw/ipath/ipath_mad.c
+++ b/drivers/infiniband/hw/ipath/ipath_mad.c
@@ -111,9 +111,9 @@ static int recv_subn_get_nodeinfo(struct ib_smp *smp,
        nip->revision = cpu_to_be32((majrev << 16) | minrev);
        nip->local_port_num = port;
        vendor = dd->ipath_vendorid;
-       nip->vendor_id[0] = 0;
-       nip->vendor_id[1] = vendor >> 8;
-       nip->vendor_id[2] = vendor;
+       nip->vendor_id[0] = IPATH_SRC_OUI_1;
+       nip->vendor_id[1] = IPATH_SRC_OUI_2;
+       nip->vendor_id[2] = IPATH_SRC_OUI_3;
 
        return reply(smp);
 }