diff options
Diffstat (limited to 'drivers/staging/rtl8192e/rtl8192e/r8192E_cmdpkt.c')
-rw-r--r-- | drivers/staging/rtl8192e/rtl8192e/r8192E_cmdpkt.c | 62 |
1 files changed, 35 insertions, 27 deletions
diff --git a/drivers/staging/rtl8192e/rtl8192e/r8192E_cmdpkt.c b/drivers/staging/rtl8192e/rtl8192e/r8192E_cmdpkt.c index 9ddabf59784c..f9003a28cae2 100644 --- a/drivers/staging/rtl8192e/rtl8192e/r8192E_cmdpkt.c +++ b/drivers/staging/rtl8192e/rtl8192e/r8192E_cmdpkt.c @@ -6,10 +6,6 @@ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for * more details. * - * You should have received a copy of the GNU General Public License along with - * this program; if not, write to the Free Software Foundation, Inc., - * 51 Franklin Street, Fifth Floor, Boston, MA 02110, USA - * * The full GNU General Public License is included in this distribution in the * file called LICENSE. * @@ -21,15 +17,13 @@ #include "r8192E_hw.h" #include "r8192E_cmdpkt.h" -bool rtl92e_send_cmd_pkt(struct net_device *dev, u8 *code_virtual_address, - u32 packettype, u32 buffer_len) +bool rtl92e_send_cmd_pkt(struct net_device *dev, u32 type, const void *data, + u32 len) { bool rt_status = true; struct r8192_priv *priv = rtllib_priv(dev); - u16 frag_threshold; u16 frag_length = 0, frag_offset = 0; - struct rt_firmware *pfirmware = priv->pFirmware; struct sk_buff *skb; unsigned char *seg_ptr; struct cb_desc *tcb_desc; @@ -37,22 +31,23 @@ bool rtl92e_send_cmd_pkt(struct net_device *dev, u8 *code_virtual_address, struct tx_fwinfo_8190pci *pTxFwInfo = NULL; - RT_TRACE(COMP_CMDPKT, "%s(),buffer_len is %d\n", __func__, buffer_len); - rtl92e_init_fw_param(dev); - frag_threshold = pfirmware->cmdpacket_frag_thresold; + RT_TRACE(COMP_CMDPKT, "%s(),buffer_len is %d\n", __func__, len); do { - if ((buffer_len - frag_offset) > frag_threshold) { - frag_length = frag_threshold; + if ((len - frag_offset) > CMDPACKET_FRAG_SIZE) { + frag_length = CMDPACKET_FRAG_SIZE; bLastIniPkt = 0; } else { - frag_length = (u16)(buffer_len - frag_offset); + frag_length = (u16)(len - frag_offset); bLastIniPkt = 1; } - skb = dev_alloc_skb(frag_length + - priv->rtllib->tx_headroom + 4); + if (type == DESC_PACKET_TYPE_NORMAL) + skb = dev_alloc_skb(frag_length + + priv->rtllib->tx_headroom + 4); + else + skb = dev_alloc_skb(frag_length + 4); if (skb == NULL) { rt_status = false; @@ -62,24 +57,37 @@ bool rtl92e_send_cmd_pkt(struct net_device *dev, u8 *code_virtual_address, memcpy((unsigned char *)(skb->cb), &dev, sizeof(dev)); tcb_desc = (struct cb_desc *)(skb->cb + MAX_DEV_ADDR_SIZE); tcb_desc->queue_index = TXCMD_QUEUE; - tcb_desc->bCmdOrInit = DESC_PACKET_TYPE_NORMAL; + tcb_desc->bCmdOrInit = type; tcb_desc->bLastIniPkt = bLastIniPkt; - tcb_desc->pkt_size = frag_length; - seg_ptr = skb_put(skb, priv->rtllib->tx_headroom); - pTxFwInfo = (struct tx_fwinfo_8190pci *)seg_ptr; - memset(pTxFwInfo, 0, sizeof(struct tx_fwinfo_8190pci)); - memset(pTxFwInfo, 0x12, 8); + if (type == DESC_PACKET_TYPE_NORMAL) { + tcb_desc->pkt_size = frag_length; - seg_ptr = skb_put(skb, frag_length); - memcpy(seg_ptr, code_virtual_address, (u32)frag_length); + seg_ptr = skb_put(skb, priv->rtllib->tx_headroom); + pTxFwInfo = (struct tx_fwinfo_8190pci *)seg_ptr; + memset(pTxFwInfo, 0, sizeof(struct tx_fwinfo_8190pci)); + memset(pTxFwInfo, 0x12, 8); + } else { + tcb_desc->txbuf_size = (u16)frag_length; + } - priv->rtllib->softmac_hard_start_xmit(skb, dev); + seg_ptr = skb_put(skb, frag_length); + memcpy(seg_ptr, data, (u32)frag_length); + + if (type == DESC_PACKET_TYPE_INIT && + (!priv->rtllib->check_nic_enough_desc(dev, TXCMD_QUEUE) || + (!skb_queue_empty(&priv->rtllib->skb_waitQ[TXCMD_QUEUE])) || + (priv->rtllib->queue_stop))) { + skb_queue_tail(&priv->rtllib->skb_waitQ[TXCMD_QUEUE], + skb); + } else { + priv->rtllib->softmac_hard_start_xmit(skb, dev); + } - code_virtual_address += frag_length; + data += frag_length; frag_offset += frag_length; - } while (frag_offset < buffer_len); + } while (frag_offset < len); rtl92e_writeb(dev, TPPoll, TPPoll_CQ); Failed: |