diff options
author | Michael Chan <mchan@broadcom.com> | 2009-12-20 21:40:18 -0500 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2009-12-20 21:40:18 -0500 |
commit | b74665606962456af7f92b1e448cee30ce70967b (patch) | |
tree | 46ad1f5106df4a02d54366194653502b0c8c2497 | |
parent | 7c65ec7958f4f301d5d2ff50476a21e7735c73e8 (diff) |
bnx2: Fix bnx2_netif_stop() merge error.
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>k
Signed-off-by: David S. Miller <davem@davemloft.net>
-rw-r--r-- | drivers/net/bnx2.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/bnx2.c b/drivers/net/bnx2.c index f38764ec02c3..65df1de447e4 100644 --- a/drivers/net/bnx2.c +++ b/drivers/net/bnx2.c | |||
@@ -666,6 +666,7 @@ bnx2_netif_stop(struct bnx2 *bp) | |||
666 | txq->trans_start = jiffies; | 666 | txq->trans_start = jiffies; |
667 | } | 667 | } |
668 | } | 668 | } |
669 | bnx2_disable_int_sync(bp); | ||
669 | } | 670 | } |
670 | 671 | ||
671 | static void | 672 | static void |
@@ -679,7 +680,6 @@ bnx2_netif_start(struct bnx2 *bp) | |||
679 | bnx2_cnic_start(bp); | 680 | bnx2_cnic_start(bp); |
680 | } | 681 | } |
681 | } | 682 | } |
682 | bnx2_disable_int_sync(bp); | ||
683 | } | 683 | } |
684 | 684 | ||
685 | static void | 685 | static void |