lists.openwall.net | lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC | |
Open Source and information security mailing list archives
| ||
|
Message-ID: <5E4F49720D0BAD499EE1F01232234BA877435B23DA@AVEXMB1.qlogic.org> Date: Fri, 29 Jun 2012 15:40:40 -0700 From: Jitendra Kalsaria <jitendra.kalsaria@...gic.com> To: Francois Romieu <romieu@...zoreil.com> CC: David Miller <davem@...emloft.net>, netdev <netdev@...r.kernel.org>, "Ron@...ux-zupk.site" <Ron@...ux-zupk.site>, Dept-NX Linux NIC Driver <Dept_NX_Linux_NIC_Driver@...gic.com> Subject: RE: [PATCH net-next 2/6] qlge: Stand-up card should not report supporting wol. Francois, See comments inline. Jiten -----Original Message----- From: Francois Romieu [mailto:romieu@...zoreil.com] Sent: Friday, June 29, 2012 2:38 PM To: Jitendra Kalsaria Cc: David Miller; netdev; Ron@...ux-zupk.site; Dept-NX Linux NIC Driver Subject: Re: [PATCH net-next 2/6] qlge: Stand-up card should not report supporting wol. Jitendra Kalsaria <jitendra.kalsaria@...gic.com> : > From: Jitendra Kalsaria <jitendra.kalsaria@...gic.com> > > Signed-off-by: Jitendra Kalsaria <jitendra.kalsaria@...gic.com> > --- > drivers/net/ethernet/qlogic/qlge/qlge_ethtool.c | 43 ++++++++++++++-------- > 1 files changed, 27 insertions(+), 16 deletions(-) > > diff --git a/drivers/net/ethernet/qlogic/qlge/qlge_ethtool.c b/drivers/net/ethernet/qlogic/qlge/qlge_ethtool.c > index 8e2c2a7..81672f5 100644 > --- a/drivers/net/ethernet/qlogic/qlge/qlge_ethtool.c > +++ b/drivers/net/ethernet/qlogic/qlge/qlge_ethtool.c > @@ -388,10 +388,14 @@ static void ql_get_drvinfo(struct net_device *ndev, > static void ql_get_wol(struct net_device *ndev, struct ethtool_wolinfo *wol) > { > struct ql_adapter *qdev = netdev_priv(ndev); > - /* What we support. */ > - wol->supported = WAKE_MAGIC; > - /* What we've currently got set. */ > - wol->wolopts = qdev->wol; > + > + if (qdev->pdev->subsystem_device == 0x0068 || > + qdev->pdev->subsystem_device == 0x0180) { > + /* What we support. */ > + wol->supported = WAKE_MAGIC; > + /* What we've currently got set. */ > + wol->wolopts = qdev->wol; > + } unsigned short ssys_dev = qdev->pdev->subsystem_device; if (ssys_dev == 0x0068 || ssys_dev == 0x0180) { wol->supported = WAKE_MAGIC; wol->wolopts = qdev->wol; } [JK] Will do this. > } > > static int ql_set_wol(struct net_device *ndev, struct ethtool_wolinfo *wol) > @@ -399,19 +403,26 @@ static int ql_set_wol(struct net_device *ndev, struct ethtool_wolinfo *wol) > struct ql_adapter *qdev = netdev_priv(ndev); > int status; > > - if (wol->wolopts & ~WAKE_MAGIC) > - return -EINVAL; > - qdev->wol = wol->wolopts; > - > - netif_info(qdev, drv, qdev->ndev, "Set wol option 0x%x\n", qdev->wol); > - if (!qdev->wol) { > - u32 wol = 0; > - status = ql_mb_wol_mode(qdev, wol); > - netif_err(qdev, drv, qdev->ndev, "WOL %s (wol code 0x%x)\n", > - status == 0 ? "cleared successfully" : "clear failed", > - wol); > + if (qdev->pdev->subsystem_device == 0x0068 || > + qdev->pdev->subsystem_device == 0x0180) { See above. > + if (wol->wolopts & ~WAKE_MAGIC) > + return -EINVAL; > + qdev->wol = wol->wolopts; > + > + netif_info(qdev, drv, qdev->ndev, > + "Set wol option 0x%x\n", qdev->wol); qdev->ndev == ndev, right ? [JK] Yes > + if (!qdev->wol) { > + u32 wol = 0; > + status = ql_mb_wol_mode(qdev, wol); Missing empty line. status should be declared here. [JK] Will fix this > + netif_err(qdev, drv, qdev->ndev, > + "WOL %s (wol code 0x%x)\n", > + status == 0 ? "cleared successfully" : "clear failed", > + wol); - broken indent - netif_err(... "cleared successfully" ...) [JK] I don't think so, %s will be replace with "cleared successfully" or with "clear failed" depend upon status value. > + } > + } else { > + netif_info(qdev, drv, qdev->ndev, > + "WOL is not supported on stand-up card\n"); > } > - > return 0; If I read things correctly, WAKE_MAGIC can not be cleared and it makes no difference on the status code. It should be fixed. [JK] You right, here we are not clearing WAKE_MAGIC but we are making sure that wol is disable when no option is set. -- Ueimor -- To unsubscribe from this list: send the line "unsubscribe netdev" in the body of a message to majordomo@...r.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
Powered by blists - more mailing lists