Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 322443
b: refs/heads/master
c: 14a15d6
h: refs/heads/master
i:
  322441: 109fd48
  322439: 8bff252
v: v3
  • Loading branch information
Merav Sicron authored and David S. Miller committed Aug 30, 2012
1 parent 741f7de commit 59f9d12
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 4 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 26614ba5445fe31a69068a5e94266fa08b4ee345
refs/heads/master: 14a15d618743ebc4936fe03073bf0c75024d3a07
8 changes: 5 additions & 3 deletions trunk/drivers/net/ethernet/broadcom/bnx2x/bnx2x_main.c
Original file line number Diff line number Diff line change
Expand Up @@ -11231,10 +11231,12 @@ static int bnx2x_ioctl(struct net_device *dev, struct ifreq *ifr, int cmd)
static void poll_bnx2x(struct net_device *dev)
{
struct bnx2x *bp = netdev_priv(dev);
int i;

disable_irq(bp->pdev->irq);
bnx2x_interrupt(bp->pdev->irq, dev);
enable_irq(bp->pdev->irq);
for_each_eth_queue(bp, i) {
struct bnx2x_fastpath *fp = &bp->fp[i];
napi_schedule(&bnx2x_fp(bp, fp->index, napi));
}
}
#endif

Expand Down

0 comments on commit 59f9d12

Please sign in to comment.