From bee3717b6658393877e4a1bd10e6384b73f0d343 Mon Sep 17 00:00:00 2001 From: Matt Carlson Date: Tue, 25 Jan 2011 15:58:50 +0000 Subject: [PATCH] --- yaml --- r: 236697 b: refs/heads/master c: 0583d52114b19ea06d03dd2cf762a7737c265400 h: refs/heads/master i: 236695: f53d9207a133ad9298a910fe3a9d0d30a4d5355f v: v3 --- [refs] | 2 +- trunk/drivers/net/tg3.c | 6 ++++-- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index a42d198be82e..030cb4fe632d 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: bf933c802763b2beb1a1d4977f00af1a78c4fb70 +refs/heads/master: 0583d52114b19ea06d03dd2cf762a7737c265400 diff --git a/trunk/drivers/net/tg3.c b/trunk/drivers/net/tg3.c index d4b29f424085..b2a16b4e3caf 100644 --- a/trunk/drivers/net/tg3.c +++ b/trunk/drivers/net/tg3.c @@ -8322,7 +8322,8 @@ static int tg3_reset_hw(struct tg3 *tp, int reset_phy) tw32_f(GRC_LOCAL_CTRL, tp->grc_local_ctrl); udelay(100); - if (tp->tg3_flags2 & TG3_FLG2_USING_MSIX) { + if ((tp->tg3_flags2 & TG3_FLG2_USING_MSIX) && + tp->irq_cnt > 1) { val = tr32(MSGINT_MODE); val |= MSGINT_MODE_MULTIVEC_EN | MSGINT_MODE_ENABLE; tw32(MSGINT_MODE, val); @@ -9062,7 +9063,8 @@ static void tg3_ints_init(struct tg3 *tp) if (tp->tg3_flags2 & TG3_FLG2_USING_MSI_OR_MSIX) { u32 msi_mode = tr32(MSGINT_MODE); - if (tp->tg3_flags2 & TG3_FLG2_USING_MSIX) + if ((tp->tg3_flags2 & TG3_FLG2_USING_MSIX) && + tp->irq_cnt > 1) msi_mode |= MSGINT_MODE_MULTIVEC_EN; tw32(MSGINT_MODE, msi_mode | MSGINT_MODE_ENABLE); }