2014-05-19 21:15:18

by John W. Linville

[permalink] [raw]
Subject: [PATCH] ath9k_htc: use 'struct ath_htc_rx_status *' in call to ath9k_htc_err_stat_rx

CC [M] drivers/net/wireless/ath/ath9k/htc_drv_txrx.o
drivers/net/wireless/ath/ath9k/htc_drv_txrx.c: In function ‘ath9k_rx_prepare’:
drivers/net/wireless/ath/ath9k/htc_drv_txrx.c:1006:2: warning: passing argument 2 of ‘ath9k_htc_err_stat_rx’ from incompatible pointer type [enabled by default]
ath9k_htc_err_stat_rx(priv, &rx_stats);
^
In file included from drivers/net/wireless/ath/ath9k/htc_drv_txrx.c:17:0:
drivers/net/wireless/ath/ath9k/htc.h:380:20: note: expected ‘struct ath_htc_rx_status *’ but argument is of type ‘struct ath_rx_status *’
static inline void ath9k_htc_err_stat_rx(struct ath9k_htc_priv *priv,

Signed-off-by: John W. Linville <[email protected]>
---
Compile-test only...seems reasonable?

drivers/net/wireless/ath/ath9k/htc_drv_txrx.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/net/wireless/ath/ath9k/htc_drv_txrx.c b/drivers/net/wireless/ath/ath9k/htc_drv_txrx.c
index bb86eb2ffc95..c1490ddc2965 100644
--- a/drivers/net/wireless/ath/ath9k/htc_drv_txrx.c
+++ b/drivers/net/wireless/ath/ath9k/htc_drv_txrx.c
@@ -1003,7 +1003,7 @@ static bool ath9k_rx_prepare(struct ath9k_htc_priv *priv,
/* Copy everything from ath_htc_rx_status (HTC_RX_FRAME_HEADER).
* After this, we can drop this part of skb. */
rx_status_htc_to_ath(&rx_stats, rxstatus);
- ath9k_htc_err_stat_rx(priv, &rx_stats);
+ ath9k_htc_err_stat_rx(priv, rxstatus);
rx_status->mactime = be64_to_cpu(rxstatus->rs_tstamp);
skb_pull(skb, HTC_RX_FRAME_HEADER_SIZE);

--
1.9.0



2014-05-19 21:45:17

by John W. Linville

[permalink] [raw]
Subject: Re: [ath9k-devel] [PATCH] ath9k_htc: use 'struct ath_htc_rx_status *' in call to ath9k_htc_err_stat_rx

On Mon, May 19, 2014 at 11:28:42PM +0200, Oleksij Rempel wrote:
> Am 19.05.2014 23:07, schrieb John W. Linville:
> > CC [M] drivers/net/wireless/ath/ath9k/htc_drv_txrx.o
> > drivers/net/wireless/ath/ath9k/htc_drv_txrx.c: In function ‘ath9k_rx_prepare’:
> > drivers/net/wireless/ath/ath9k/htc_drv_txrx.c:1006:2: warning: passing argument 2 of ‘ath9k_htc_err_stat_rx’ from incompatible pointer type [enabled by default]
> > ath9k_htc_err_stat_rx(priv, &rx_stats);
> > ^
> > In file included from drivers/net/wireless/ath/ath9k/htc_drv_txrx.c:17:0:
> > drivers/net/wireless/ath/ath9k/htc.h:380:20: note: expected ‘struct ath_htc_rx_status *’ but argument is of type ‘struct ath_rx_status *’
> > static inline void ath9k_htc_err_stat_rx(struct ath9k_htc_priv *priv,
> >
> > Signed-off-by: John W. Linville <[email protected]>
> > ---
> > Compile-test only...seems reasonable?
>
> Hm... that is incorrect. Some missing patch?
> "[PATCH 06/10] ath9k & ath9k_htc: move ath_rx_stats to cmn" did correct
> change.
> your patch will brake it.

The patch you mention is in wireless-next and wireless-testing.
The warning only shows-up in my wireless-testing build, although the
configs are slightly different.

Would you be interested in tracking down the problem?

John
--
John W. Linville Someday the world will need a hero, and you
[email protected] might be all we have. Be ready.

2014-05-19 21:29:04

by Oleksij Rempel

[permalink] [raw]
Subject: Re: [ath9k-devel] [PATCH] ath9k_htc: use 'struct ath_htc_rx_status *' in call to ath9k_htc_err_stat_rx

Am 19.05.2014 23:07, schrieb John W. Linville:
> CC [M] drivers/net/wireless/ath/ath9k/htc_drv_txrx.o
> drivers/net/wireless/ath/ath9k/htc_drv_txrx.c: In function ‘ath9k_rx_prepare’:
> drivers/net/wireless/ath/ath9k/htc_drv_txrx.c:1006:2: warning: passing argument 2 of ‘ath9k_htc_err_stat_rx’ from incompatible pointer type [enabled by default]
> ath9k_htc_err_stat_rx(priv, &rx_stats);
> ^
> In file included from drivers/net/wireless/ath/ath9k/htc_drv_txrx.c:17:0:
> drivers/net/wireless/ath/ath9k/htc.h:380:20: note: expected ‘struct ath_htc_rx_status *’ but argument is of type ‘struct ath_rx_status *’
> static inline void ath9k_htc_err_stat_rx(struct ath9k_htc_priv *priv,
>
> Signed-off-by: John W. Linville <[email protected]>
> ---
> Compile-test only...seems reasonable?

Hm... that is incorrect. Some missing patch?
"[PATCH 06/10] ath9k & ath9k_htc: move ath_rx_stats to cmn" did correct
change.
your patch will brake it.




>
> drivers/net/wireless/ath/ath9k/htc_drv_txrx.c | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/drivers/net/wireless/ath/ath9k/htc_drv_txrx.c b/drivers/net/wireless/ath/ath9k/htc_drv_txrx.c
> index bb86eb2ffc95..c1490ddc2965 100644
> --- a/drivers/net/wireless/ath/ath9k/htc_drv_txrx.c
> +++ b/drivers/net/wireless/ath/ath9k/htc_drv_txrx.c
> @@ -1003,7 +1003,7 @@ static bool ath9k_rx_prepare(struct ath9k_htc_priv *priv,
> /* Copy everything from ath_htc_rx_status (HTC_RX_FRAME_HEADER).
> * After this, we can drop this part of skb. */
> rx_status_htc_to_ath(&rx_stats, rxstatus);
> - ath9k_htc_err_stat_rx(priv, &rx_stats);
> + ath9k_htc_err_stat_rx(priv, rxstatus);
> rx_status->mactime = be64_to_cpu(rxstatus->rs_tstamp);
> skb_pull(skb, HTC_RX_FRAME_HEADER_SIZE);
>
>


--
Regards,
Oleksij


Attachments:
signature.asc (278.00 B)
OpenPGP digital signature

2014-05-19 22:00:39

by Oleksij Rempel

[permalink] [raw]
Subject: Re: [ath9k-devel] [PATCH] ath9k_htc: use 'struct ath_htc_rx_status *' in call to ath9k_htc_err_stat_rx

Am 19.05.2014 23:41, schrieb John W. Linville:
> On Mon, May 19, 2014 at 11:28:42PM +0200, Oleksij Rempel wrote:
>> Am 19.05.2014 23:07, schrieb John W. Linville:
>>> CC [M] drivers/net/wireless/ath/ath9k/htc_drv_txrx.o
>>> drivers/net/wireless/ath/ath9k/htc_drv_txrx.c: In function ‘ath9k_rx_prepare’:
>>> drivers/net/wireless/ath/ath9k/htc_drv_txrx.c:1006:2: warning: passing argument 2 of ‘ath9k_htc_err_stat_rx’ from incompatible pointer type [enabled by default]
>>> ath9k_htc_err_stat_rx(priv, &rx_stats);
>>> ^
>>> In file included from drivers/net/wireless/ath/ath9k/htc_drv_txrx.c:17:0:
>>> drivers/net/wireless/ath/ath9k/htc.h:380:20: note: expected ‘struct ath_htc_rx_status *’ but argument is of type ‘struct ath_rx_status *’
>>> static inline void ath9k_htc_err_stat_rx(struct ath9k_htc_priv *priv,
>>>
>>> Signed-off-by: John W. Linville <[email protected]>
>>> ---
>>> Compile-test only...seems reasonable?
>>
>> Hm... that is incorrect. Some missing patch?
>> "[PATCH 06/10] ath9k & ath9k_htc: move ath_rx_stats to cmn" did correct
>> change.
>> your patch will brake it.
>
> The patch you mention is in wireless-next and wireless-testing.
> The warning only shows-up in my wireless-testing build, although the
> configs are slightly different.
>
> Would you be interested in tracking down the problem?

Ok, thank you for the tip, i found it. Will send patch ASAP.


--
Regards,
Oleksij


Attachments:
signature.asc (278.00 B)
OpenPGP digital signature