ath9k_htc: use 'struct ath_htc_rx_status *' in call to ath9k_htc_err_stat_rx

PATCH New John W. Linville 2 participants 4 messages May 19, 2014 Qualcomm Atheros ATH9K wireless driver

Share & tools

John W. Linville

author

2014-05-19 21:07 UTC #0 lore raw

PATCH 1/1 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(-)

drivers/net/wireless/ath/ath9k/htc_drv_txrx.c +1 -1

index bb86eb2ffc95..c1490ddc2965 100644
@@ -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);

Signature · 1 line

1.9.0

Oleksij Rempel

2014-05-19 21:28 UTC #1 lore raw

PATCH 1/1 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:

Quoted 9 lines

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,

Quoted 3 lines

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.

Quoted 18 lines

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

drivers/net/wireless/ath/ath9k/htc_drv_txrx.c +1 -1

index bb86eb2ffc95..c1490ddc2965 100644
@@ -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);

Signature · 10 lines

Regards,
Oleksij

-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 278 bytes
Desc: OpenPGP digital signature
Url : http://lists.ath9k.org/pipermail/ath9k-devel/attachments/20140519/3703bcbf/attachment.pgp

John W. Linville

author

2014-05-19 21:41 UTC #2 lore raw

PATCH 1/1 ath9k_htc: use 'struct ath_htc_rx_status *' in call to ath9k_htc_err_stat_rx

Quoted 10 lines · Oleksij Rempel

Am 19.05.2014 23:07, schrieb John W. Linville:
Quoted 9 lines
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,

Quoted 8 lines

Quoted 3 lines
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

Signature · 2 lines

John W. Linville		Someday the world will need a hero, and you
linville at tuxdriver.com			might be all we have.  Be ready.

Oleksij Rempel

2014-05-19 22:00 UTC #3 lore raw

PATCH 1/1 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:

Quoted 20 lines · Oleksij Rempel

Quoted 10 lines
Am 19.05.2014 23:07, schrieb John W. Linville:
Quoted 9 lines
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,
Quoted 8 lines
Quoted 3 lines
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.

Quoted 5 lines

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.

Signature · 10 lines

Regards,
Oleksij

-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 278 bytes
Desc: OpenPGP digital signature
Url : http://lists.ath9k.org/pipermail/ath9k-devel/attachments/20140520/f0a6b156/attachment.pgp