aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/wireless/mwifiex/sta_tx.c
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/net/wireless/mwifiex/sta_tx.c')
-rw-r--r--drivers/net/wireless/mwifiex/sta_tx.c22
1 files changed, 11 insertions, 11 deletions
diff --git a/drivers/net/wireless/mwifiex/sta_tx.c b/drivers/net/wireless/mwifiex/sta_tx.c
index 94d31a94620a..7af534feb420 100644
--- a/drivers/net/wireless/mwifiex/sta_tx.c
+++ b/drivers/net/wireless/mwifiex/sta_tx.c
@@ -50,8 +50,7 @@ void *mwifiex_process_sta_txpd(struct mwifiex_private *priv,
50 u8 pad; 50 u8 pad;
51 51
52 if (!skb->len) { 52 if (!skb->len) {
53 dev_err(adapter->dev, "Tx: bad packet length: %d\n", 53 dev_err(adapter->dev, "Tx: bad packet length: %d\n", skb->len);
54 skb->len);
55 tx_info->status_code = -1; 54 tx_info->status_code = -1;
56 return skb->data; 55 return skb->data;
57 } 56 }
@@ -60,19 +59,20 @@ void *mwifiex_process_sta_txpd(struct mwifiex_private *priv,
60 pad = (4 - (((void *)skb->data - NULL) & 0x3)) % 4; 59 pad = (4 - (((void *)skb->data - NULL) & 0x3)) % 4;
61 60
62 BUG_ON(skb_headroom(skb) < (sizeof(*local_tx_pd) + INTF_HEADER_LEN 61 BUG_ON(skb_headroom(skb) < (sizeof(*local_tx_pd) + INTF_HEADER_LEN
63 + pad)); 62 + pad));
64 skb_push(skb, sizeof(*local_tx_pd) + pad); 63 skb_push(skb, sizeof(*local_tx_pd) + pad);
65 64
66 local_tx_pd = (struct txpd *) skb->data; 65 local_tx_pd = (struct txpd *) skb->data;
67 memset(local_tx_pd, 0, sizeof(struct txpd)); 66 memset(local_tx_pd, 0, sizeof(struct txpd));
68 local_tx_pd->bss_num = priv->bss_num; 67 local_tx_pd->bss_num = priv->bss_num;
69 local_tx_pd->bss_type = priv->bss_type; 68 local_tx_pd->bss_type = priv->bss_type;
70 local_tx_pd->tx_pkt_length = cpu_to_le16((u16) (skb->len - 69 local_tx_pd->tx_pkt_length = cpu_to_le16((u16)(skb->len -
71 (sizeof(struct txpd) + pad))); 70 (sizeof(struct txpd)
71 + pad)));
72 72
73 local_tx_pd->priority = (u8) skb->priority; 73 local_tx_pd->priority = (u8) skb->priority;
74 local_tx_pd->pkt_delay_2ms = 74 local_tx_pd->pkt_delay_2ms =
75 mwifiex_wmm_compute_drv_pkt_delay(priv, skb); 75 mwifiex_wmm_compute_drv_pkt_delay(priv, skb);
76 76
77 if (local_tx_pd->priority < 77 if (local_tx_pd->priority <
78 ARRAY_SIZE(priv->wmm.user_pri_pkt_tx_ctrl)) 78 ARRAY_SIZE(priv->wmm.user_pri_pkt_tx_ctrl))
@@ -82,7 +82,7 @@ void *mwifiex_process_sta_txpd(struct mwifiex_private *priv,
82 */ 82 */
83 local_tx_pd->tx_control = 83 local_tx_pd->tx_control =
84 cpu_to_le32(priv->wmm.user_pri_pkt_tx_ctrl[local_tx_pd-> 84 cpu_to_le32(priv->wmm.user_pri_pkt_tx_ctrl[local_tx_pd->
85 priority]); 85 priority]);
86 86
87 if (adapter->pps_uapsd_mode) { 87 if (adapter->pps_uapsd_mode) {
88 if (mwifiex_check_last_packet_indication(priv)) { 88 if (mwifiex_check_last_packet_indication(priv)) {
@@ -160,13 +160,13 @@ int mwifiex_send_null_packet(struct mwifiex_private *priv, u8 flags)
160 case -1: 160 case -1:
161 dev_kfree_skb_any(skb); 161 dev_kfree_skb_any(skb);
162 dev_err(adapter->dev, "%s: host_to_card failed: ret=%d\n", 162 dev_err(adapter->dev, "%s: host_to_card failed: ret=%d\n",
163 __func__, ret); 163 __func__, ret);
164 adapter->dbg.num_tx_host_to_card_failure++; 164 adapter->dbg.num_tx_host_to_card_failure++;
165 break; 165 break;
166 case 0: 166 case 0:
167 dev_kfree_skb_any(skb); 167 dev_kfree_skb_any(skb);
168 dev_dbg(adapter->dev, "data: %s: host_to_card succeeded\n", 168 dev_dbg(adapter->dev, "data: %s: host_to_card succeeded\n",
169 __func__); 169 __func__);
170 adapter->tx_lock_flag = true; 170 adapter->tx_lock_flag = true;
171 break; 171 break;
172 case -EINPROGRESS: 172 case -EINPROGRESS:
@@ -192,8 +192,8 @@ mwifiex_check_last_packet_indication(struct mwifiex_private *priv)
192 if (mwifiex_wmm_lists_empty(adapter)) 192 if (mwifiex_wmm_lists_empty(adapter))
193 ret = true; 193 ret = true;
194 194
195 if (ret && !adapter->cmd_sent && !adapter->curr_cmd 195 if (ret && !adapter->cmd_sent && !adapter->curr_cmd &&
196 && !is_command_pending(adapter)) { 196 !is_command_pending(adapter)) {
197 adapter->delay_null_pkt = false; 197 adapter->delay_null_pkt = false;
198 ret = true; 198 ret = true;
199 } else { 199 } else {