[PATCH] libertas: correct card cleanup order in SPI driver

Sebastian Andrzej Siewior sebastian at breakpoint.cc
Thu Jun 18 04:12:06 EDT 2009


* Andrey Yurovsky | 2009-06-17 19:08:45 [-0700]:

>Also fix a warning from the wrong uint format in a printk.
>
>Signed-off-by: Andrey Yurovsky <andrey at cozybit.com>
>---
> drivers/net/wireless/libertas/if_spi.c |    7 ++++---
> 1 files changed, 4 insertions(+), 3 deletions(-)
>
>diff --git a/drivers/net/wireless/libertas/if_spi.c b/drivers/net/wireless/libertas/if_spi.c
>index 923ed58..8d8bc0b 100644
>--- a/drivers/net/wireless/libertas/if_spi.c
>+++ b/drivers/net/wireless/libertas/if_spi.c
>@@ -737,7 +737,7 @@ static int if_spi_c2h_data(struct if_spi_card *card)
> 		goto out;
> 	} else if (len > MRVDRV_ETH_RX_PACKET_BUFFER_SIZE) {
> 		lbs_pr_err("%s: error: card has %d bytes of data, but "
>-			   "our maximum skb size is %lu\n",
>+			   "our maximum skb size is %u\n",
ehm, this reverts commit 9b171ffe1 aka "libertas: fix format warning" in
Dave's next tree [0]. Max skb is defined via

|#define MRVDRV_ETH_RX_PACKET_BUFFER_SIZE \
|    (ETH_FRAME_LEN + sizeof(struct rxpd) \
|     + MRVDRV_SNAP_HEADER_LEN + EXTRA_LEN)

and sizeof() probably says which type it is, so this is probably 32bit
vs 64bit. Wouldn't this be the perfect place for the z modifier?

[0]
http://git.kernel.org/?p=linux/kernel/git/davem/net-next-2.6.git;a=commitdiff;h=9b171ffe1b3004587f4a90ef293531a4a262e538

Sebastian



More information about the libertas-dev mailing list