John W. Linville wrote:
> Otherwise, you get this:
>
> CC [M] drivers/net/wireless/ath/ath9k/hif_usb.o
> drivers/net/wireless/ath/ath9k/hif_usb.c: In function âath9k_skb_queue_completeâ:
> drivers/net/wireless/ath/ath9k/hif_usb.c:230:12: error: expected expression before âdoâ
> make[2]: *** [drivers/net/wireless/ath/ath9k/hif_usb.o] Error 1
> make[1]: *** [drivers/net/wireless/ath/ath9k] Error 2
> make: *** [drivers/net/wireless/ath/] Error 2
>
> The TX_STAT_INC macro should probably be changed to accomodate such
> usage, although using a trinary operator in place of an if-else seems
> questionable to me anyway.
>
> Signed-off-by: John W. Linville <linville@xxxxxxxxxxxxx>
> ---
> drivers/net/wireless/ath/ath9k/hif_usb.c | 5 ++++-
> 1 files changed, 4 insertions(+), 1 deletions(-)
>
> diff --git a/drivers/net/wireless/ath/ath9k/hif_usb.c b/drivers/net/wireless/ath/ath9k/hif_usb.c
> index 5686711..2e3a33a 100644
> --- a/drivers/net/wireless/ath/ath9k/hif_usb.c
> +++ b/drivers/net/wireless/ath/ath9k/hif_usb.c
> @@ -227,7 +227,10 @@ static inline void ath9k_skb_queue_complete(struct hif_device_usb *hif_dev,
> while ((skb = __skb_dequeue(queue)) != NULL) {
> ath9k_htc_txcompletion_cb(hif_dev->htc_handle,
> skb, txok);
> - (txok) ? TX_STAT_INC(skb_success) : TX_STAT_INC(skb_failed);
> + if (txok)
> + TX_STAT_INC(skb_success);
> + else
> + TX_STAT_INC(skb_failed);
> }
Aargh, I forgot about this one. Thanks for fixing this.
Acked-by: Sujith Manoharan <Sujith.Manoharan@xxxxxxxxxxx>
Sujith
--
To unsubscribe from this list: send the line "unsubscribe linux-wireless" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
