From b9e11ec337872917d56d757b98e2a53a323f6c3f Mon Sep 17 00:00:00 2001 From: Matt Carlson Date: Mon, 2 Aug 2010 11:25:56 +0000 Subject: [PATCH] --- yaml --- r: 203991 b: refs/heads/master c: 774ee7525ff94e597844c9f7f6a48938906df698 h: refs/heads/master i: 203989: 72784dfcd7fee6bdc4146c899a6ee3d7064439f4 203987: 27dd165e348c53242790e77130f671e3ed24453b 203983: f16171d544022c7db7c66937ac71b9793b5271b3 v: v3 --- [refs] | 2 +- trunk/drivers/net/tg3.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 9cb14178afcd..de6183cef9fb 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 6de34cb963a934953fdd365937b4b75959256602 +refs/heads/master: 774ee7525ff94e597844c9f7f6a48938906df698 diff --git a/trunk/drivers/net/tg3.c b/trunk/drivers/net/tg3.c index 98ca0d20d206..12a2dd77c367 100644 --- a/trunk/drivers/net/tg3.c +++ b/trunk/drivers/net/tg3.c @@ -8864,7 +8864,7 @@ static void tg3_ints_fini(struct tg3 *tp) else if (tp->tg3_flags2 & TG3_FLG2_USING_MSI) pci_disable_msi(tp->pdev); tp->tg3_flags2 &= ~TG3_FLG2_USING_MSI_OR_MSIX; - tp->tg3_flags3 &= ~TG3_FLG3_ENABLE_RSS; + tp->tg3_flags3 &= ~(TG3_FLG3_ENABLE_RSS | TG3_FLG3_ENABLE_TSS); } static int tg3_open(struct net_device *dev)