From a7fd9765eb53f324bba757dc746821a1c6c1de3a Mon Sep 17 00:00:00 2001 From: Dave Olson Date: Wed, 16 Apr 2008 21:09:29 -0700 Subject: [PATCH] --- yaml --- r: 88525 b: refs/heads/master c: 0ab6b2b9abb692919902edb6606c3b898f2dac17 h: refs/heads/master i: 88523: 9533dd256ac8ab85b984e3af43d0ae2881fb86a2 v: v3 --- [refs] | 2 +- trunk/drivers/infiniband/hw/ipath/ipath_driver.c | 9 +++++++-- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 8aac84d76364..512a7cc2a283 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: b3e8f541072ec688738abf8de4ef158127a6b5f2 +refs/heads/master: 0ab6b2b9abb692919902edb6606c3b898f2dac17 diff --git a/trunk/drivers/infiniband/hw/ipath/ipath_driver.c b/trunk/drivers/infiniband/hw/ipath/ipath_driver.c index 5e1dcb3dbc57..1245180f210c 100644 --- a/trunk/drivers/infiniband/hw/ipath/ipath_driver.c +++ b/trunk/drivers/infiniband/hw/ipath/ipath_driver.c @@ -2006,11 +2006,16 @@ int ipath_set_mtu(struct ipath_devdata *dd, u16 arg) return ret; } -int ipath_set_lid(struct ipath_devdata *dd, u32 arg, u8 lmc) +int ipath_set_lid(struct ipath_devdata *dd, u32 lid, u8 lmc) { - dd->ipath_lid = arg; + dd->ipath_lid = lid; dd->ipath_lmc = lmc; + dd->ipath_f_set_ib_cfg(dd, IPATH_IB_CFG_LIDLMC, lid | + (~((1U << lmc) - 1)) << 16); + + dev_info(&dd->pcidev->dev, "We got a lid: 0x%x\n", lid); + return 0; }