diff options
| author | Avinash Patil <patila@marvell.com> | 2013-11-05 15:01:44 -0800 |
|---|---|---|
| committer | Ben Hutchings <ben@decadent.org.uk> | 2014-01-03 04:33:20 +0000 |
| commit | feb8633cb1169a294c7c9bbefa0d3a442b48c31a (patch) | |
| tree | 60d67a0c16c82d4166dc92613c31e70961dbff12 /drivers/net/wireless/mwifiex | |
| parent | 0b778af8a6a94450f86195fafc37724bac8f8282 (diff) | |
| download | kernel_samsung_smdk4412-feb8633cb1169a294c7c9bbefa0d3a442b48c31a.zip kernel_samsung_smdk4412-feb8633cb1169a294c7c9bbefa0d3a442b48c31a.tar.gz kernel_samsung_smdk4412-feb8633cb1169a294c7c9bbefa0d3a442b48c31a.tar.bz2 | |
mwifiex: correct packet length for packets from SDIO interface
commit d03b4aa77e1187b77dfe37d14a923547f00baa66 upstream.
While receiving a packet on SDIO interface, we allocate skb with
size multiple of SDIO block size. We need to resize this skb
after RX using packet length from RX header.
Signed-off-by: Avinash Patil <patila@marvell.com>
Signed-off-by: Bing Zhao <bzhao@marvell.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
Signed-off-by: Ben Hutchings <ben@decadent.org.uk>
Diffstat (limited to 'drivers/net/wireless/mwifiex')
| -rw-r--r-- | drivers/net/wireless/mwifiex/sdio.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/drivers/net/wireless/mwifiex/sdio.c b/drivers/net/wireless/mwifiex/sdio.c index 17f8720..72b253d2 100644 --- a/drivers/net/wireless/mwifiex/sdio.c +++ b/drivers/net/wireless/mwifiex/sdio.c @@ -936,7 +936,10 @@ static int mwifiex_decode_rx_packet(struct mwifiex_adapter *adapter, struct sk_buff *skb, u32 upld_typ) { u8 *cmd_buf; + __le16 *curr_ptr = (__le16 *)skb->data; + u16 pkt_len = le16_to_cpu(*curr_ptr); + skb_trim(skb, pkt_len); skb_pull(skb, INTF_HEADER_LEN); switch (upld_typ) { |