]> git.proxmox.com Git - mirror_ubuntu-disco-kernel.git/commitdiff
tg3: Refine APE status check
authorMatt Carlson <mcarlson@broadcom.com>
Fri, 15 Aug 2008 21:07:51 +0000 (14:07 -0700)
committerDavid S. Miller <davem@davemloft.net>
Fri, 15 Aug 2008 21:07:51 +0000 (14:07 -0700)
Recently, more status bits have been added to the APE status register.
This patch refines the status register check so that the driver can
send more events than it would have otherwise.

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/tg3.c

index e3fd74b871a3b2ddcfc53c906a3730bb9c983faa..13640f1cab3bdcc73f9e0c6782fa3340ed413d80 100644 (file)
@@ -5495,7 +5495,7 @@ static void tg3_ape_send_event(struct tg3 *tp, u32 event)
                return;
 
        apedata = tg3_ape_read32(tp, TG3_APE_FW_STATUS);
-       if (apedata != APE_FW_STATUS_READY)
+       if (!(apedata & APE_FW_STATUS_READY))
                return;
 
        /* Wait for up to 1 millisecond for APE to service previous event. */