Skip to contentSkip to conversation

tlan cleanup fix

PATCH In review Sakari Ailus 3 participants 4 messages Feb 9, 2011 – Feb 13, 2011

Subsystems (2)
Networking Network drivers
lore
Share & tools
lore

Sakari Ailus

author
#0 lore raw

cover tlan cleanup fix

Hi,

Dan Carpenter found a problem in my last tlan cleanup patch. In the cleanup, I accidentally considered a bit mask containing multiple bits set as one containing a single bit set. The following patch fixes this issue.

Regards,

Signature · 2 lines
Sakari Ailus
[email protected]
author
#1 lore raw

PATCH 1/1 tlan: Fix bugs introduced by the last tlan cleanup patch

Fix two bugs introduced by the patch "tlan: Code cleanup: checkpatch.pl is relatively happy now." In that patch, 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 <[email protected]>
---
 drivers/net/tlan.c |    6 ++++--
 1 files changed, 4 insertions(+), 2 deletions(-)
drivers/net/tlan.c +4 -2
index 0678e7e..e48a808 100644
@@ -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;
Signature · 1 line
1.7.2.3
#2 lore raw

Re: [PATCH 1/1] tlan: Fix bugs introduced by the last tlan cleanup patch

Quoted 4 lines · Sakari Ailus

Fix two bugs introduced by the patch "tlan: Code cleanup: checkpatch.pl is relatively happy now." In that patch, TLAN_CSTAT_READY was considered as a bit mask containing a single bit set while it was actually had two set instead.

Commit ID of the referenced patch in net-net is c659c38b2796578638548b77ef626d93609ec8ac

maintainer
#3 lore raw

Re: [PATCH 1/1] tlan: Fix bugs introduced by the last tlan cleanup patch

From: Jan Ceuleers <[email protected]>
Date: Sat, 12 Feb 2011 18:17:01 +0100

Quoted 10 lines · Sakari Ailus
Quoted 6 lines

Fix two bugs introduced by the patch "tlan: Code cleanup:
checkpatch.pl is
relatively happy now." In that patch, TLAN_CSTAT_READY was considered as a
bit mask containing a single bit set while it was actually had two set instead.

Commit ID of the referenced patch in net-net is
c659c38b2796578638548b77ef626d93609ec8ac

I add this information to the commit message, applied, thanks.