tlan: Fix bugs introduced by the last tlan cleanup patch
authorSakari Ailus <sakari.ailus@iki.fi>
Wed, 9 Feb 2011 10:25:06 +0000 (10:25 +0000)
committerDavid S. Miller <davem@davemloft.net>
Sun, 13 Feb 2011 19:06:13 +0000 (11:06 -0800)
Fix two bugs introduced by the commit
c659c38b2796578638548b77ef626d93609ec8ac ("tlan: Code cleanup:
checkpatch.pl is relatively happy now.") In that change,
TLAN_CSTAT_READY was considered as a bit mask containing a single bit
set while it was actually had two set instead.

Many thanks to Dan Carpenter for finding the mistake.

Signed-off-by: Sakari Ailus <sakari.ailus@iki.fi>
Signed-off-by: David S. Miller <davem@davemloft.net>
drivers/net/tlan.c

index 0678e7e71f190cfd258bc6fc425149537d555508..e48a808853432e5860d0f8fe27139704349dd279 100644 (file)
@@ -1522,7 +1522,8 @@ static u32 tlan_handle_tx_eof(struct net_device *dev, u16 host_int)
                head_list = priv->tx_list + priv->tx_head;
                head_list_phys = priv->tx_list_dma
                        + sizeof(struct tlan_list)*priv->tx_head;
-               if (head_list->c_stat & TLAN_CSTAT_READY) {
+               if ((head_list->c_stat & TLAN_CSTAT_READY)
+                   == TLAN_CSTAT_READY) {
                        outl(head_list_phys, dev->base_addr + TLAN_CH_PARM);
                        ack |= TLAN_HC_GO;
                } else {
@@ -1766,7 +1767,8 @@ static u32 tlan_handle_tx_eoc(struct net_device *dev, u16 host_int)
                head_list = priv->tx_list + priv->tx_head;
                head_list_phys = priv->tx_list_dma
                        + sizeof(struct tlan_list)*priv->tx_head;
-               if (head_list->c_stat & TLAN_CSTAT_READY) {
+               if ((head_list->c_stat & TLAN_CSTAT_READY)
+                   == TLAN_CSTAT_READY) {
                        netif_stop_queue(dev);
                        outl(head_list_phys, dev->base_addr + TLAN_CH_PARM);
                        ack |= TLAN_HC_GO;