From patchwork Sun Aug 22 09:25:38 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ajit Khaparde X-Patchwork-Id: 62364 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id D22B9B6EF0 for ; Sun, 22 Aug 2010 19:25:41 +1000 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752072Ab0HVJZi (ORCPT ); Sun, 22 Aug 2010 05:25:38 -0400 Received: from segment-124-30.sify.net ([124.30.166.146]:2210 "EHLO akhaparde.serverengines.com" rhost-flags-OK-FAIL-OK-FAIL) by vger.kernel.org with ESMTP id S1752060Ab0HVJZh (ORCPT ); Sun, 22 Aug 2010 05:25:37 -0400 Received: by akhaparde.serverengines.com (Postfix, from userid 1000) id C017DAE0AF; Sun, 22 Aug 2010 14:55:38 +0530 (IST) Date: Sun, 22 Aug 2010 14:55:38 +0530 From: Ajit Khaparde To: David Miller Cc: netdev Subject: [PATCH net-2.6 3/6] be2net: remove a BUG_ON in be_cmds.c Message-ID: <20100822092529.GA22268@serverengines.com> Reply-To: Ajit Khaparde MIME-Version: 1.0 Content-Disposition: inline X-URL: http://www.serverengines.com Organization: ServerEngines Corp User-Agent: "Ajit's Mutt" X-OS: Linux x86_64 Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org Async notifications other than link status are possible in certain configurations. Remove the BUG_ON. Signed-off-by: Ajit Khaparde --- drivers/net/benet/be_cmds.c | 6 ++---- 1 files changed, 2 insertions(+), 4 deletions(-) diff --git a/drivers/net/benet/be_cmds.c b/drivers/net/benet/be_cmds.c index 3d30549..22bd062 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);