projects
/
firefly-linux-kernel-4.4.55.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
mwifiex: fix Tx timeout issue
[firefly-linux-kernel-4.4.55.git]
/
drivers
/
net
/
wireless
/
mwifiex
/
main.c
diff --git
a/drivers/net/wireless/mwifiex/main.c
b/drivers/net/wireless/mwifiex/main.c
index 9c771b3e99186ffe838f771b217216ebc5a43454..e91cd0fa5ca81e3585e8173a0fb6a1789cfdaca7 100644
(file)
--- a/
drivers/net/wireless/mwifiex/main.c
+++ b/
drivers/net/wireless/mwifiex/main.c
@@
-521,7
+521,6
@@
done:
release_firmware(adapter->firmware);
adapter->firmware = NULL;
}
release_firmware(adapter->firmware);
adapter->firmware = NULL;
}
- complete(&adapter->fw_load);
if (init_failed)
mwifiex_free_adapter(adapter);
up(sem);
if (init_failed)
mwifiex_free_adapter(adapter);
up(sem);
@@
-535,7
+534,6
@@
static int mwifiex_init_hw_fw(struct mwifiex_adapter *adapter)
{
int ret;
{
int ret;
- init_completion(&adapter->fw_load);
ret = request_firmware_nowait(THIS_MODULE, 1, adapter->fw_name,
adapter->dev, GFP_KERNEL, adapter,
mwifiex_fw_dpc);
ret = request_firmware_nowait(THIS_MODULE, 1, adapter->fw_name,
adapter->dev, GFP_KERNEL, adapter,
mwifiex_fw_dpc);
@@
-647,6
+645,7
@@
mwifiex_hard_start_xmit(struct sk_buff *skb, struct net_device *dev)
}
tx_info = MWIFIEX_SKB_TXCB(skb);
}
tx_info = MWIFIEX_SKB_TXCB(skb);
+ memset(tx_info, 0, sizeof(*tx_info));
tx_info->bss_num = priv->bss_num;
tx_info->bss_type = priv->bss_type;
tx_info->pkt_len = skb->len;
tx_info->bss_num = priv->bss_num;
tx_info->bss_type = priv->bss_type;
tx_info->pkt_len = skb->len;