From a97b44244296d727e9a80386d5859e79027003a6 Mon Sep 17 00:00:00 2001 From: Simon Kagstrom Date: Tue, 9 Feb 2010 23:38:07 +0000 Subject: [PATCH] --- yaml --- r: 180587 b: refs/heads/master c: 39c2ff43ea3830ccc693f965abdace96e514b1c5 h: refs/heads/master i: 180585: ba04b34053228db51f33b81087f55bd53fc728b4 180583: f3ede2fc13b8a9c5b476b9a4bb382cebe52594f4 v: v3 --- [refs] | 2 +- trunk/drivers/net/via-velocity.c | 3 +++ 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/[refs] b/[refs] index e6b9f6695651..0ed86e4d99cd 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: d6cade0f7f40834ff3b48f2469d00b1be0ea0db6 +refs/heads/master: 39c2ff43ea3830ccc693f965abdace96e514b1c5 diff --git a/trunk/drivers/net/via-velocity.c b/trunk/drivers/net/via-velocity.c index 133069738ba0..54bafdab1f9d 100644 --- a/trunk/drivers/net/via-velocity.c +++ b/trunk/drivers/net/via-velocity.c @@ -3341,6 +3341,7 @@ static int velocity_set_coalesce(struct net_device *dev, { struct velocity_info *vptr = netdev_priv(dev); int max_us = 0x3f * 64; + unsigned long flags; /* 6 bits of */ if (ecmd->tx_coalesce_usecs > max_us) @@ -3362,6 +3363,7 @@ static int velocity_set_coalesce(struct net_device *dev, ecmd->tx_coalesce_usecs); /* Setup the interrupt suppression and queue timers */ + spin_lock_irqsave(&vptr->lock, flags); mac_disable_int(vptr->mac_regs); setup_adaptive_interrupts(vptr); setup_queue_timers(vptr); @@ -3369,6 +3371,7 @@ static int velocity_set_coalesce(struct net_device *dev, mac_write_int_mask(vptr->int_mask, vptr->mac_regs); mac_clear_isr(vptr->mac_regs); mac_enable_int(vptr->mac_regs); + spin_unlock_irqrestore(&vptr->lock, flags); return 0; }