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>

diff --git a/drivers/net/bnx2.c b/drivers/net/bnx2.c
index f38764ec02c3b7f62a548c758ca47a3ad63be78c..65df1de447e4d8db176ee14ea8605b4ccac09be4 100644 (file)
--- 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