From a4c3a485c61332a0a91828061fb7fde31a2a92a0 Mon Sep 17 00:00:00 2001 From: Nithin Nayak Sujir Date: Mon, 14 Jan 2013 17:10:59 +0000 Subject: [PATCH] --- yaml --- r: 349193 b: refs/heads/master c: 9c13cb8bb477a83b9a3c9e5a5478a4e21294a760 h: refs/heads/master i: 349191: 18e05a22cc8772fab7ab7b0bdd38c68ab3fa618d v: v3 --- [refs] | 2 +- trunk/drivers/net/ethernet/broadcom/tg3.c | 4 ++++ 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/[refs] b/[refs] index e3fc7b6b52f2..c8c3d6792279 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 47fb3a26e2f07a734876915bedc1053021fec860 +refs/heads/master: 9c13cb8bb477a83b9a3c9e5a5478a4e21294a760 diff --git a/trunk/drivers/net/ethernet/broadcom/tg3.c b/trunk/drivers/net/ethernet/broadcom/tg3.c index 78ea90c40e19..d326d9219aa8 100644 --- a/trunk/drivers/net/ethernet/broadcom/tg3.c +++ b/trunk/drivers/net/ethernet/broadcom/tg3.c @@ -6950,6 +6950,9 @@ static void tg3_poll_controller(struct net_device *dev) int i; struct tg3 *tp = netdev_priv(dev); + if (tg3_irq_sync(tp)) + return; + for (i = 0; i < tp->irq_cnt; i++) tg3_interrupt(tp->napi[i].irq_vec, &tp->napi[i]); } @@ -16367,6 +16370,7 @@ static int tg3_init_one(struct pci_dev *pdev, tp->pm_cap = pm_cap; tp->rx_mode = TG3_DEF_RX_MODE; tp->tx_mode = TG3_DEF_TX_MODE; + tp->irq_sync = 1; if (tg3_debug > 0) tp->msg_enable = tg3_debug;