diff options
| author | Tony Lindgren <tony@atomide.com> | 2015-11-12 20:58:21 +0300 |
|---|---|---|
| committer | Tony Lindgren <tony@atomide.com> | 2015-11-12 20:58:21 +0300 |
| commit | ff6d03b9d9cad592320ce21e9b22befe56ebe6b6 (patch) | |
| tree | da02d83177a107f92c446dbf7a93bdc1bac96cdf /drivers/net/wireless/mwifiex/sta_tx.c | |
| parent | 7ef71b70e18a82bb363905f72672317d0e1e8810 (diff) | |
| parent | 469689a45f78505d864210b3a5d75404eb7f24ee (diff) | |
| download | linux-ff6d03b9d9cad592320ce21e9b22befe56ebe6b6.tar.xz | |
Merge branch 'x15-audio-fixes' into omap-for-v4.4/fixes
Diffstat (limited to 'drivers/net/wireless/mwifiex/sta_tx.c')
| -rw-r--r-- | drivers/net/wireless/mwifiex/sta_tx.c | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/drivers/net/wireless/mwifiex/sta_tx.c b/drivers/net/wireless/mwifiex/sta_tx.c index 355ac5904fac..f6683ea6bd5d 100644 --- a/drivers/net/wireless/mwifiex/sta_tx.c +++ b/drivers/net/wireless/mwifiex/sta_tx.c @@ -153,6 +153,10 @@ int mwifiex_send_null_packet(struct mwifiex_private *priv, u8 flags) if (adapter->data_sent) return -1; + if (adapter->if_ops.is_port_ready && + !adapter->if_ops.is_port_ready(priv)) + return -1; + skb = dev_alloc_skb(data_len); if (!skb) return -1; @@ -174,7 +178,7 @@ int mwifiex_send_null_packet(struct mwifiex_private *priv, u8 flags) local_tx_pd->bss_type = priv->bss_type; if (adapter->iface_type == MWIFIEX_USB) { - ret = adapter->if_ops.host_to_card(adapter, MWIFIEX_USB_EP_DATA, + ret = adapter->if_ops.host_to_card(adapter, priv->usb_port, skb, NULL); } else { skb_push(skb, INTF_HEADER_LEN); @@ -191,7 +195,6 @@ int mwifiex_send_null_packet(struct mwifiex_private *priv, u8 flags) adapter->dbg.num_tx_host_to_card_failure++; break; case -1: - adapter->data_sent = false; dev_kfree_skb_any(skb); mwifiex_dbg(adapter, ERROR, "%s: host_to_card failed: ret=%d\n", |