From 99bdecb0432219333cf90324a708b329a1e76b90 Mon Sep 17 00:00:00 2001 From: Ingo Molnar Date: Wed, 23 Jul 2008 15:30:52 -0700 Subject: [PATCH] --- yaml --- r: 105577 b: refs/heads/master c: e8ebe3b893792887317bc24cc4608753f81b81d3 h: refs/heads/master i: 105575: 3621e3650fdb853499391ff76179d6eb2994c3e8 v: v3 --- [refs] | 2 +- trunk/drivers/net/e1000e/netdev.c | 2 -- 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/[refs] b/[refs] index ed3f3a17b65a..8b2968e98f89 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: b4942af65028c5eb516fdd9053020ccb2ee186ce +refs/heads/master: e8ebe3b893792887317bc24cc4608753f81b81d3 diff --git a/trunk/drivers/net/e1000e/netdev.c b/trunk/drivers/net/e1000e/netdev.c index 869544b8c05c..9c0f56b3c518 100644 --- a/trunk/drivers/net/e1000e/netdev.c +++ b/trunk/drivers/net/e1000e/netdev.c @@ -4067,8 +4067,6 @@ static void e1000_netpoll(struct net_device *netdev) disable_irq(adapter->pdev->irq); e1000_intr(adapter->pdev->irq, netdev); - e1000_clean_tx_irq(adapter); - enable_irq(adapter->pdev->irq); } #endif