netdev.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
To: davem@davemloft.net
Cc: Emil Tantilov <emil.s.tantilov@intel.com>,
	netdev@vger.kernel.org, gospo@redhat.com,
	Jeff Kirsher <jeffrey.t.kirsher@intel.com>
Subject: [net-next 09/10] ixgbe: add check for supported modes
Date: Mon, 29 Aug 2011 01:41:07 -0700	[thread overview]
Message-ID: <1314607268-26958-10-git-send-email-jeffrey.t.kirsher@intel.com> (raw)
In-Reply-To: <1314607268-26958-1-git-send-email-jeffrey.t.kirsher@intel.com>

From: Emil Tantilov <emil.s.tantilov@intel.com>

When setting advertised speed/duplex with ethtool.

Also cleaned up the comment since we also support 100/F.

Signed-off-by: Emil Tantilov <emil.s.tantilov@intel.com>
Tested-by: Phil Schmitt <phillip.j.schmitt@intel.com>
Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
---
 drivers/net/ethernet/intel/ixgbe/ixgbe_ethtool.c |   10 +++++++---
 1 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/drivers/net/ethernet/intel/ixgbe/ixgbe_ethtool.c b/drivers/net/ethernet/intel/ixgbe/ixgbe_ethtool.c
index 82d4244..9c12b35 100644
--- a/drivers/net/ethernet/intel/ixgbe/ixgbe_ethtool.c
+++ b/drivers/net/ethernet/intel/ixgbe/ixgbe_ethtool.c
@@ -324,12 +324,16 @@ static int ixgbe_set_settings(struct net_device *netdev,
 
 	if ((hw->phy.media_type == ixgbe_media_type_copper) ||
 	    (hw->phy.multispeed_fiber)) {
-		/* 10000/copper and 1000/copper must autoneg
-		 * this function does not support any duplex forcing, but can
-		 * limit the advertising of the adapter to only 10000 or 1000 */
+		/*
+		 * this function does not support duplex forcing, but can
+		 * limit the advertising of the adapter to the specified speed
+		 */
 		if (ecmd->autoneg == AUTONEG_DISABLE)
 			return -EINVAL;
 
+		if (ecmd->advertising & ~ecmd->supported)
+			return -EINVAL;
+
 		old = hw->phy.autoneg_advertised;
 		advertised = 0;
 		if (ecmd->advertising & ADVERTISED_10000baseT_Full)
-- 
1.7.6

  parent reply	other threads:[~2011-08-29  8:41 UTC|newest]

Thread overview: 12+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2011-08-29  8:40 [net-next 00/10][pull request] Intel Wired LAN Driver Update Jeff Kirsher
2011-08-29  8:40 ` [net-next 01/10] ixgbe: Add support for setting CC bit when SR-IOV is enabled Jeff Kirsher
2011-08-29  8:41 ` [net-next 02/10] ixgbe: Always tag VLAN tagged packets Jeff Kirsher
2011-08-29  8:41 ` [net-next 03/10] ixgbe: fixup remaining call sites for arbitrary TCs Jeff Kirsher
2011-08-29  8:41 ` [net-next 04/10] ixgbe: remove unneeded fdir pb alloc case Jeff Kirsher
2011-08-29  8:41 ` [net-next 05/10] ixgbe: consolidate, setup for multiple traffic classes Jeff Kirsher
2011-08-29  8:41 ` [net-next 06/10] ixgbe: PFC not cleared on X540 devices Jeff Kirsher
2011-08-29  8:41 ` [net-next 07/10] ixgbe: cleanup feature flags in ixgbe_probe Jeff Kirsher
2011-08-29  8:41 ` [net-next 08/10] ixgbe: fix ixgbe_fc_autoneg_fiber bug Jeff Kirsher
2011-08-29  8:41 ` Jeff Kirsher [this message]
2011-08-29  8:41 ` [net-next 10/10] ixgbe: clear RNBC only for 82598 Jeff Kirsher
2011-08-29 16:26 ` [net-next 00/10][pull request] Intel Wired LAN Driver Update David Miller

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1314607268-26958-10-git-send-email-jeffrey.t.kirsher@intel.com \
    --to=jeffrey.t.kirsher@intel.com \
    --cc=davem@davemloft.net \
    --cc=emil.s.tantilov@intel.com \
    --cc=gospo@redhat.com \
    --cc=netdev@vger.kernel.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).