Commit b7466560 authored Dec 20, 2009 by Michael Chan Committed by David S. Miller Dec 20, 2009

bnx2: Fix bnx2_netif_stop() merge error.



The error was introduced while merging:

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

Signed-off-by: Michael Chan <mchan@broadcom.com&gt;k>
Signed-off-by: David S. Miller <davem@davemloft.net>

parent 7c65ec79

drivers/net/bnx2.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -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