mirror of
https://github.com/xen-project/xen.git
synced 2026-10-29 18:50:05 +01:00
bitkeeper revision 1.146 (3e761a8bG8D0sHIrqHKpkx1hSuhB1A)
tg3.c: Fix for new tg3 driver.
This commit is contained in:
kaf24@scramble.cl.cam.ac.uk committed
1 parent
909c78b153
commit
05cae6a7f6
1 file changed
+5
-2
@@ -2075,10 +2075,11 @@ static int tg3_poll(struct net_device *netdev, int *budget)
|
||||
{
|
||||
struct tg3 *tp = netdev->priv;
|
||||
struct tg3_hw_status *sblk = tp->hw_status;
|
||||
unsigned long flags;
|
||||
int done;
|
||||
|
||||
#ifdef NAPI
|
||||
unsigned long flags;
|
||||
spin_lock_irqsave(&tp->lock, flags);
|
||||
#endif
|
||||
|
||||
/* handle link change and other phy events */
|
||||
if (!(tp->tg3_flags &
|
||||
@@ -2098,7 +2099,9 @@ static int tg3_poll(struct net_device *netdev, int *budget)
|
||||
spin_unlock(&tp->tx_lock);
|
||||
}
|
||||
|
||||
#ifdef NAPI
|
||||
spin_unlock_irqrestore(&tp->lock, flags);
|
||||
#endif
|
||||
|
||||
/* run RX thread, within the bounds set by NAPI.
|
||||
* All RX "locking" is done by ensuring outside
|
||||
|
||||