From 45cdd73acb880a005f11add38b3cc23b7ea06795 Mon Sep 17 00:00:00 2001 From: Mike Marciniszyn Date: Mon, 10 Jan 2011 17:42:19 -0800 Subject: [PATCH] --- yaml --- r: 229259 b: refs/heads/master c: 9d5b243f24212966d6d06058f96b2b1a22482f59 h: refs/heads/master i: 229257: d0511264d579d5e31c55bf0b403cdc8ba3b435f8 229255: 58f8b76c8cfa213b71b4b42ba933557415a75a93 v: v3 --- [refs] | 2 +- trunk/drivers/infiniband/hw/nes/nes_nic.c | 4 ++-- trunk/drivers/infiniband/hw/qib/qib_iba7322.c | 2 -- 3 files changed, 3 insertions(+), 5 deletions(-) diff --git a/[refs] b/[refs] index 9301668874a4..fb39566dd4e7 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 601d87b0795c5affe5b73318c1088edbf10ce72f +refs/heads/master: 9d5b243f24212966d6d06058f96b2b1a22482f59 diff --git a/trunk/drivers/infiniband/hw/nes/nes_nic.c b/trunk/drivers/infiniband/hw/nes/nes_nic.c index 5a4c36484722..3892e2c0e95a 100644 --- a/trunk/drivers/infiniband/hw/nes/nes_nic.c +++ b/trunk/drivers/infiniband/hw/nes/nes_nic.c @@ -908,8 +908,8 @@ static void nes_netdev_set_multicast_list(struct net_device *netdev) nesvnic->nic_index && mc_index < max_pft_entries_avaiable) { nes_debug(NES_DBG_NIC_RX, - "mc_index=%d skipping nic_index=%d, " - "used for=%d \n", mc_index, + "mc_index=%d skipping nic_index=%d,\ + used for=%d \n", mc_index, nesvnic->nic_index, nesadapter->pft_mcast_map[mc_index]); mc_index++; diff --git a/trunk/drivers/infiniband/hw/qib/qib_iba7322.c b/trunk/drivers/infiniband/hw/qib/qib_iba7322.c index 584d443b5335..9031cd82e879 100644 --- a/trunk/drivers/infiniband/hw/qib/qib_iba7322.c +++ b/trunk/drivers/infiniband/hw/qib/qib_iba7322.c @@ -7271,8 +7271,6 @@ static int serdes_7322_init(struct qib_pportdata *ppd) ibsd_wr_allchans(ppd, 20, (4 << 13), BMASK(15, 13)); /* SDR */ data = qib_read_kreg_port(ppd, krp_serdesctrl); - /* Turn off IB latency mode */ - data &= ~SYM_MASK(IBSerdesCtrl_0, IB_LAT_MODE); qib_write_kreg_port(ppd, krp_serdesctrl, data | SYM_MASK(IBSerdesCtrl_0, RXLOSEN));