diff --git a/[refs] b/[refs] index 3eb953cf3af8..06948b130f3e 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: bb793e2bfc25b8891b84b8fe3cb4b77cd4619814 +refs/heads/master: 86760088a7c51ccc263ec3b8039ec9a7400a6d70 diff --git a/trunk/drivers/net/wireless/libertas/tx.c b/trunk/drivers/net/wireless/libertas/tx.c index 10d1db0ab3a6..17c437635a00 100644 --- a/trunk/drivers/net/wireless/libertas/tx.c +++ b/trunk/drivers/net/wireless/libertas/tx.c @@ -110,7 +110,7 @@ static int SendSinglePacket(wlan_private * priv, struct sk_buff *skb) /* skip the radiotap header */ p802x_hdr += sizeof(struct tx_radiotap_hdr); plocaltxpd->tx_packet_length = - cpu_to_le32(le32_to_cpu(plocaltxpd->tx_packet_length) + cpu_to_le16(le16_to_cpu(plocaltxpd->tx_packet_length) - sizeof(struct tx_radiotap_hdr)); } @@ -130,11 +130,11 @@ static int SendSinglePacket(wlan_private * priv, struct sk_buff *skb) ptr += sizeof(struct txpd); - lbs_dbg_hex("Tx Data", (u8 *) p802x_hdr, le32_to_cpu(plocaltxpd->tx_packet_length)); - memcpy(ptr, p802x_hdr, le32_to_cpu(plocaltxpd->tx_packet_length)); + lbs_dbg_hex("Tx Data", (u8 *) p802x_hdr, le16_to_cpu(plocaltxpd->tx_packet_length)); + memcpy(ptr, p802x_hdr, le16_to_cpu(plocaltxpd->tx_packet_length)); ret = priv->hw_host_to_card(priv, MVMS_DAT, priv->adapter->tmptxbuf, - le32_to_cpu(plocaltxpd->tx_packet_length) + + le16_to_cpu(plocaltxpd->tx_packet_length) + sizeof(struct txpd)); if (ret) {