| commit | 8151ad576d34a5ec1f1068edf25f3b7c47f6edab | [log] [tgz] |
|---|---|---|
| author | Michael Chan <mchan@broadcom.com> | Sun Jul 29 19:15:41 2012 +0000 |
| committer | David S. Miller <davem@davemloft.net> | Sun Jul 29 23:18:31 2012 -0700 |
| tree | d751e4c95cac884b28374cb94db397581ff33a64 | |
| parent | 8253947e2cdfb14717c9212b751b7aec9ea9ef5e [diff] [blame] |
tg3: Request APE_LOCK_PHY before PHY access to prevent PHY access conflict with APE firmware. Signed-off-by: Michael Chan <mchan@broadcom.com> Signed-off-by: David S. Miller <davem@davemloft.net>
diff --git a/drivers/net/ethernet/broadcom/tg3.h b/drivers/net/ethernet/broadcom/tg3.h index a1b75cd..6fb45a5 100644 --- a/drivers/net/ethernet/broadcom/tg3.h +++ b/drivers/net/ethernet/broadcom/tg3.h
@@ -3107,6 +3107,7 @@ int old_link; u8 phy_addr; + u8 phy_ape_lock; /* PHY info */ u32 phy_id;