Skip to contentSkip to conversation

bnx2: Fix bnx2_netif_stop() merge error.

PATCH In review Michael Chan 2 participants 2 messages Dec 20, 2009 – Dec 21, 2009

Subsystems (2)
lore
Share & tools
lore
#0 lore raw

PATCH 1/1 bnx2: Fix bnx2_netif_stop() merge error.

The error was introduced while merging:

commit 4529819c45161e4a119134f56ef504e69420bc98
bnx2: reset_task is crashing the kernel. Fixing it.

---
 drivers/net/bnx2.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)
drivers/net/bnx2.c +1 -1
index f38764e..65df1de 100644
@@ -666,6 +666,7 @@ bnx2_netif_stop(struct bnx2 *bp)
 			txq->trans_start = jiffies;
 		}
 	}
+	bnx2_disable_int_sync(bp);
 }
 
 static void
@@ -679,7 +680,6 @@ bnx2_netif_start(struct bnx2 *bp)
 			bnx2_cnic_start(bp);
 		}
 	}
-	bnx2_disable_int_sync(bp);
 }
 
 static void
Signature · 1 line
1.6.4.GIT
maintainer
#1 lore raw

From: "Michael Chan" <[email protected]>
Date: Sun, 20 Dec 2009 10:30:47 -0800

Quoted 6 lines

The error was introduced while merging:

commit 4529819c45161e4a119134f56ef504e69420bc98
bnx2: reset_task is crashing the kernel. Fixing it.

That's the last, and very last, time I merge in a patch that git rejects but 'patch' accepts.

Even if it's just line differences and 'fuzz' I'm pushing the patch back at the submitter.

Thanks for the fix Michael.