Patchwork bnx2: Fix bnx2_netif_stop() merge error.

login
register
mail settings
Submitter Michael Chan
Date Dec. 20, 2009, 6:30 p.m.
Message ID <1261333847-15334-1-git-send-email-mchan@broadcom.com>
Download mbox | patch
Permalink /patch/41513/
State Accepted
Delegated to: David Miller
Headers show

Comments

Michael Chan - Dec. 20, 2009, 6:30 p.m.
The error was introduced while merging:

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

Signed-off-by: Michael Chan <mchan@broadcom.com>
---
 drivers/net/bnx2.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)
David Miller - Dec. 21, 2009, 2:41 a.m.
From: "Michael Chan" <mchan@broadcom.com>
Date: Sun, 20 Dec 2009 10:30:47 -0800

> The error was introduced while merging:
> 
> commit 4529819c45161e4a119134f56ef504e69420bc98
> bnx2: reset_task is crashing the kernel. Fixing it.
> 
> Signed-off-by: Michael Chan <mchan@broadcom.com>

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.
--
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/bnx2.c b/drivers/net/bnx2.c
index f38764e..65df1de 100644
--- a/drivers/net/bnx2.c
+++ b/drivers/net/bnx2.c
@@ -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