From patchwork Thu Jul 2 22:51:10 2009 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Kirsher, Jeffrey T" X-Patchwork-Id: 29439 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming@bilbo.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from ozlabs.org (ozlabs.org [203.10.76.45]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (Client CN "mx.ozlabs.org", Issuer "CA Cert Signing Authority" (verified OK)) by bilbo.ozlabs.org (Postfix) with ESMTPS id AD96FB711D for ; Fri, 3 Jul 2009 08:51:33 +1000 (EST) Received: by ozlabs.org (Postfix) id 9DF1EDDD1C; Fri, 3 Jul 2009 08:51:33 +1000 (EST) Delivered-To: patchwork-incoming@ozlabs.org Received: from vger.kernel.org (vger.kernel.org [209.132.176.167]) by ozlabs.org (Postfix) with ESMTP id 3787BDDD1B for ; Fri, 3 Jul 2009 08:51:33 +1000 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753334AbZGBWvZ (ORCPT ); Thu, 2 Jul 2009 18:51:25 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1753287AbZGBWvY (ORCPT ); Thu, 2 Jul 2009 18:51:24 -0400 Received: from qmta07.emeryville.ca.mail.comcast.net ([76.96.30.64]:33689 "EHLO QMTA07.emeryville.ca.mail.comcast.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753176AbZGBWvX (ORCPT ); Thu, 2 Jul 2009 18:51:23 -0400 Received: from OMTA12.emeryville.ca.mail.comcast.net ([76.96.30.44]) by QMTA07.emeryville.ca.mail.comcast.net with comcast id B7fu1c0020x6nqcA7ArUt3; Thu, 02 Jul 2009 22:51:28 +0000 Received: from localhost.localdomain ([63.64.152.142]) by OMTA12.emeryville.ca.mail.comcast.net with comcast id BArB1c00834bfcX8YArDDf; Thu, 02 Jul 2009 22:51:26 +0000 From: Jeff Kirsher Subject: [net-2.6 PATCH 4/4] ixgbe: Not allow 8259x unsupported wol options change from ethtool To: davem@davemloft.net Cc: netdev@vger.kernel.org, gospo@redhat.com, Mallikarjuna R Chilakala , Jeff Kirsher Date: Thu, 02 Jul 2009 15:51:10 -0700 Message-ID: <20090702225110.22746.42383.stgit@localhost.localdomain> In-Reply-To: <20090702225012.22746.57218.stgit@localhost.localdomain> References: <20090702225012.22746.57218.stgit@localhost.localdomain> User-Agent: StGIT/0.14.3 MIME-Version: 1.0 Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org From: Mallikarjuna R Chilakala Wake-on-lan is currently only supported by 82599 KX4 devices, in all other cases return a proper value from ixgbe_wol_exclusion function call. Otherwise from ethtool we will be able to change wol options of unsupported 8259x devices. Signed-off-by: Mallikarjuna R Chilakala Signed-off-by: Jeff Kirsher --- drivers/net/ixgbe/ixgbe_ethtool.c | 1 - 1 files changed, 0 insertions(+), 1 deletions(-) -- 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 diff --git a/drivers/net/ixgbe/ixgbe_ethtool.c b/drivers/net/ixgbe/ixgbe_ethtool.c index 0f7b6a3..2a97800 100644 --- a/drivers/net/ixgbe/ixgbe_ethtool.c +++ b/drivers/net/ixgbe/ixgbe_ethtool.c @@ -1830,7 +1830,6 @@ static int ixgbe_wol_exclusion(struct ixgbe_adapter *adapter, break; default: wol->supported = 0; - retval = 0; } return retval;