projects
/
GitHub
/
mt8127
/
android_kernel_alcatel_ttab.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
7c65ec7
)
bnx2: Fix bnx2_netif_stop() merge error.
author
Michael Chan
<mchan@broadcom.com>
Mon, 21 Dec 2009 02:40:18 +0000
(18:40 -0800)
committer
David S. Miller
<davem@davemloft.net>
Mon, 21 Dec 2009 02:40:18 +0000
(18:40 -0800)
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>
drivers/net/bnx2.c
patch
|
blob
|
blame
|
history
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