diff options
| author | Michael Chan <mchan@broadcom.com> | 2006-01-17 02:40:55 -0800 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2006-01-17 02:40:55 -0800 |
| commit | ec41c7dfd525468decb9da9281dbc9ed82d98c98 (patch) | |
| tree | 02ac7f0b1318c69d53a2405972f8a6880dc8b7c6 /drivers/net/tg3.h | |
| parent | f0daaa654af68c1651add9d21188d81c19672551 (diff) | |
| download | linux-3.10-ec41c7dfd525468decb9da9281dbc9ed82d98c98.tar.gz linux-3.10-ec41c7dfd525468decb9da9281dbc9ed82d98c98.tar.bz2 linux-3.10-ec41c7dfd525468decb9da9281dbc9ed82d98c98.zip | |
[TG3]: Refine nvram locking
Add nvram lock count so that calls to tg3_nvram_lock()/unlock() can
be nested. Add error checking to all callers of tg3_nvram_lock()
where appropriate. To prevent nvram lock failures after halting the
firmware, it is also necessary to release firmware's nvram lock in
tg3_halt_cpu().
Update version to 3.48.
Based on David Miller's initial patch.
Signed-off-by: Michael Chan <mchan@broadcom.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/tg3.h')
| -rw-r--r-- | drivers/net/tg3.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/net/tg3.h b/drivers/net/tg3.h index 890e1635996..e8243305f0e 100644 --- a/drivers/net/tg3.h +++ b/drivers/net/tg3.h @@ -2275,6 +2275,7 @@ struct tg3 { dma_addr_t stats_mapping; struct work_struct reset_task; + int nvram_lock_cnt; u32 nvram_size; u32 nvram_pagesize; u32 nvram_jedecnum; |