diff mbox

[net-next] ethtool: Add 20G bit definitions

Message ID 1304407809.2518.1.camel@lb-tlvb-dmitry
State Accepted, archived
Delegated to: David Miller
Headers show

Commit Message

Yaniv Rosner May 3, 2011, 7:30 a.m. UTC 
Add 20G supported and advertising bit definitions.
20G will be supported with the 57840 chips.


Signed-off-by: Yaniv Rosner <yanivr@broadcom.com>
Signed-off-by: Eilon Greenstein <eilong@broadcom.com>
------
 include/linux/ethtool.h |    4 ++++
 1 files changed, 4 insertions(+), 0 deletions(-)

Comments

David Miller May 8, 2011, 10:43 p.m. UTC | #1 
From: "Yaniv Rosner" <yanivr@broadcom.com>
Date: Tue, 3 May 2011 10:30:08 +0300

> Add 20G supported and advertising bit definitions.
> 20G will be supported with the 57840 chips.
> 
> 
> Signed-off-by: Yaniv Rosner <yanivr@broadcom.com>
> Signed-off-by: Eilon Greenstein <eilong@broadcom.com>

Applied to net-next-2.6, thanks.
--
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
Yaniv Rosner May 9, 2011, 10:16 a.m. UTC | #2 
On Sun, 2011-05-08 at 15:43 -0700, David Miller wrote:
> From: "Yaniv Rosner" <yanivr@broadcom.com>
> Date: Tue, 3 May 2011 10:30:08 +0300
> 
> > Add 20G supported and advertising bit definitions.
> > 20G will be supported with the 57840 chips.
> > 
> > 
> > Signed-off-by: Yaniv Rosner <yanivr@broadcom.com>
> > Signed-off-by: Eilon Greenstein <eilong@broadcom.com>
> 
> Applied to net-next-2.6, thanks.
> 
Ben,
Please note that I haven't added new definition for 20000 link speed because my understanding is that it no longer required.
Let me know if you think it is required, mainly for the speed extension in the ethtool application.

Yaniv


--
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
Ben Hutchings May 9, 2011, 12:50 p.m. UTC | #3 
On Mon, 2011-05-09 at 13:16 +0300, Yaniv Rosner wrote:
> On Sun, 2011-05-08 at 15:43 -0700, David Miller wrote:
> > From: "Yaniv Rosner" <yanivr@broadcom.com>
> > Date: Tue, 3 May 2011 10:30:08 +0300
> > 
> > > Add 20G supported and advertising bit definitions.
> > > 20G will be supported with the 57840 chips.
> > > 
> > > 
> > > Signed-off-by: Yaniv Rosner <yanivr@broadcom.com>
> > > Signed-off-by: Eilon Greenstein <eilong@broadcom.com>
> > 
> > Applied to net-next-2.6, thanks.
> > 
> Ben,
> Please note that I haven't added new definition for 20000 link speed
> because my understanding is that it no longer required.
> Let me know if you think it is required, mainly for the speed
> extension in the ethtool application.

There is no need (yet) for specific support of the speed.  However you
should provide a patch for ethtool to make it report these flags in the
advertised/lp_advertised/supported masks.

Ben.
diff mbox

Patch

diff --git a/include/linux/ethtool.h b/include/linux/ethtool.h
index 9de3127..620a96a 100644
--- a/include/linux/ethtool.h
+++ b/include/linux/ethtool.h
@@ -1024,6 +1024,8 @@  struct ethtool_ops {
 #define SUPPORTED_10000baseKX4_Full	(1 << 18)
 #define SUPPORTED_10000baseKR_Full	(1 << 19)
 #define SUPPORTED_10000baseR_FEC	(1 << 20)
+#define SUPPORTED_20000baseMLD2_Full	(1 << 21)
+#define SUPPORTED_20000baseKR2_Full	(1 << 22)
 
 /* Indicates what features are advertised by the interface. */
 #define ADVERTISED_10baseT_Half		(1 << 0)
@@ -1047,6 +1049,8 @@  struct ethtool_ops {
 #define ADVERTISED_10000baseKX4_Full	(1 << 18)
 #define ADVERTISED_10000baseKR_Full	(1 << 19)
 #define ADVERTISED_10000baseR_FEC	(1 << 20)
+#define ADVERTISED_20000baseMLD2_Full	(1 << 21)
+#define ADVERTISED_20000baseKR2_Full	(1 << 22)
 
 /* The following are all involved in forcing a particular link
  * mode for the device for setting things.  When getting the