From patchwork Mon Jun 28 09:28:11 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stanislaw Gruszka X-Patchwork-Id: 57122 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 12795B6F35 for ; Mon, 28 Jun 2010 19:28:23 +1000 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751263Ab0F1J2T (ORCPT ); Mon, 28 Jun 2010 05:28:19 -0400 Received: from mx1.redhat.com ([209.132.183.28]:55035 "EHLO mx1.redhat.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750992Ab0F1J2S (ORCPT ); Mon, 28 Jun 2010 05:28:18 -0400 Received: from int-mx03.intmail.prod.int.phx2.redhat.com (int-mx03.intmail.prod.int.phx2.redhat.com [10.5.11.16]) by mx1.redhat.com (8.13.8/8.13.8) with ESMTP id o5S9SHsE001978 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK); Mon, 28 Jun 2010 05:28:17 -0400 Received: from dhcp-lab-109.englab.brq.redhat.com (dhcp-27-239.brq.redhat.com [10.34.27.239]) by int-mx03.intmail.prod.int.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id o5S9SFkn032456; Mon, 28 Jun 2010 05:28:16 -0400 Date: Mon, 28 Jun 2010 11:28:11 +0200 From: Stanislaw Gruszka To: netdev@vger.kernel.org Cc: Amerigo Wang , Eilon Greenstein Subject: [PATCH -next] bnx2x: fail when try to setup unsupported features Message-ID: <20100628112811.29881285@dhcp-lab-109.englab.brq.redhat.com> Organization: RedHat Mime-Version: 1.0 X-Scanned-By: MIMEDefang 2.67 on 10.5.11.16 Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org Signed-off-by: Stanislaw Gruszka Signed-off-by: Eilon Greenstein --- drivers/net/bnx2x_main.c | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diff --git a/drivers/net/bnx2x_main.c b/drivers/net/bnx2x_main.c index 57ff5b3..0809f6c 100644 --- a/drivers/net/bnx2x_main.c +++ b/drivers/net/bnx2x_main.c @@ -10982,6 +10982,9 @@ static int bnx2x_set_flags(struct net_device *dev, u32 data) int changed = 0; int rc = 0; + if (data & ~(ETH_FLAG_LRO | ETH_FLAG_RXHASH)) + return -EOPNOTSUPP; + if (bp->recovery_state != BNX2X_RECOVERY_DONE) { printk(KERN_ERR "Handling parity error recovery. Try again later\n"); return -EAGAIN;