* [PATCH 0/1] tlan cleanup fix
@ 2011-02-09 20:24 Sakari Ailus
2011-02-09 20:25 ` [PATCH 1/1] tlan: Fix bugs introduced by the last tlan cleanup patch Sakari Ailus
0 siblings, 1 reply; 4+ messages in thread
From: Sakari Ailus @ 2011-02-09 20:24 UTC (permalink / raw)
To: netdev; +Cc: Dan Carpenter
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,
--
Sakari Ailus
sakari.ailus@iki.fi
^ permalink raw reply [flat|nested] 4+ messages in thread
* [PATCH 1/1] tlan: Fix bugs introduced by the last tlan cleanup patch
2011-02-09 20:24 [PATCH 0/1] tlan cleanup fix Sakari Ailus
@ 2011-02-09 20:25 ` Sakari Ailus
2011-02-12 17:17 ` Jan Ceuleers
0 siblings, 1 reply; 4+ messages in thread
From: Sakari Ailus @ 2011-02-09 20:25 UTC (permalink / raw)
To: netdev; +Cc: error27
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(-)
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;
--
1.7.2.3
^ permalink raw reply related [flat|nested] 4+ messages in thread* Re: [PATCH 1/1] tlan: Fix bugs introduced by the last tlan cleanup patch
2011-02-09 20:25 ` [PATCH 1/1] tlan: Fix bugs introduced by the last tlan cleanup patch Sakari Ailus
@ 2011-02-12 17:17 ` Jan Ceuleers
2011-02-13 18:55 ` David Miller
0 siblings, 1 reply; 4+ messages in thread
From: Jan Ceuleers @ 2011-02-12 17:17 UTC (permalink / raw)
To: Sakari Ailus; +Cc: netdev, error27
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
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [PATCH 1/1] tlan: Fix bugs introduced by the last tlan cleanup patch
2011-02-12 17:17 ` Jan Ceuleers
@ 2011-02-13 18:55 ` David Miller
0 siblings, 0 replies; 4+ messages in thread
From: David Miller @ 2011-02-13 18:55 UTC (permalink / raw)
To: jan.ceuleers; +Cc: sakari.ailus, netdev, error27
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.
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2011-02-13 18:54 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2011-02-09 20:24 [PATCH 0/1] tlan cleanup fix Sakari Ailus
2011-02-09 20:25 ` [PATCH 1/1] tlan: Fix bugs introduced by the last tlan cleanup patch Sakari Ailus
2011-02-12 17:17 ` Jan Ceuleers
2011-02-13 18:55 ` David Miller
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).