diff options
| author | Chris Metcalf <cmetcalf@tilera.com> | 2010-10-14 17:57:29 +0200 |
|---|---|---|
| committer | Chris Metcalf <cmetcalf@tilera.com> | 2010-10-14 17:57:29 +0200 |
| commit | ce0ecc8abfa9904e27a5f3ac4dd83398b134278d (patch) | |
| tree | 031363a799c1869889c961fcc49715896f59f703 /drivers/net/benet/be_cmds.c | |
| parent | tile: replace some BUG_ON checks with BUILD_BUG_ON checks (diff) | |
| parent | Linux 2.6.36-rc7 (diff) | |
| download | linux-ce0ecc8abfa9904e27a5f3ac4dd83398b134278d.tar.xz linux-ce0ecc8abfa9904e27a5f3ac4dd83398b134278d.zip | |
Merge branch 'master' into for-linus
Diffstat (limited to 'drivers/net/benet/be_cmds.c')
| -rw-r--r-- | drivers/net/benet/be_cmds.c | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/drivers/net/benet/be_cmds.c b/drivers/net/benet/be_cmds.c index 3d305494a606..34abcc9403d6 100644 --- a/drivers/net/benet/be_cmds.c +++ b/drivers/net/benet/be_cmds.c @@ -140,10 +140,8 @@ int be_process_mcc(struct be_adapter *adapter, int *status) while ((compl = be_mcc_compl_get(adapter))) { if (compl->flags & CQE_FLAGS_ASYNC_MASK) { /* Interpret flags as an async trailer */ - BUG_ON(!is_link_state_evt(compl->flags)); - - /* Interpret compl as a async link evt */ - be_async_link_state_process(adapter, + if (is_link_state_evt(compl->flags)) + be_async_link_state_process(adapter, (struct be_async_event_link_state *) compl); } else if (compl->flags & CQE_FLAGS_COMPLETED_MASK) { *status = be_mcc_compl_process(adapter, compl); @@ -207,7 +205,7 @@ static int be_mbox_db_ready_wait(struct be_adapter *adapter, void __iomem *db) if (msecs > 4000) { dev_err(&adapter->pdev->dev, "mbox poll timed out\n"); - be_dump_ue(adapter); + be_detect_dump_ue(adapter); return -1; } |