* [PATCH] libertas: Fix ethtool reporting no WOL options supported if WOL is not already active
@ 2010-05-23 8:03 Sascha Silbe
2010-06-02 5:36 ` Dan Williams
0 siblings, 1 reply; 4+ messages in thread
From: Sascha Silbe @ 2010-05-23 8:03 UTC (permalink / raw)
To: linux-wireless
This patch fixes the libertas driver incorrectly reporting that Wake-on-LAN
is not supported if Wake-on-LAN is currently disabled.
---
drivers/net/wireless/libertas/ethtool.c | 9 +++------
1 files changed, 3 insertions(+), 6 deletions(-)
Without patch:
root@xo15-minimal:~# ethtool wlan0
Settings for wlan0:
Supports Wake-on: d
Wake-on: d
root@xo15-minimal:~# ethtool -s wlan0 wol pum
root@xo15-minimal:~# ethtool wlan0
Settings for wlan0:
Supports Wake-on: pumb
Wake-on: pum
root@xo15-minimal:~# ethtool -s wlan0 wol d
root@xo15-minimal:~# ethtool wlan0
Settings for wlan0:
Supports Wake-on: d
Wake-on: d
root@xo15-minimal:~#
With patch:
xo-sascha:~# ethtool eth0
Settings for eth0:
Supports Wake-on: pumb
Wake-on: d
xo-sascha:~# ethtool -s eth0 wol pum
xo-sascha:~# ethtool eth0
Settings for eth0:
Supports Wake-on: pumb
Wake-on: pum
xo-sascha:~# ethtool -s eth0 wol d
xo-sascha:~# ethtool eth0
Settings for eth0:
Supports Wake-on: pumb
Wake-on: d
diff --git a/drivers/net/wireless/libertas/ethtool.c b/drivers/net/wireless/libertas/ethtool.c
index 6eb9a88..4a337b7 100644
--- a/drivers/net/wireless/libertas/ethtool.c
+++ b/drivers/net/wireless/libertas/ethtool.c
@@ -145,14 +145,11 @@ static void lbs_ethtool_get_wol(struct net_device *dev,
{
struct lbs_private *priv = dev->ml_priv;
- if (priv->wol_criteria == 0xffffffff) {
- /* Interface driver didn't configure wake */
- wol->supported = wol->wolopts = 0;
- return;
- }
-
wol->supported = WAKE_UCAST|WAKE_MCAST|WAKE_BCAST|WAKE_PHY;
+ if (priv->wol_criteria == EHS_REMOVE_WAKEUP)
+ return;
+
if (priv->wol_criteria & EHS_WAKE_ON_UNICAST_DATA)
wol->wolopts |= WAKE_UCAST;
if (priv->wol_criteria & EHS_WAKE_ON_MULTICAST_DATA)
--
1.6.5
^ permalink raw reply related [flat|nested] 4+ messages in thread
* Re: [PATCH] libertas: Fix ethtool reporting no WOL options supported if WOL is not already active
2010-05-23 8:03 [PATCH] libertas: Fix ethtool reporting no WOL options supported if WOL is not already active Sascha Silbe
@ 2010-06-02 5:36 ` Dan Williams
2010-06-05 11:37 ` Sascha Silbe
0 siblings, 1 reply; 4+ messages in thread
From: Dan Williams @ 2010-06-02 5:36 UTC (permalink / raw)
To: Sascha Silbe; +Cc: linux-wireless
On Sun, 2010-05-23 at 10:03 +0200, Sascha Silbe wrote:
> This patch fixes the libertas driver incorrectly reporting that Wake-on-LAN
> is not supported if Wake-on-LAN is currently disabled.
Acked-by: Dan Williams <dcbw@redhat.com>
but note that this patch submission isn't correctly formatted, you'll
need to add your Signed-off-by tag as described here:
http://lxr.linux.no/#linux+v2.6.34/Documentation/SubmittingPatches
around line 286 or so. I doubt John will pick the patch up until you've
done that.
> ---
> drivers/net/wireless/libertas/ethtool.c | 9 +++------
> 1 files changed, 3 insertions(+), 6 deletions(-)
>
> Without patch:
>
> root@xo15-minimal:~# ethtool wlan0
> Settings for wlan0:
> Supports Wake-on: d
> Wake-on: d
> root@xo15-minimal:~# ethtool -s wlan0 wol pum
> root@xo15-minimal:~# ethtool wlan0
> Settings for wlan0:
> Supports Wake-on: pumb
> Wake-on: pum
> root@xo15-minimal:~# ethtool -s wlan0 wol d
> root@xo15-minimal:~# ethtool wlan0
> Settings for wlan0:
> Supports Wake-on: d
> Wake-on: d
> root@xo15-minimal:~#
>
>
> With patch:
>
> xo-sascha:~# ethtool eth0
> Settings for eth0:
> Supports Wake-on: pumb
> Wake-on: d
> xo-sascha:~# ethtool -s eth0 wol pum
> xo-sascha:~# ethtool eth0
> Settings for eth0:
> Supports Wake-on: pumb
> Wake-on: pum
> xo-sascha:~# ethtool -s eth0 wol d
> xo-sascha:~# ethtool eth0
> Settings for eth0:
> Supports Wake-on: pumb
> Wake-on: d
>
> diff --git a/drivers/net/wireless/libertas/ethtool.c b/drivers/net/wireless/libertas/ethtool.c
> index 6eb9a88..4a337b7 100644
> --- a/drivers/net/wireless/libertas/ethtool.c
> +++ b/drivers/net/wireless/libertas/ethtool.c
> @@ -145,14 +145,11 @@ static void lbs_ethtool_get_wol(struct net_device *dev,
> {
> struct lbs_private *priv = dev->ml_priv;
>
> - if (priv->wol_criteria == 0xffffffff) {
> - /* Interface driver didn't configure wake */
> - wol->supported = wol->wolopts = 0;
> - return;
> - }
> -
> wol->supported = WAKE_UCAST|WAKE_MCAST|WAKE_BCAST|WAKE_PHY;
>
> + if (priv->wol_criteria == EHS_REMOVE_WAKEUP)
> + return;
> +
> if (priv->wol_criteria & EHS_WAKE_ON_UNICAST_DATA)
> wol->wolopts |= WAKE_UCAST;
> if (priv->wol_criteria & EHS_WAKE_ON_MULTICAST_DATA)
^ permalink raw reply [flat|nested] 4+ messages in thread
* [PATCH] libertas: Fix ethtool reporting no WOL options supported if WOL is not already active
@ 2010-06-05 11:30 Sascha Silbe
0 siblings, 0 replies; 4+ messages in thread
From: Sascha Silbe @ 2010-06-05 11:30 UTC (permalink / raw)
To: linux-wireless
This patch fixes the libertas driver incorrectly reporting that Wake-on-LAN
is not supported if Wake-on-LAN is currently disabled.
Signed-off-by: Sascha Silbe <sascha-pgp@silbe.org>
Acked-by: Dan Williams <dcbw@redhat.com>
---
drivers/net/wireless/libertas/ethtool.c | 9 +++------
1 files changed, 3 insertions(+), 6 deletions(-)
Resend with Acked-By Dan and Signed-Off-By, no other changes.
Without patch:
root@xo15-minimal:~# ethtool wlan0
Settings for wlan0:
Supports Wake-on: d
Wake-on: d
root@xo15-minimal:~# ethtool -s wlan0 wol pum
root@xo15-minimal:~# ethtool wlan0
Settings for wlan0:
Supports Wake-on: pumb
Wake-on: pum
root@xo15-minimal:~# ethtool -s wlan0 wol d
root@xo15-minimal:~# ethtool wlan0
Settings for wlan0:
Supports Wake-on: d
Wake-on: d
root@xo15-minimal:~#
With patch:
xo-sascha:~# ethtool eth0
Settings for eth0:
Supports Wake-on: pumb
Wake-on: d
xo-sascha:~# ethtool -s eth0 wol pum
xo-sascha:~# ethtool eth0
Settings for eth0:
Supports Wake-on: pumb
Wake-on: pum
xo-sascha:~# ethtool -s eth0 wol d
xo-sascha:~# ethtool eth0
Settings for eth0:
Supports Wake-on: pumb
Wake-on: d
diff --git a/drivers/net/wireless/libertas/ethtool.c b/drivers/net/wireless/libertas/ethtool.c
index 6eb9a88..4a337b7 100644
--- a/drivers/net/wireless/libertas/ethtool.c
+++ b/drivers/net/wireless/libertas/ethtool.c
@@ -145,14 +145,11 @@ static void lbs_ethtool_get_wol(struct net_device *dev,
{
struct lbs_private *priv = dev->ml_priv;
- if (priv->wol_criteria == 0xffffffff) {
- /* Interface driver didn't configure wake */
- wol->supported = wol->wolopts = 0;
- return;
- }
-
wol->supported = WAKE_UCAST|WAKE_MCAST|WAKE_BCAST|WAKE_PHY;
+ if (priv->wol_criteria == EHS_REMOVE_WAKEUP)
+ return;
+
if (priv->wol_criteria & EHS_WAKE_ON_UNICAST_DATA)
wol->wolopts |= WAKE_UCAST;
if (priv->wol_criteria & EHS_WAKE_ON_MULTICAST_DATA)
--
1.6.5
^ permalink raw reply related [flat|nested] 4+ messages in thread
* Re: [PATCH] libertas: Fix ethtool reporting no WOL options supported if WOL is not already active
2010-06-02 5:36 ` Dan Williams
@ 2010-06-05 11:37 ` Sascha Silbe
0 siblings, 0 replies; 4+ messages in thread
From: Sascha Silbe @ 2010-06-05 11:37 UTC (permalink / raw)
To: linux-wireless
[-- Attachment #1: Type: text/plain, Size: 456 bytes --]
Excerpts from Dan Williams's message of Wed Jun 02 05:36:45 +0000 2010:
> Acked-by: Dan Williams <dcbw@redhat.com>
Thanks!
> but note that this patch submission isn't correctly formatted, you'll
> need to add your Signed-off-by tag as described here:
Oops, "tg patch" usually does that for me, but I've used git format-patch for this patch. I've just resent it with SOB and Acked-By added.
Sascha
--
http://sascha.silbe.org/
http://www.infra-silbe.de/
[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 198 bytes --]
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2010-06-05 11:44 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2010-05-23 8:03 [PATCH] libertas: Fix ethtool reporting no WOL options supported if WOL is not already active Sascha Silbe
2010-06-02 5:36 ` Dan Williams
2010-06-05 11:37 ` Sascha Silbe
-- strict thread matches above, loose matches on Subject: below --
2010-06-05 11:30 Sascha Silbe
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).