staging: rtl8723au: update_txdesc(): bagg_pkt is always false
authorJes Sorensen <Jes.Sorensen@redhat.com>
Sun, 22 Mar 2015 23:09:43 +0000 (19:09 -0400)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Mon, 23 Mar 2015 21:40:29 +0000 (22:40 +0100)
Signed-off-by: Jes Sorensen <Jes.Sorensen@redhat.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
drivers/staging/rtl8723au/hal/rtl8723au_xmit.c

index 1759487..6bc1297 100644 (file)
@@ -130,7 +130,7 @@ static void fill_txdesc_phy(struct pkt_attrib *pattrib, __le32 *pdw)
        }
 }
 
-static s32 update_txdesc(struct xmit_frame *pxmitframe, u8 *pmem, s32 sz, u8 bagg_pkt)
+static s32 update_txdesc(struct xmit_frame *pxmitframe, u8 *pmem, s32 sz)
 {
        int     pull = 0;
        uint    qsel;
@@ -143,7 +143,7 @@ static s32 update_txdesc(struct xmit_frame *pxmitframe, u8 *pmem, s32 sz, u8 bag
        struct mlme_ext_info    *pmlmeinfo = &pmlmeext->mlmext_info;
        int     bmcst = is_multicast_ether_addr(pattrib->ra);
 
-       if ((!bagg_pkt) && (urb_zero_packet_chk(padapter, sz) == 0)) {
+       if (urb_zero_packet_chk(padapter, sz) == 0) {
                ptxdesc = (struct tx_desc *)(pmem+PACKET_OFFSET_SZ);
                pull = 1;
                pxmitframe->pkt_offset--;
@@ -320,7 +320,7 @@ static int rtw_dump_xframe(struct rtw_adapter *padapter,
                        sz = pattrib->last_txcmdsz;
                }
 
-               pull = update_txdesc(pxmitframe, mem_addr, sz, false);
+               pull = update_txdesc(pxmitframe, mem_addr, sz);
 
                if (pull) {
                        mem_addr += PACKET_OFFSET_SZ; /* pull txdesc head */