Skip to contentSkip to conversation

PowerPC: new EMAC driver typo fix

PATCH Applied Valentine Barshak 4 participants 7 messages Oct 1, 2007 – Oct 3, 2007

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

Valentine Barshak

author
#0 lore raw

This looks like typo. Please, apply this patch to fix.

drivers/net/ibm_newemac/core.c +2 -2
diff -ruNp linux-2.6.orig/drivers/net/ibm_newemac/core.c linux-2.6/drivers/net/ibm_newemac/core.c
@@ -1232,9 +1232,9 @@ static inline int emac_xmit_finish(struc
 	 * instead
 	 */
 	if (emac_has_feature(dev, EMAC_FTR_EMAC4))
-		out_be32(&p->tmr0, EMAC_TMR0_XMIT);
-	else
 		out_be32(&p->tmr0, EMAC4_TMR0_XMIT);
+	else
+		out_be32(&p->tmr0, EMAC_TMR0_XMIT);
 
 	if (unlikely(++dev->tx_cnt == NUM_TX_BUFF)) {
 		netif_stop_queue(ndev);
#1 lore raw
Quoted 7 lines · Valentine Barshak

This looks like typo. Please, apply this patch to fix.

diff -ruNp linux-2.6.orig/drivers/net/ibm_newemac/core.c linux-2.6/drivers/net/ibm_newemac/core.c

drivers/net/ibm_newemac/core.c +0 -0
@@ -1232,9 +1232,9 @@ static inline int emac_xmit_finish(struc
 	 * instead

drivers/net/ibm_newemac/core.c static inline int emac_xmit_finish(struc · line 1240

Quoted 10 lines
drivers/net/ibm_newemac/core.c +2 -2
 	 */
 	if (emac_has_feature(dev, EMAC_FTR_EMAC4))
-		out_be32(&p->tmr0, EMAC_TMR0_XMIT);
-	else
 		out_be32(&p->tmr0, EMAC4_TMR0_XMIT);
+	else
+		out_be32(&p->tmr0, EMAC_TMR0_XMIT);
 
 	if (unlikely(++dev->tx_cnt == NUM_TX_BUFF)) {
 		netif_stop_queue(ndev);

No Signed-off-by: line.

The patch looks sane otherwise. David, Ben, comments?

josh

#2 lore raw
Quoted 16 lines · Josh Boyer
Quoted 15 lines · Valentine Barshak

This looks like typo. Please, apply this patch to fix.

diff -ruNp linux-2.6.orig/drivers/net/ibm_newemac/core.c linux-2.6/drivers/net/ibm_newemac/core.c

drivers/net/ibm_newemac/core.c +2 -2
@@ -1232,9 +1232,9 @@ static inline int emac_xmit_finish(struc
 	 * instead
 	 */
 	if (emac_has_feature(dev, EMAC_FTR_EMAC4))
-		out_be32(&p->tmr0, EMAC_TMR0_XMIT);
-	else
 		out_be32(&p->tmr0, EMAC4_TMR0_XMIT);
+	else
+		out_be32(&p->tmr0, EMAC_TMR0_XMIT);
Quoted 6 lines

drivers/net/ibm_newemac/core.c static inline int emac_xmit_finish(struc · line 1240

Quoted 2 lines
drivers/net/ibm_newemac/core.c +0 -0
 	if (unlikely(++dev->tx_cnt == NUM_TX_BUFF)) {
 		netif_stop_queue(ndev);

No Signed-off-by: line.

The patch looks sane otherwise. David, Ben, comments?

It does definitely look like a genuine typo so Acked by me.

Ben.

author
#3 lore raw

PATCH 1/1 Fix typo in new EMAC driver.

In reply to Josh Boyer

Fix an obvious typo in emac_xmit_finish.

Signed-off-by Valentine Barshak <[email protected]>
---
 drivers/net/ibm_newemac/core.c |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)
drivers/net/ibm_newemac/core.c +2 -2
diff -ruNp linux-2.6.orig/drivers/net/ibm_newemac/core.c linux-2.6/drivers/net/ibm_newemac/core.c
@@ -1232,9 +1232,9 @@ static inline int emac_xmit_finish(struc
 	 * instead
 	 */
 	if (emac_has_feature(dev, EMAC_FTR_EMAC4))
-		out_be32(&p->tmr0, EMAC_TMR0_XMIT);
-	else
 		out_be32(&p->tmr0, EMAC4_TMR0_XMIT);
+	else
+		out_be32(&p->tmr0, EMAC_TMR0_XMIT);
 
 	if (unlikely(++dev->tx_cnt == NUM_TX_BUFF)) {
 		netif_stop_queue(ndev);
#4 lore raw

Re: [PATCH] Fix typo in new EMAC driver.

Quoted 3 lines · On Tue, 2 Oct 2007 16:01:07 +0400 Valentine Barshak <[email protected]>…

Fix an obvious typo in emac_xmit_finish.

Signed-off-by Valentine Barshak <[email protected]>

Looks fine to me. Jeff, do you want to take this through netdev for 2.6.24?

josh

Quoted 23 lines
---
 drivers/net/ibm_newemac/core.c |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff -ruNp linux-2.6.orig/drivers/net/ibm_newemac/core.c linux-2.6/drivers/net/ibm_newemac/core.c

drivers/net/ibm_newemac/core.c +2 -2
@@ -1232,9 +1232,9 @@ static inline int emac_xmit_finish(struc
 	 * instead
 	 */
 	if (emac_has_feature(dev, EMAC_FTR_EMAC4))
-		out_be32(&p->tmr0, EMAC_TMR0_XMIT);
-	else
 		out_be32(&p->tmr0, EMAC4_TMR0_XMIT);
+	else
+		out_be32(&p->tmr0, EMAC_TMR0_XMIT);
 
 	if (unlikely(++dev->tx_cnt == NUM_TX_BUFF)) {
 		netif_stop_queue(ndev);

_______________________________________________
Linuxppc-dev mailing list
[email protected]
https://ozlabs.org/mailman/listinfo/linuxppc-dev

#5 lore raw

Re: [PATCH] Fix typo in new EMAC driver.

Quoted 9 lines · Josh Boyer
Quoted 3 lines · On Tue, 2 Oct 2007 16:01:07 +0400 Valentine Barshak <[email protected]>…

Fix an obvious typo in emac_xmit_finish.

Signed-off-by Valentine Barshak <[email protected]>

Looks fine to me. Jeff, do you want to take this through netdev for 2.6.24?

sure... can you bounce me the patch without quotes?