| Message ID | 1259683615.2831.16.camel@achroite.uk.solarflarecom.com |
|---|---|
| State | Not Applicable, archived |
| Delegated to: | David Miller |
| Headers | show |
On 12/01/2009 11:06 AM, Ben Hutchings wrote: > The new port type cases in commit 6e0512c 'ethtool: Add Direct Attach > to the available connector ports' were somehow inserted into the > switch on duplex type, not on port type. Move them to the correct > place. > > Signed-off-by: Ben Hutchings<bhutchings@solarflare.com> > --- > ethtool.c | 12 ++++++------ > 1 files changed, 6 insertions(+), 6 deletions(-) ouch - one of the downsides of git happily merging away without complaint. applied -- 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/ethtool.c b/ethtool.c index df02e91..10dfc80 100644 --- a/ethtool.c +++ b/ethtool.c @@ -965,12 +965,6 @@ static int dump_ecmd(struct ethtool_cmd *ep) case DUPLEX_FULL: fprintf(stdout, "Full\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->duplex); break; @@ -993,6 +987,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; case PORT_OTHER: fprintf(stdout, "Other\n"); break;
The new port type cases in commit 6e0512c 'ethtool: Add Direct Attach to the available connector ports' were somehow inserted into the switch on duplex type, not on port type. Move them to the correct place. Signed-off-by: Ben Hutchings <bhutchings@solarflare.com> --- ethtool.c | 12 ++++++------ 1 files changed, 6 insertions(+), 6 deletions(-)