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

login
register
mail settings
Submitter Sakari Ailus
Date Feb. 9, 2011, 8:25 p.m.
Message ID <1297283106-10035-1-git-send-email-sakari.ailus@iki.fi>
Download mbox | patch
Permalink /patch/82528/
State Accepted
Delegated to: David Miller
Headers show

Comments

Sakari Ailus - Feb. 9, 2011, 8:25 p.m.
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 <sakari.ailus@iki.fi>
---
 drivers/net/tlan.c |    6 ++++--
 1 files changed, 4 insertions(+), 2 deletions(-)
Jan Ceuleers - Feb. 12, 2011, 5:17 p.m.
On 09/02/11 21:25, Sakari Ailus wrote:
> 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
--
To unsubscribe from this list: send the line "unsubscribe netdev" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
David Miller - Feb. 13, 2011, 6:55 p.m.
From: Jan Ceuleers <jan.ceuleers@computer.org>
Date: Sat, 12 Feb 2011 18:17:01 +0100

> On 09/02/11 21:25, Sakari Ailus wrote:
>> 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.
--
To unsubscribe from this list: send the line "unsubscribe netdev" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Patch

diff --git a/drivers/net/tlan.c b/drivers/net/tlan.c
index 0678e7e..e48a808 100644
--- a/drivers/net/tlan.c
+++ b/drivers/net/tlan.c
@@ -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;