diff options
| author | Alan Cox <alan@linux.intel.com> | 2009-08-27 11:02:05 +0100 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@suse.de> | 2009-09-15 12:02:28 -0700 |
| commit | f6b35d66cf3284fd76cd3b7dd170630235ce304c (patch) | |
| tree | 096c7ac66118fc9f914e933faffb31a60b5b6b18 /drivers/staging/et131x/et1310_phy.c | |
| parent | 356c74b401f6b05ae5d793e9d1a9ba8297b8e3ff (diff) | |
| download | op-kernel-dev-f6b35d66cf3284fd76cd3b7dd170630235ce304c.zip op-kernel-dev-f6b35d66cf3284fd76cd3b7dd170630235ce304c.tar.gz | |
Staging: et131x: clean up MP_FLAG macros
Signed-off-by: Alan Cox <alan@linux.intel.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'drivers/staging/et131x/et1310_phy.c')
| -rw-r--r-- | drivers/staging/et131x/et1310_phy.c | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/drivers/staging/et131x/et1310_phy.c b/drivers/staging/et131x/et1310_phy.c index 19ffb65..98055e6b 100644 --- a/drivers/staging/et131x/et1310_phy.c +++ b/drivers/staging/et131x/et1310_phy.c @@ -498,7 +498,7 @@ void et131x_Mii_check(struct et131x_adapter *etdev, spin_lock_irqsave(&etdev->Lock, flags); etdev->MediaState = NETIF_STATUS_MEDIA_CONNECT; - MP_CLEAR_FLAG(etdev, fMP_ADAPTER_LINK_DETECTION); + etdev->Flags &= ~fMP_ADAPTER_LINK_DETECTION; spin_unlock_irqrestore(&etdev->Lock, flags); @@ -529,10 +529,8 @@ void et131x_Mii_check(struct et131x_adapter *etdev, * Timer expires, we can report disconnected (handled * in the LinkDetectionDPC). */ - if ((MP_IS_FLAG_CLEAR - (etdev, fMP_ADAPTER_LINK_DETECTION)) - || (etdev->MediaState == - NETIF_STATUS_MEDIA_DISCONNECT)) { + if (!(etdev->Flags & fMP_ADAPTER_LINK_DETECTION) || + (etdev->MediaState == NETIF_STATUS_MEDIA_DISCONNECT)) { spin_lock_irqsave(&etdev->Lock, flags); etdev->MediaState = NETIF_STATUS_MEDIA_DISCONNECT; |
