From df3b16a00b1081d6a5fd37109abea5f2984cfecc Mon Sep 17 00:00:00 2001 From: Dan Carpenter Date: Thu, 12 Jul 2012 04:47:03 +0000 Subject: [PATCH] --- yaml --- r: 315472 b: refs/heads/master c: 7be7e93268447cbb42fa0e6939b6372c156a1ad5 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/net/ethernet/qlogic/qlge/qlge_ethtool.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index b68061bfa61a..e664b7e20f8c 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 6ecd09dd35fd07b8f2f6f5210ecffd4cc5ac0581 +refs/heads/master: 7be7e93268447cbb42fa0e6939b6372c156a1ad5 diff --git a/trunk/drivers/net/ethernet/qlogic/qlge/qlge_ethtool.c b/trunk/drivers/net/ethernet/qlogic/qlge/qlge_ethtool.c index 3d4462bd9de7..6f316ab23257 100644 --- a/trunk/drivers/net/ethernet/qlogic/qlge/qlge_ethtool.c +++ b/trunk/drivers/net/ethernet/qlogic/qlge/qlge_ethtool.c @@ -440,7 +440,7 @@ static int ql_set_wol(struct net_device *ndev, struct ethtool_wolinfo *wol) unsigned short ssys_dev = qdev->pdev->subsystem_device; /* WOL is only supported for mezz card. */ - if (ssys_dev != QLGE_MEZZ_SSYS_ID_068 || + if (ssys_dev != QLGE_MEZZ_SSYS_ID_068 && ssys_dev != QLGE_MEZZ_SSYS_ID_180) { netif_info(qdev, drv, qdev->ndev, "WOL is only supported for mezz card\n");