Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 205568
b: refs/heads/master
c: ba22a15
h: refs/heads/master
v: v3
  • Loading branch information
Lars Lindley authored and Greg Kroah-Hartman committed Jun 17, 2010
1 parent 032564f commit c2a31c1
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 4 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 80370692f60b4d5dfa243cb0fbd0a87a42a939a8
refs/heads/master: ba22a15ae8018606234b3c2c99e3ae1b922b3f60
8 changes: 5 additions & 3 deletions trunk/drivers/staging/et131x/et1310_phy.c
Original file line number Diff line number Diff line change
Expand Up @@ -760,7 +760,8 @@ void et131x_Mii_check(struct et131x_adapter *etdev,
if (etdev->linkspeed == TRUEPHY_SPEED_10MBPS) {
/* NOTE - Is there a way to query this without
* TruePHY?
* && TRU_QueryCoreType(etdev->hTruePhy, 0) == EMI_TRUEPHY_A13O) {
* && TRU_QueryCoreType(etdev->hTruePhy, 0) ==
* EMI_TRUEPHY_A13O) {
*/
u16 Register18;

Expand All @@ -778,7 +779,7 @@ void et131x_Mii_check(struct et131x_adapter *etdev,
* in the LinkDetectionDPC).
*/
if (!(etdev->Flags & fMP_ADAPTER_LINK_DETECTION) ||
(etdev->MediaState == NETIF_STATUS_MEDIA_DISCONNECT)) {
(etdev->MediaState == NETIF_STATUS_MEDIA_DISCONNECT)) {
spin_lock_irqsave(&etdev->Lock, flags);
etdev->MediaState =
NETIF_STATUS_MEDIA_DISCONNECT;
Expand Down Expand Up @@ -836,7 +837,8 @@ void et131x_Mii_check(struct et131x_adapter *etdev,
/*
* NOTE - Is there a way to query this without
* TruePHY?
* && TRU_QueryCoreType(etdev->hTruePhy, 0)== EMI_TRUEPHY_A13O) {
* && TRU_QueryCoreType(etdev->hTruePhy, 0)==
* EMI_TRUEPHY_A13O) {
*/
u16 Register18;

Expand Down

0 comments on commit c2a31c1

Please sign in to comment.