* [PATCH][RESEND] myri10ge: improve port type reporting in ethtool
@ 2009-10-20 6:21 Brice Goglin
2009-10-23 4:43 ` David Miller
0 siblings, 1 reply; 2+ messages in thread
From: Brice Goglin @ 2009-10-20 6:21 UTC (permalink / raw)
To: David S. Miller; +Cc: Linux Network Development list, Ben Hutchings
Improve the reporting of myri10ge port type in ethtool,
and update for new boards.
Signed-off-by: Brice Goglin <brice@myri.com>
Signed-off-by: Andrew Gallatin <gallatin@myri.com>
diff --git a/drivers/net/myri10ge/myri10ge.c b/drivers/net/myri10ge/myri10ge.c
index 29c9fe2..5319db9 100644
--- a/drivers/net/myri10ge/myri10ge.c
+++ b/drivers/net/myri10ge/myri10ge.c
@@ -75,7 +75,7 @@
#include "myri10ge_mcp.h"
#include "myri10ge_mcp_gen_header.h"
-#define MYRI10GE_VERSION_STR "1.5.0-1.432"
+#define MYRI10GE_VERSION_STR "1.5.1-1.451"
MODULE_DESCRIPTION("Myricom 10G driver (10GbE)");
MODULE_AUTHOR("Maintainer: help@myri.com");
@@ -1623,10 +1623,21 @@ myri10ge_get_settings(struct net_device *netdev, struct ethtool_cmd *cmd)
return 0;
}
}
- if (*ptr == 'R' || *ptr == 'Q') {
- /* We've found either an XFP or quad ribbon fiber */
+ if (*ptr == '2')
+ ptr++;
+ if (*ptr == 'R' || *ptr == 'Q' || *ptr == 'S') {
+ /* We've found either an XFP, quad ribbon fiber, or SFP+ */
cmd->port = PORT_FIBRE;
+ cmd->supported |= SUPPORTED_FIBRE;
+ cmd->advertising |= ADVERTISED_FIBRE;
+ } else {
+ cmd->port = PORT_OTHER;
}
+ if (*ptr == 'R' || *ptr == 'S')
+ cmd->transceiver = XCVR_EXTERNAL;
+ else
+ cmd->transceiver = XCVR_INTERNAL;
+
return 0;
}
^ permalink raw reply related [flat|nested] 2+ messages in thread
* Re: [PATCH][RESEND] myri10ge: improve port type reporting in ethtool
2009-10-20 6:21 [PATCH][RESEND] myri10ge: improve port type reporting in ethtool Brice Goglin
@ 2009-10-23 4:43 ` David Miller
0 siblings, 0 replies; 2+ messages in thread
From: David Miller @ 2009-10-23 4:43 UTC (permalink / raw)
To: brice; +Cc: netdev, bhutchings
From: Brice Goglin <brice@myri.com>
Date: Tue, 20 Oct 2009 08:21:54 +0200
> Improve the reporting of myri10ge port type in ethtool,
> and update for new boards.
>
> Signed-off-by: Brice Goglin <brice@myri.com>
> Signed-off-by: Andrew Gallatin <gallatin@myri.com>
Applied, thanks.
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2009-10-23 4:43 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2009-10-20 6:21 [PATCH][RESEND] myri10ge: improve port type reporting in ethtool Brice Goglin
2009-10-23 4:43 ` David Miller
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.