AuxXxilium/linux_dsm_epyc7002
1
0
Fork 0
mirror of https://github.com/AuxXxilium/linux_dsm_epyc7002.git synced 2024-12-24 12:29:44 +07:00
Code Issues Actions Packages Projects Releases Wiki Activity

mwifiex: move usb specific data_sent update to usb.c

Browse Source 
This patch move data_sent flag update to usb.c file.
>From now all data_sent update cases only happened in specific file:
sdio.c, usb.c, pcie.c. Outside ot these files, it is only allowed
to check the value of data_ent.

Signed-off-by: Zhaoyang Liu <liuzy@marvell.com>
Signed-off-by: Cathy Luo <cluo@marvell.com>
Signed-off-by: Amitkumar Karwar <akarwar@marvell.com>
Signed-off-by: Kalle Valo <kvalo@codeaurora.org>
This commit is contained in:
Zhaoyang Liu 2015-09-18 06:32:14 -07:00 committed by Kalle Valo
parent d22871db01
commit d941444321
5 changed files with 6 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
drivers/net/wireless/mwifiex/11n_aggr.c
View File

@ -259,7 +259,6 @@ mwifiex_11n_aggregate_pkt(struct mwifiex_private *priv,
} }
if (adapter->iface_type == MWIFIEX_USB) { if (adapter->iface_type == MWIFIEX_USB) {
adapter->data_sent = true;
ret = adapter->if_ops.host_to_card(adapter, MWIFIEX_USB_EP_DATA, ret = adapter->if_ops.host_to_card(adapter, MWIFIEX_USB_EP_DATA,
skb_aggr, NULL); skb_aggr, NULL);
} else { } else {
@ -300,16 +299,12 @@ mwifiex_11n_aggregate_pkt(struct mwifiex_private *priv,
mwifiex_dbg(adapter, ERROR, "data: -EBUSY is returned\n"); mwifiex_dbg(adapter, ERROR, "data: -EBUSY is returned\n");
break; break;
case -1: case -1:
if (adapter->iface_type == MWIFIEX_USB)
adapter->data_sent = false;
mwifiex_dbg(adapter, ERROR, "%s: host_to_card failed: %#x\n", mwifiex_dbg(adapter, ERROR, "%s: host_to_card failed: %#x\n",
__func__, ret); __func__, ret);
adapter->dbg.num_tx_host_to_card_failure++; adapter->dbg.num_tx_host_to_card_failure++;
mwifiex_write_data_complete(adapter, skb_aggr, 1, ret); mwifiex_write_data_complete(adapter, skb_aggr, 1, ret);
return 0; return 0;
case -EINPROGRESS: case -EINPROGRESS:
if (adapter->iface_type == MWIFIEX_USB)
adapter->data_sent = false;
break; break;
case 0: case 0:
mwifiex_write_data_complete(adapter, skb_aggr, 1, ret); mwifiex_write_data_complete(adapter, skb_aggr, 1, ret);

5
drivers/net/wireless/mwifiex/sta_tx.c
View File

@ -174,7 +174,6 @@ int mwifiex_send_null_packet(struct mwifiex_private *priv, u8 flags)
local_tx_pd->bss_type = priv->bss_type; local_tx_pd->bss_type = priv->bss_type;
if (adapter->iface_type == MWIFIEX_USB) { if (adapter->iface_type == MWIFIEX_USB) {
adapter->data_sent = true;
ret = adapter->if_ops.host_to_card(adapter, MWIFIEX_USB_EP_DATA, ret = adapter->if_ops.host_to_card(adapter, MWIFIEX_USB_EP_DATA,
skb, NULL); skb, NULL);
} else { } else {
@ -192,8 +191,6 @@ int mwifiex_send_null_packet(struct mwifiex_private *priv, u8 flags)
adapter->dbg.num_tx_host_to_card_failure++; adapter->dbg.num_tx_host_to_card_failure++;
break; break;
case -1: case -1:
if (adapter->iface_type == MWIFIEX_USB)
adapter->data_sent = false;
dev_kfree_skb_any(skb); dev_kfree_skb_any(skb);
mwifiex_dbg(adapter, ERROR, mwifiex_dbg(adapter, ERROR,
"%s: host_to_card failed: ret=%d\n", "%s: host_to_card failed: ret=%d\n",
@ -208,8 +205,6 @@ int mwifiex_send_null_packet(struct mwifiex_private *priv, u8 flags)
adapter->tx_lock_flag = true; adapter->tx_lock_flag = true;
break; break;
case -EINPROGRESS: case -EINPROGRESS:
if (adapter->iface_type == MWIFIEX_USB)
adapter->data_sent = false;
adapter->tx_lock_flag = true; adapter->tx_lock_flag = true;
break; break;
default: default:

13
drivers/net/wireless/mwifiex/txrx.c
View File

@ -115,7 +115,6 @@ int mwifiex_process_tx(struct mwifiex_private *priv, struct sk_buff *skb,
if (GET_BSS_ROLE(priv) == MWIFIEX_BSS_ROLE_STA) if (GET_BSS_ROLE(priv) == MWIFIEX_BSS_ROLE_STA)
local_tx_pd = (struct txpd *)(head_ptr + hroom); local_tx_pd = (struct txpd *)(head_ptr + hroom);
if (adapter->iface_type == MWIFIEX_USB) { if (adapter->iface_type == MWIFIEX_USB) {
adapter->data_sent = true;
ret = adapter->if_ops.host_to_card(adapter, ret = adapter->if_ops.host_to_card(adapter,
MWIFIEX_USB_EP_DATA, MWIFIEX_USB_EP_DATA,
skb, NULL); skb, NULL);
@ -142,8 +141,6 @@ int mwifiex_process_tx(struct mwifiex_private *priv, struct sk_buff *skb,
mwifiex_dbg(adapter, ERROR, "data: -EBUSY is returned\n"); mwifiex_dbg(adapter, ERROR, "data: -EBUSY is returned\n");
break; break;
case -1: case -1:
if (adapter->iface_type == MWIFIEX_USB)
adapter->data_sent = false;
mwifiex_dbg(adapter, ERROR, mwifiex_dbg(adapter, ERROR,
"mwifiex_write_data_async failed: 0x%X\n", "mwifiex_write_data_async failed: 0x%X\n",
ret); ret);
@ -151,8 +148,6 @@ int mwifiex_process_tx(struct mwifiex_private *priv, struct sk_buff *skb,
mwifiex_write_data_complete(adapter, skb, 0, ret); mwifiex_write_data_complete(adapter, skb, 0, ret);
break; break;
case -EINPROGRESS: case -EINPROGRESS:
if (adapter->iface_type == MWIFIEX_USB)
adapter->data_sent = false;
break; break;
case 0: case 0:
mwifiex_write_data_complete(adapter, skb, 0, ret); mwifiex_write_data_complete(adapter, skb, 0, ret);
@ -193,7 +188,6 @@ static int mwifiex_host_to_card(struct mwifiex_adapter *adapter,
} }
if (adapter->iface_type == MWIFIEX_USB) { if (adapter->iface_type == MWIFIEX_USB) {
adapter->data_sent = true;
ret = adapter->if_ops.host_to_card(adapter, ret = adapter->if_ops.host_to_card(adapter,
MWIFIEX_USB_EP_DATA, MWIFIEX_USB_EP_DATA,
skb, NULL); skb, NULL);
@ -222,16 +216,12 @@ static int mwifiex_host_to_card(struct mwifiex_adapter *adapter,
mwifiex_dbg(adapter, ERROR, "data: -EBUSY is returned\n"); mwifiex_dbg(adapter, ERROR, "data: -EBUSY is returned\n");
break; break;
case -1: case -1:
if (adapter->iface_type == MWIFIEX_USB)
adapter->data_sent = false;
mwifiex_dbg(adapter, ERROR, mwifiex_dbg(adapter, ERROR,
"mwifiex_write_data_async failed: 0x%X\n", ret); "mwifiex_write_data_async failed: 0x%X\n", ret);
adapter->dbg.num_tx_host_to_card_failure++; adapter->dbg.num_tx_host_to_card_failure++;
mwifiex_write_data_complete(adapter, skb, 0, ret); mwifiex_write_data_complete(adapter, skb, 0, ret);
break; break;
case -EINPROGRESS: case -EINPROGRESS:
if (adapter->iface_type == MWIFIEX_USB)
adapter->data_sent = false;
break; break;
case 0: case 0:
mwifiex_write_data_complete(adapter, skb, 0, ret); mwifiex_write_data_complete(adapter, skb, 0, ret);
@ -306,9 +296,6 @@ int mwifiex_write_data_complete(struct mwifiex_adapter *adapter,
if (!priv) if (!priv)
goto done; goto done;
if (adapter->iface_type == MWIFIEX_USB)
adapter->data_sent = false;
mwifiex_set_trans_start(priv->netdev); mwifiex_set_trans_start(priv->netdev);
if (!status) { if (!status) {
priv->stats.tx_packets++; priv->stats.tx_packets++;

7
drivers/net/wireless/mwifiex/usb.c
View File

@ -277,6 +277,7 @@ static void mwifiex_usb_tx_complete(struct urb *urb)
mwifiex_dbg(adapter, DATA, mwifiex_dbg(adapter, DATA,
"%s: DATA\n", __func__); "%s: DATA\n", __func__);
atomic_dec(&card->tx_data_urb_pending); atomic_dec(&card->tx_data_urb_pending);
adapter->data_sent = false;
mwifiex_write_data_complete(adapter, context->skb, 0, mwifiex_write_data_complete(adapter, context->skb, 0,
urb->status ? -1 : 0); urb->status ? -1 : 0);
} }
@ -759,6 +760,7 @@ static int mwifiex_usb_host_to_card(struct mwifiex_adapter *adapter, u8 ep,
if (ep == card->tx_data_ep && if (ep == card->tx_data_ep &&
atomic_read(&card->tx_data_urb_pending) >= MWIFIEX_TX_DATA_URB) { atomic_read(&card->tx_data_urb_pending) >= MWIFIEX_TX_DATA_URB) {
adapter->data_sent = true;
return -EBUSY; return -EBUSY;
} }
@ -795,6 +797,7 @@ static int mwifiex_usb_host_to_card(struct mwifiex_adapter *adapter, u8 ep,
atomic_dec(&card->tx_cmd_urb_pending); atomic_dec(&card->tx_cmd_urb_pending);
} else { } else {
atomic_dec(&card->tx_data_urb_pending); atomic_dec(&card->tx_data_urb_pending);
adapter->data_sent = false;
if (card->tx_data_ix) if (card->tx_data_ix)
card->tx_data_ix--; card->tx_data_ix--;
else else
@ -805,8 +808,10 @@ static int mwifiex_usb_host_to_card(struct mwifiex_adapter *adapter, u8 ep,
} else { } else {
if (ep == card->tx_data_ep && if (ep == card->tx_data_ep &&
atomic_read(&card->tx_data_urb_pending) == atomic_read(&card->tx_data_urb_pending) ==
MWIFIEX_TX_DATA_URB) MWIFIEX_TX_DATA_URB) {
adapter->data_sent = true;
return -ENOSR; return -ENOSR;
}
} }
return -EINPROGRESS; return -EINPROGRESS;

5
drivers/net/wireless/mwifiex/wmm.c
View File

@ -1326,7 +1326,6 @@ mwifiex_send_processed_packet(struct mwifiex_private *priv,
spin_unlock_irqrestore(&priv->wmm.ra_list_spinlock, ra_list_flags); spin_unlock_irqrestore(&priv->wmm.ra_list_spinlock, ra_list_flags);
if (adapter->iface_type == MWIFIEX_USB) { if (adapter->iface_type == MWIFIEX_USB) {
adapter->data_sent = true;
ret = adapter->if_ops.host_to_card(adapter, MWIFIEX_USB_EP_DATA, ret = adapter->if_ops.host_to_card(adapter, MWIFIEX_USB_EP_DATA,
skb, NULL); skb, NULL);
} else { } else {
@ -1356,15 +1355,11 @@ mwifiex_send_processed_packet(struct mwifiex_private *priv,
ra_list_flags); ra_list_flags);
break; break;
case -1: case -1:
if (adapter->iface_type == MWIFIEX_USB)
adapter->data_sent = false;
mwifiex_dbg(adapter, ERROR, "host_to_card failed: %#x\n", ret); mwifiex_dbg(adapter, ERROR, "host_to_card failed: %#x\n", ret);
adapter->dbg.num_tx_host_to_card_failure++; adapter->dbg.num_tx_host_to_card_failure++;
mwifiex_write_data_complete(adapter, skb, 0, ret); mwifiex_write_data_complete(adapter, skb, 0, ret);
break; break;
case -EINPROGRESS: case -EINPROGRESS:
if (adapter->iface_type == MWIFIEX_USB)
adapter->data_sent = false;
break; break;
case 0: case 0:
mwifiex_write_data_complete(adapter, skb, 0, ret); mwifiex_write_data_complete(adapter, skb, 0, ret);