diff options
| author | Flavio Leitner <fleitner@redhat.com> | 2011-04-05 04:27:43 +0000 |
|---|---|---|
| committer | Jeff Kirsher <jeffrey.t.kirsher@intel.com> | 2011-04-13 19:18:57 -0700 |
| commit | 2084b114e3fb0d84e5882f5ee6c7039be52da715 (patch) | |
| tree | 45ac55b9cd72f72493f5c69c43996c3ea45e7b6a | |
| parent | 86d70e532c352bd309dab5f1d18d113f441cb3ae (diff) | |
| download | kernel_samsung_smdk4412-2084b114e3fb0d84e5882f5ee6c7039be52da715.zip kernel_samsung_smdk4412-2084b114e3fb0d84e5882f5ee6c7039be52da715.tar.gz kernel_samsung_smdk4412-2084b114e3fb0d84e5882f5ee6c7039be52da715.tar.bz2 | |
e1000e: fix stats locking in e1000_watchdog_task
Just move the unlock down a bit because it unlocks too
early leaving a chance for get_stats64() run in parallel
while it is still accessing the stats.
Signed-off-by: Flavio Leitner <fleitner@redhat.com>
Acked-by: Bruce Allan <bruce.w.allan@intel.com>
Tested-by: Aaron Brown <aaron.f.brown@intel.com>
Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
| -rw-r--r-- | drivers/net/e1000e/netdev.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/e1000e/netdev.c b/drivers/net/e1000e/netdev.c index 8812eb2..8a3145e 100644 --- a/drivers/net/e1000e/netdev.c +++ b/drivers/net/e1000e/netdev.c @@ -4339,7 +4339,6 @@ static void e1000_watchdog_task(struct work_struct *work) link_up: spin_lock(&adapter->stats64_lock); e1000e_update_stats(adapter); - spin_unlock(&adapter->stats64_lock); mac->tx_packet_delta = adapter->stats.tpt - adapter->tpt_old; adapter->tpt_old = adapter->stats.tpt; @@ -4350,6 +4349,7 @@ link_up: adapter->gorc_old = adapter->stats.gorc; adapter->gotc = adapter->stats.gotc - adapter->gotc_old; adapter->gotc_old = adapter->stats.gotc; + spin_unlock(&adapter->stats64_lock); e1000e_update_adaptive(&adapter->hw); |