lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

bnx2: Fix bnx2_netif_stop() merge error.

Browse Source 
The error was introduced while merging:

commit 4529819c45
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>
This commit is contained in:
Michael Chan
2009-12-20 18:40:18 -08:00
committed by David S. Miller
parent 7c65ec7958
commit b746656069
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
drivers/net/bnx2.c
View File

@@ -666,6 +666,7 @@ bnx2_netif_stop(struct bnx2 *bp)
txq->trans_start = jiffies; txq->trans_start = jiffies;
} }
} }
bnx2_disable_int_sync(bp);
} }
static void static void
@@ -679,7 +680,6 @@ bnx2_netif_start(struct bnx2 *bp)
bnx2_cnic_start(bp); bnx2_cnic_start(bp);
} }
} }
bnx2_disable_int_sync(bp);
} }
static void static void