diff options
Diffstat (limited to 'src/drivers')
| -rw-r--r-- | src/drivers/infiniband/linda.c | 4 | ||||
| -rw-r--r-- | src/drivers/infiniband/qib7322.c | 2 |
2 files changed, 5 insertions, 1 deletions
diff --git a/src/drivers/infiniband/linda.c b/src/drivers/infiniband/linda.c index 12a09a047..f3987d6ee 100644 --- a/src/drivers/infiniband/linda.c +++ b/src/drivers/infiniband/linda.c @@ -2364,8 +2364,10 @@ static int linda_probe ( struct pci_device *pci, goto err_init_i2c; /* Read EEPROM parameters */ - if ( ( rc = linda_read_eeprom ( linda, &ibdev->gid.s.guid ) ) != 0 ) + if ( ( rc = linda_read_eeprom ( linda, &ibdev->node_guid ) ) != 0 ) goto err_read_eeprom; + memcpy ( &ibdev->gid.s.guid, &ibdev->node_guid, + sizeof ( ibdev->gid.s.guid ) ); /* Initialise send datapath */ if ( ( rc = linda_init_send ( linda ) ) != 0 ) diff --git a/src/drivers/infiniband/qib7322.c b/src/drivers/infiniband/qib7322.c index b1902cfa9..e8c63a1f4 100644 --- a/src/drivers/infiniband/qib7322.c +++ b/src/drivers/infiniband/qib7322.c @@ -2357,6 +2357,8 @@ static int qib7322_probe ( struct pci_device *pci, IB_LINK_WIDTH_4X; /* 1x does not work */ ibdev->link_speed_enabled = ibdev->link_speed_supported = IB_LINK_SPEED_SDR; /* to avoid need for link tuning */ + memcpy ( &ibdev->node_guid, &qib7322->guid, + sizeof ( ibdev->node_guid ) ); memcpy ( &ibdev->gid.s.guid, &qib7322->guid, sizeof ( ibdev->gid.s.guid ) ); assert ( ( ibdev->gid.s.guid.bytes[7] & i ) == 0 ); |