From 9e5941cdaa664a16f78d44a04e30a77f1b37912c Mon Sep 17 00:00:00 2001 From: David Woodhouse Date: Fri, 25 May 2007 23:38:14 -0400 Subject: [PATCH] --- yaml --- r: 57679 b: refs/heads/master c: bb793e2bfc25b8891b84b8fe3cb4b77cd4619814 h: refs/heads/master i: 57677: e1bcdffba39dd40c83468f2e98e86d0f4656c1a8 57675: b25cd777e9b21c6a319d5d9fd79d5374681bc663 57671: b47f59be766d5277d48317d5a90714c8e9a530f5 57663: c8974f34231f53e64d6d6e8481f2c4ee9b0c26d2 v: v3 --- [refs] | 2 +- trunk/drivers/net/wireless/libertas/if_usb.c | 4 ++-- trunk/drivers/net/wireless/libertas/if_usb.h | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index b61419b8edc6..3eb953cf3af8 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 981f187b7c4b237011d4175cae0120d5d203c0fd +refs/heads/master: bb793e2bfc25b8891b84b8fe3cb4b77cd4619814 diff --git a/trunk/drivers/net/wireless/libertas/if_usb.c b/trunk/drivers/net/wireless/libertas/if_usb.c index b544fcdcd0e7..998317571ec2 100644 --- a/trunk/drivers/net/wireless/libertas/if_usb.c +++ b/trunk/drivers/net/wireless/libertas/if_usb.c @@ -313,7 +313,7 @@ static int if_prog_firmware(wlan_private * priv) /* lbs_deb_usbd(&cardp->udev->dev, - "Data length = %d\n", fwdata->fwheader.datalength); + "Data length = %d\n", le32_to_cpu(fwdata->fwheader.datalength)); */ cardp->fwseqnum = cardp->fwseqnum + 1; @@ -332,7 +332,7 @@ static int if_prog_firmware(wlan_private * priv) memcpy(cardp->bulk_out_buffer, fwheader, FW_DATA_XMIT_SIZE); usb_tx_block(priv, cardp->bulk_out_buffer, FW_DATA_XMIT_SIZE); - } else if (fwdata->fwheader.dnldcmd == FW_HAS_LAST_BLOCK) { + } else if (fwdata->fwheader.dnldcmd == cpu_to_le32(FW_HAS_LAST_BLOCK)) { /* lbs_deb_usbd(&cardp->udev->dev, "Host has finished FW downloading\n"); diff --git a/trunk/drivers/net/wireless/libertas/if_usb.h b/trunk/drivers/net/wireless/libertas/if_usb.h index 3ed46a33fd21..156bb485e1a6 100644 --- a/trunk/drivers/net/wireless/libertas/if_usb.h +++ b/trunk/drivers/net/wireless/libertas/if_usb.h @@ -100,7 +100,7 @@ struct fwsyncheader { #define FW_HAS_LAST_BLOCK 0x00000004 #define FW_DATA_XMIT_SIZE \ - sizeof(struct fwheader) + fwdata->fwheader.datalength + sizeof(u32) + sizeof(struct fwheader) + le32_to_cpu(fwdata->fwheader.datalength) + sizeof(u32) int usb_tx_block(wlan_private *priv, u8 *payload, u16 nb); void if_usb_free(struct usb_card_rec *cardp);