X-Git-Url: http://bbs.cooldavid.org/git/?p=jme.git;a=blobdiff_plain;f=jme.c;fp=jme.c;h=992b624bb230530cde6c065a3894fc49505afad4;hp=da6ee29db7ede554d12d49972b73487f0102d5d5;hb=98ef18f11c5307de7b507746effc514f5f990f7c;hpb=a4181cd412b5072b6ee470d2b7abfec1e690960a

diff --git a/jme.c b/jme.c
index da6ee29..992b624 100644
--- a/jme.c
+++ b/jme.c
@@ -2850,6 +2850,8 @@ jme_check_hw_ver(struct jme_adapter *jme)
 
 	jme->fpgaver = (chipmode & CM_FPGAVER_MASK) >> CM_FPGAVER_SHIFT;
 	jme->chiprev = (chipmode & CM_CHIPREV_MASK) >> CM_CHIPREV_SHIFT;
+	jme->chip_main_rev = jme->chiprev & 0xF;
+	jme->chip_sub_rev = (jme->chiprev >> 4) & 0xF;
 }
 
 #if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,29)
@@ -3074,7 +3076,7 @@ jme_init_one(struct pci_dev *pdev,
 
 	jme_clear_pm(jme);
 	jme_set_phyfifoa(jme);
-	pci_read_config_byte(pdev, PCI_REVISION_ID, &jme->rev);
+	pci_read_config_byte(pdev, PCI_REVISION_ID, &jme->pcirev);
 	if (!jme->fpgaver)
 		jme_phy_init(jme);
 	jme_phy_off(jme);
@@ -3101,7 +3103,7 @@ jme_init_one(struct pci_dev *pdev,
 		goto err_out_unmap;
 	}
 
-	netif_info(jme, probe, jme->dev, "%s%s ver:%x rev:%x "
+	netif_info(jme, probe, jme->dev, "%s%s chipver:%x pcirev:%x "
 		   "macaddr: %02x:%02x:%02x:%02x:%02x:%02x\n",
 		   (jme->pdev->device == PCI_DEVICE_ID_JMICRON_JMC250) ?
 		   "JMC250 Gigabit Ethernet" :
@@ -3109,7 +3111,7 @@ jme_init_one(struct pci_dev *pdev,
 		   "JMC260 Fast Ethernet" : "Unknown",
 		   (jme->fpgaver != 0) ? " (FPGA)" : "",
 		   (jme->fpgaver != 0) ? jme->fpgaver : jme->chiprev,
-		   jme->rev,
+		   jme->pcirev,
 		   netdev->dev_addr[0],
 		   netdev->dev_addr[1],
 		   netdev->dev_addr[2],