Skip to content

Commit

Permalink
bnx2: Fix bnx2_netif_stop() merge error.
Browse files Browse the repository at this point in the history
The error was introduced while merging:

commit 4529819
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>
  • Loading branch information
Michael Chan authored and David S. Miller committed Dec 21, 2009
1 parent 7c65ec7 commit b746656
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion drivers/net/bnx2.c
Original file line number Diff line number Diff line change
Expand Up @@ -666,6 +666,7 @@ bnx2_netif_stop(struct bnx2 *bp)
txq->trans_start = jiffies;
}
}
bnx2_disable_int_sync(bp);
}

static void
Expand All @@ -679,7 +680,6 @@ bnx2_netif_start(struct bnx2 *bp)
bnx2_cnic_start(bp);
}
}
bnx2_disable_int_sync(bp);
}

static void
Expand Down

0 comments on commit b746656

Please sign in to comment.