tg3: Fix tg3_get_stats64 for 5700 / 5701 devs
authorMatt Carlson <mcarlson@broadcom.com>
Tue, 28 Feb 2012 23:33:37 +0000 (23:33 +0000)
committerDavid S. Miller <davem@davemloft.net>
Wed, 29 Feb 2012 18:46:05 +0000 (13:46 -0500)
commit65ec698d1368fc64d0b93fb703783d25ec550577
tree3823115e31e764ca677d7198873dc4da95b0b69f
parent4c90d3b30334833450ccbb02f452d4972a3c3c3f
tg3: Fix tg3_get_stats64 for 5700 / 5701 devs

tg3_get_stats64() takes tp->lock when dealing with non-serdes bcm5700
and bcm5701 devices.  However, functions that call tg3_halt() have
already acquired tp->lock.  When tg3_get_stats64() is called in
tg3_halt(), deadlock will occur.

This patch fixes the problem by separating the stat gathering code into
a new tg3_get_nstats() function.  tg3_get_stats64() is recoded to call
this function and take tp->lock.  The code that takes tp->lock in
tg3_calc_crc_errors() has been removed.  Function signatures have been
cleaned up too.

Signed-off-by: Matt Carlson <mcarlson@broadcom.com>
Signed-off-by: Michael Chan <mchan@broadcom.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
drivers/net/ethernet/broadcom/tg3.c