Commit 798a95db authored by Brice Goglin's avatar Brice Goglin Committed by Jeff Garzik

myri10ge: report when the link partner is running in Myrinet mode

Since Myri-10G boards may also run in Myrinet mode instead of Ethernet,
add a message when we detect that the link partner is not running in the
right mode.
Signed-off-by: default avatarBrice Goglin <brice@myri.com>
Signed-off-by: default avatarJeff Garzik <jeff@garzik.org>
parent f181137f
...@@ -1156,9 +1156,11 @@ static inline void myri10ge_check_statblock(struct myri10ge_priv *mgp) ...@@ -1156,9 +1156,11 @@ static inline void myri10ge_check_statblock(struct myri10ge_priv *mgp)
struct mcp_irq_data *stats = mgp->fw_stats; struct mcp_irq_data *stats = mgp->fw_stats;
if (unlikely(stats->stats_updated)) { if (unlikely(stats->stats_updated)) {
if (mgp->link_state != stats->link_up) { unsigned link_up = ntohl(stats->link_up);
mgp->link_state = stats->link_up; if (mgp->link_state != link_up) {
if (mgp->link_state) { mgp->link_state = link_up;
if (mgp->link_state == MXGEFW_LINK_UP) {
if (netif_msg_link(mgp)) if (netif_msg_link(mgp))
printk(KERN_INFO printk(KERN_INFO
"myri10ge: %s: link up\n", "myri10ge: %s: link up\n",
...@@ -1168,8 +1170,11 @@ static inline void myri10ge_check_statblock(struct myri10ge_priv *mgp) ...@@ -1168,8 +1170,11 @@ static inline void myri10ge_check_statblock(struct myri10ge_priv *mgp)
} else { } else {
if (netif_msg_link(mgp)) if (netif_msg_link(mgp))
printk(KERN_INFO printk(KERN_INFO
"myri10ge: %s: link down\n", "myri10ge: %s: link %s\n",
mgp->dev->name); mgp->dev->name,
(link_up == MXGEFW_LINK_MYRINET ?
"mismatch (Myrinet detected)" :
"down"));
netif_carrier_off(mgp->dev); netif_carrier_off(mgp->dev);
mgp->link_changes++; mgp->link_changes++;
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment