tlan: Fix bugs introduced by the last tlan cleanup patch (f45437ef) · Commits · 戴 / test

Fix two bugs introduced by the commit ("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

+4 −2

Original line number	Diff line number	Diff line
		@@ -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;

Admin message