2011-04-11 17:24:34

by Sujith

Subject: [PATCH] ath9k_htc: Fix ethtool reporting

From: Sujith Manoharan <[email protected]>

Pass the correct module name and device interface so that
ethtool can display the proper values.

The firmware version will be fixed later on when the FW
can actually report a version. :)

Reported-by: Richard Farina <[email protected]>
Signed-off-by: Sujith Manoharan <[email protected]>
---
drivers/net/wireless/ath/ath9k/hif_usb.c | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/drivers/net/wireless/ath/ath9k/hif_usb.c b/drivers/net/wireless/ath/ath9k/hif_usb.c
index f1b8af6..2d10239 100644
--- a/drivers/net/wireless/ath/ath9k/hif_usb.c
+++ b/drivers/net/wireless/ath/ath9k/hif_usb.c
@@ -1040,7 +1040,7 @@ static int ath9k_hif_usb_probe(struct usb_interface *interface,
}

ret = ath9k_htc_hw_init(hif_dev->htc_handle,
- &hif_dev->udev->dev, hif_dev->device_id,
+ &interface->dev, hif_dev->device_id,
hif_dev->udev->product, id->driver_info);
if (ret) {
ret = -EINVAL;
@@ -1158,7 +1158,7 @@ fail_resume:
#endif

static struct usb_driver ath9k_hif_usb_driver = {
- .name = "ath9k_hif_usb",
+ .name = KBUILD_MODNAME,
.probe = ath9k_hif_usb_probe,
.disconnect = ath9k_hif_usb_disconnect,
#ifdef CONFIG_PM
--
1.7.4.4

2011-04-11 17:50:54

by Sid Hayn

Subject: Re: [PATCH] ath9k_htc: Fix ethtool reporting

On 04/11/11 13:26, Sujith wrote:
> From: Sujith Manoharan<[email protected]>
>
> Pass the correct module name and device interface so that
> ethtool can display the proper values.
>
> The firmware version will be fixed later on when the FW
> can actually report a version. :)
>
> Reported-by: Richard Farina<[email protected]>
> Signed-off-by: Sujith Manoharan<[email protected]>
Tested-by: Richard Farina <[email protected]>

Sujith,

Thanks a lot for this patch, it does exactly what I need until the new
firmware stuff is official.

All,

Since ethtool reports the driver incorrectly without this patch is it
too much to ask for a stable push? At least into .39, further if anyone
thinks it appropriate. This seems like a pretty minor patch to me but
fixes a real problem (well at least it was a real problem for me).

Thanks,
Rick Farina
> ---
> drivers/net/wireless/ath/ath9k/hif_usb.c | 4 ++--
> 1 files changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/drivers/net/wireless/ath/ath9k/hif_usb.c b/drivers/net/wireless/ath/ath9k/hif_usb.c
> index f1b8af6..2d10239 100644
> --- a/drivers/net/wireless/ath/ath9k/hif_usb.c
> +++ b/drivers/net/wireless/ath/ath9k/hif_usb.c
> @@ -1040,7 +1040,7 @@ static int ath9k_hif_usb_probe(struct usb_interface *interface,
> }
>
> ret = ath9k_htc_hw_init(hif_dev->htc_handle,
> - &hif_dev->udev->dev, hif_dev->device_id,
> + &interface->dev, hif_dev->device_id,
> hif_dev->udev->product, id->driver_info);
> if (ret) {
> ret = -EINVAL;
> @@ -1158,7 +1158,7 @@ fail_resume:
> #endif
>
> static struct usb_driver ath9k_hif_usb_driver = {
> - .name = "ath9k_hif_usb",
> + .name = KBUILD_MODNAME,
> .probe = ath9k_hif_usb_probe,
> .disconnect = ath9k_hif_usb_disconnect,
> #ifdef CONFIG_PM
> -- 1.7.4.4