aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRiccardo Ghetta <birrachiara@tin.it>2009-06-04 05:04:55 -0400
committerDavid S. Miller <davem@davemloft.net>2009-06-08 03:15:13 -0400
commitc3223d2446a7ce7438be49d68c4e65267fc6e0b2 (patch)
tree91d562e96259e046a30db61cd97f90e0001f493f
parent744c6b2976778ac6944e580fc413842df85be84e (diff)
sis190: better message on unknown PHY
Signed-off-by: Riccardo Ghetta <birrachiara@tin.it> Signed-off-by: David S. Miller <davem@davemloft.net>
-rw-r--r--drivers/net/sis190.c15
1 files changed, 9 insertions, 6 deletions
diff --git a/drivers/net/sis190.c b/drivers/net/sis190.c
index 9ea13c09f009..ee32ad26b96c 100644
--- a/drivers/net/sis190.c
+++ b/drivers/net/sis190.c
@@ -347,7 +347,7 @@ static struct {
347 u32 msg_enable; 347 u32 msg_enable;
348} debug = { -1 }; 348} debug = { -1 };
349 349
350MODULE_DESCRIPTION("SiS sis190 Gigabit Ethernet driver"); 350MODULE_DESCRIPTION("SiS sis190/191 Gigabit Ethernet driver");
351module_param(rx_copybreak, int, 0); 351module_param(rx_copybreak, int, 0);
352MODULE_PARM_DESC(rx_copybreak, "Copy breakpoint for copy-only-tiny-frames"); 352MODULE_PARM_DESC(rx_copybreak, "Copy breakpoint for copy-only-tiny-frames");
353module_param_named(debug, debug.msg_enable, int, 0); 353module_param_named(debug, debug.msg_enable, int, 0);
@@ -1313,12 +1313,15 @@ static void sis190_init_phy(struct net_device *dev, struct sis190_private *tp,
1313 ((mii_status & (BMSR_100FULL | BMSR_100HALF)) ? 1313 ((mii_status & (BMSR_100FULL | BMSR_100HALF)) ?
1314 LAN : HOME) : p->type; 1314 LAN : HOME) : p->type;
1315 tp->features |= p->feature; 1315 tp->features |= p->feature;
1316 } else 1316 net_probe(tp, KERN_INFO "%s: %s transceiver at address %d.\n",
1317 pci_name(tp->pci_dev), p->name, phy_id);
1318 } else {
1317 phy->type = UNKNOWN; 1319 phy->type = UNKNOWN;
1318 1320 net_probe(tp, KERN_INFO
1319 net_probe(tp, KERN_INFO "%s: %s transceiver at address %d.\n", 1321 "%s: unknown PHY 0x%x:0x%x transceiver at address %d\n",
1320 pci_name(tp->pci_dev), 1322 pci_name(tp->pci_dev),
1321 (phy->type == UNKNOWN) ? "Unknown PHY" : p->name, phy_id); 1323 phy->id[0], (phy->id[1] & 0xfff0), phy_id);
1324 }
1322} 1325}
1323 1326
1324static void sis190_mii_probe_88e1111_fixup(struct sis190_private *tp) 1327static void sis190_mii_probe_88e1111_fixup(struct sis190_private *tp)