Patchwork [net-2.6,3/3] be2net: remove a BUG_ON in be_cmds.c

login
register
mail settings
Submitter Ajit Khaparde
Date Sept. 3, 2010, 4:24 p.m.
Message ID <20100903162403.GA22851@serverengines.com>
Download mbox | patch
Permalink /patch/63699/
State Accepted
Delegated to: David Miller
Headers show

Comments

Ajit Khaparde - Sept. 3, 2010, 4:24 p.m.
Async notifications other than link status are possible in certain
configurations. Remove the BUG_ON in the mcc completion processing path.

Signed-off-by: Ajit Khaparde <ajitk@serverengines.com>
---
 drivers/net/benet/be_cmds.c |    6 ++----
 1 files changed, 2 insertions(+), 4 deletions(-)
David Miller - Sept. 3, 2010, 4:54 p.m.
From: Ajit Khaparde <ajitk@serverengines.com>
Date: Fri, 3 Sep 2010 21:54:13 +0530

> Async notifications other than link status are possible in certain
> configurations. Remove the BUG_ON in the mcc completion processing path.
> 
> Signed-off-by: Ajit Khaparde <ajitk@serverengines.com>

Applied.
--
To unsubscribe from this list: send the line "unsubscribe netdev" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Patch

diff --git a/drivers/net/benet/be_cmds.c b/drivers/net/benet/be_cmds.c
index 78f32fe..34abcc9 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);