X-Git-Url: http://bbs.cooldavid.org/git/?p=jme.git;a=blobdiff_plain;f=jme.c;h=2ce93393320cec4de6d991c39fe40ddabcc930a1;hp=be4773f54a244073fee58a55861419d1fb0911cb;hb=349f9de1da3fab033d04a8a8c541a8e001167d71;hpb=aa4d6a67ff8109a4e8449c13e31139300e3f9923

diff --git a/jme.c b/jme.c
index be4773f..2ce9339 100644
--- a/jme.c
+++ b/jme.c
@@ -2555,7 +2555,8 @@ jme_set_settings(struct net_device *netdev,
 	struct jme_adapter *jme = netdev_priv(netdev);
 	int rc, fdc = 0;
 
-	if (ecmd->speed == SPEED_1000 && ecmd->autoneg != AUTONEG_ENABLE)
+	if (ethtool_cmd_speed(ecmd) == SPEED_1000
+	    && ecmd->autoneg != AUTONEG_ENABLE)
 		return -EINVAL;
 
 	/*
@@ -3134,7 +3135,7 @@ jme_shutdown(struct pci_dev *pdev)
 	pci_pme_active(pdev, true);
 }
 
-#ifdef CONFIG_PM
+#ifdef CONFIG_PM_SLEEP
 static int jme_suspend(struct device *dev)
 {
 	struct pci_dev *pdev = to_pci_dev(dev);