Skip to contentSkip to conversation

ethtool: Add Direct Attach to the available connector ports

PATCH Applied Jeff Kirsher 5 participants 7 messages Nov 25, 2009 – Dec 23, 2009

Subsystems (2)
lore
Share & tools
lore
#0 lore raw

PATCH 1/1 ethtool: Add Direct Attach to the available connector ports

From: PJ Waskiewicz <[email protected]>

This adds Direct Attach SFP+ types to the connector ports for the GSET mode.

---

 ethtool-copy.h |    3 +++
 ethtool.c      |    6 ++++++
 2 files changed, 9 insertions(+), 0 deletions(-)
ethtool-copy.h +3 -0
index 3ca4e2c..7ea5a1b 100644
@@ -402,6 +402,9 @@ struct ethtool_rxnfc {
 #define PORT_MII		0x02
 #define PORT_FIBRE		0x03
 #define PORT_BNC		0x04
+#define PORT_DA			0x05
+#define PORT_NONE		0xef
+#define PORT_OTHER		0xff
 
 /* Which transceiver to use. */
 #define XCVR_INTERNAL		0x00
ethtool.c +6 -0
index 0110682..5b77614 100644
@@ -942,6 +942,12 @@ static int dump_ecmd(struct ethtool_cmd *ep)
 	case PORT_FIBRE:
 		fprintf(stdout, "FIBRE\n");
 		break;
+	case PORT_DA:
+		fprintf(stdout, "Direct Attach Copper\n");
+		break;
+	case PORT_NONE:
+		fprintf(stdout, "None\n");
+		break;
 	default:
 		fprintf(stdout, "Unknown! (%i)\n", ep->port);
 		break;
#2 lore raw
Quoted 5 lines · David Miller

From: Jeff Kirsher<[email protected]>
Date: Wed, 25 Nov 2009 02:13:15 -0800

Quoted 2 lines

From: PJ Waskiewicz<[email protected]>

Quoted 7 lines
Quoted 5 lines

This adds Direct Attach SFP+ types to the connector ports for the GSET mode.

Jeff Garzik, ping?

These days, unless I have some massive objection, I merge stuff into ethtool when the kernel bits hit net-next. ethtool should be current as of net-next 24 hrs ago.

I queued the ethtool patch in $subject, and was waiting on your kernel merge verdict.

Quoted 1 line

Also, do you plan on doing any ethtool releases this century? :-)

I've been trying to think of what would be a good versioning scheme for ethtool. Even though it is [essentially] a user-friendly kernel interface, its releases have never really been closely synchronized with the kernel releases. And unlike a lot of other software, ethtool is so simple it does not really go through any release-candidate or beta period.

The current scheme just increments a release number: 5->6, 6->7, etc. But with so few kernel releases (and thus ethtool releases), I was leaning towards either yearly release naming ("ethtool-2009"), kernel release naming ("ethtool-2.6.33"), or the release scheme proposed for glibc: snapshot directly from the git repository.

If people want one, I could do a release right now. Or, we could move to an alternate scheme like git snapshots. I think git snapshots are viable because ethtool has historically had next to zero bugs in the actual userland utility. Fedora already imports git snapshots, for example.

Preferences?

Jeff

#3 lore raw
Quoted 36 lines · Jeff Garzik
Quoted 5 lines · David Miller

From: Jeff Kirsher<[email protected]>
Date: Wed, 25 Nov 2009 02:13:15 -0800

Quoted 2 lines

From: PJ Waskiewicz<[email protected]>

Quoted 7 lines
Quoted 5 lines

This adds Direct Attach SFP+ types to the connector ports for the GSET mode.

Jeff Garzik, ping?

These days, unless I have some massive objection, I merge stuff into ethtool when the kernel bits hit net-next. ethtool should be current as of net-next 24 hrs ago.

I queued the ethtool patch in $subject, and was waiting on your kernel merge verdict.

Quoted 1 line

Also, do you plan on doing any ethtool releases this century? :-)

I've been trying to think of what would be a good versioning scheme for ethtool. Even though it is [essentially] a user-friendly kernel interface, its releases have never really been closely synchronized with the kernel releases. And unlike a lot of other software, ethtool is so simple it does not really go through any release-candidate or beta period.

The current scheme just increments a release number: 5->6, 6->7, etc. But with so few kernel releases (and thus ethtool releases), I was leaning towards either yearly release naming ("ethtool-2009"), kernel release naming ("ethtool-2.6.33"), or the release scheme proposed for
glibc: snapshot directly from the git repository.

Quoted 5 lines

If people want one, I could do a release right now. Or, we could move to an alternate scheme like git snapshots. I think git snapshots are viable because ethtool has historically had next to zero bugs in the actual userland utility. Fedora already imports git snapshots, for example.

I think we need a better versioning scheme no matter what method is chosen. If there are git snapshots, then part of the version in the repo should include the git repo stamp, or a timestamp. For example, Fedora packages with the timestamp of the snapshot, but the actual version of ethtool is "6git." That isn't very helpful to me, since the git snapshots with version 6git could be different.

That's my $0.02.

Cheers,
-PJ

#4 lore raw
In reply to Jeff Garzik

On Sun, 2009-11-29 at 05:42 -0500, Jeff Garzik wrote:
[...]

Quoted 12 lines

I've been trying to think of what would be a good versioning scheme for ethtool. Even though it is [essentially] a user-friendly kernel interface, its releases have never really been closely synchronized with the kernel releases. And unlike a lot of other software, ethtool is so simple it does not really go through any release-candidate or beta period.

The current scheme just increments a release number: 5->6, 6->7, etc. But with so few kernel releases (and thus ethtool releases), I was leaning towards either yearly release naming ("ethtool-2009"), kernel release naming ("ethtool-2.6.33"), or the release scheme proposed for
glibc: snapshot directly from the git repository.

Quoted 4 lines

If people want one, I could do a release right now. Or, we could move to an alternate scheme like git snapshots. I think git snapshots are viable because ethtool has historically had next to zero bugs in the actual userland utility. Fedora already imports git snapshots, for example.

So does Debian. But this is because we need to include the new features, not because we like using snapshots.

Quoted 1 line

Preferences?

I think it should be based on kernel versions, so that it's clear whether a given ethtool version supports the features introduced in a given kernel version.

Ben.

Signature · 2 lines
Ben Hutchings
Quantity is no substitute for quality, but it's the only one we've got.
#5 lore raw
Quoted 10 lines · Ben Hutchings
Quoted 5 lines · Jeff Garzik

The current scheme just increments a release number: 5->6, 6->7, etc. But with so few kernel releases (and thus ethtool releases), I was leaning towards either yearly release naming ("ethtool-2009"), kernel release naming ("ethtool-2.6.33"), or the release scheme proposed for
glibc: snapshot directly from the git repository.

I think it should be based on kernel versions, so that it's clear whether a given ethtool version supports the features introduced in a given kernel version.

Sounds like kernel version it is. Will debut ethtool-2.6.33 in a week or so, then. I posted ethtool-2.6.33-pre1 just now (intentionally different from 2.6.33-rc1, to hint that ethtool release candidates need not march in lock step with kernel pre-releases). Let some bug fixes trickle in, and then release ethtool-2.6.33.

Jeff