Path: csiph.com!news.mixmin.net!aioe.org!bofh.it!news.nic.it!robomod From: Ivan Safonov Newsgroups: linux.kernel Subject: [PATCH 22/34] staging:r8188eu: remove rtw_endofpktfile function Date: Fri, 07 Oct 2016 20:10:03 +0200 Message-ID: References: X-Original-To: Greg Kroah-Hartman , Kyle Kuffermann , Alexey Khoroshilov , devel@driverdev.osuosl.org, linux-kernel@vger.kernel.org Dkim-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=9k+XTOAg+ZWGhCoH6vOQMV2TYGN93jxMY07Cyob1zB8=; b=Uq1DpkX3X99DIHNvayoUOcaVarxnmjjhIb+ssNAZ75PHAGwOIDBNLEOEQEA/WXGBoa wSXZk9t47WE+C/ioZlUihH/lO5k1krQlcf4tshO+RxeH9WBMzsIe+ywUsD6j/rTDMzEk tjCwi/m8+1YFtzf17Jp2/Gc5Be4tjp0Ak4sQQ83llob5DFdPsmDUcDkMkt4cv+GASgdR Z2IrKj9mHImEJ99820JUUlMDYKjzq5oeH5m2l0i9Sx7BZ8RDNvaI52ZLLNg/NegAYRYX dJ5mJbKZ0VI/HQhwxKrfFoKJ95HxAGGwjS7OrdFKlNWmL88ZiqH8xVr3cE+Hgaf9IZm1 Ab5g== X-Google-Dkim-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=9k+XTOAg+ZWGhCoH6vOQMV2TYGN93jxMY07Cyob1zB8=; b=amBO8LFmCSoTQ56vfcmXMLS0pNvuBywQqy7J26anid4jnewxgWWrqwUlJqCI8wPpM/ drhOTEYXdHyxoikcuLOTJq75dpewdpr94USRQOhv6S7zFuoRK110bvCfZsCVFMEvVLC0 lZufMIjv2pCtqo2k9RRPVFfDDcUn+0Pmt147TRY7umo/5O+B8oxobTwPWmOvVpCvIraF 7tOe3+xEhxVZ27qa7/LoQG60bTGORcmQ7PhN5367+jlguuxtxBZXfx9Eb1xhKLf40y0r 47b41z2M/mLlnPE5vprviafkuOAIcQUEuTwu00M4ohty7CNVPfFEEmprKQ3Di2YEDjBS gY1A== X-Gm-Message-State: AA6/9Rmdo2Z/PIF8MX14snOH9pDfnQ8MIwRiqa2QmDhiJsBHCqAUeaxCZouMkpFAVNRc1g== X-Received: by 10.25.228.90 with SMTP id b87mr3951723lfh.61.1475863180338; Fri, 07 Oct 2016 10:59:40 -0700 (PDT) X-Mailer: git-send-email 2.7.3 Sender: robomod@news.nic.it List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Approved: robomod@news.nic.it Lines: 52 Organization: linux.* mail to news gateway X-Original-Cc: Ivan Safonov X-Original-Date: Sat, 8 Oct 2016 01:01:21 +0700 X-Original-Message-ID: <1475863293-27587-22-git-send-email-insafonov@gmail.com> X-Original-References: <1475863293-27587-1-git-send-email-insafonov@gmail.com> X-Original-Sender: linux-kernel-owner@vger.kernel.org Xref: csiph.com linux.kernel:1497443 rtw_endofpktfile is one-line function. Signed-off-by: Ivan Safonov --- drivers/staging/rtl8188eu/core/rtw_xmit.c | 2 +- drivers/staging/rtl8188eu/include/xmit_osdep.h | 1 - drivers/staging/rtl8188eu/os_dep/xmit_linux.c | 5 ----- 3 files changed, 1 insertion(+), 7 deletions(-) diff --git a/drivers/staging/rtl8188eu/core/rtw_xmit.c b/drivers/staging/rtl8188eu/core/rtw_xmit.c index 2b641f5..ca65f00 100644 --- a/drivers/staging/rtl8188eu/core/rtw_xmit.c +++ b/drivers/staging/rtl8188eu/core/rtw_xmit.c @@ -1064,7 +1064,7 @@ s32 rtw_xmitframe_coalesce(struct adapter *padapter, struct sk_buff *pkt, struct frg_inx++; - if (bmcst || rtw_endofpktfile(&pktfile)) { + if (bmcst || pktfile.pkt_len == 0) { pattrib->nr_frags = frg_inx; pattrib->last_txcmdsz = pattrib->hdrlen + pattrib->iv_len + ((pattrib->nr_frags == 1) ? llc_sz : 0) + diff --git a/drivers/staging/rtl8188eu/include/xmit_osdep.h b/drivers/staging/rtl8188eu/include/xmit_osdep.h index f96ca6a..f9b3841 100644 --- a/drivers/staging/rtl8188eu/include/xmit_osdep.h +++ b/drivers/staging/rtl8188eu/include/xmit_osdep.h @@ -47,7 +47,6 @@ void rtw_os_xmit_resource_free(struct adapter *padapter, uint rtw_remainder_len(struct pkt_file *pfile); void _rtw_open_pktfile(struct sk_buff *pkt, struct pkt_file *pfile); uint _rtw_pktfile_read(struct pkt_file *pfile, u8 *rmem, uint rlen); -int rtw_endofpktfile(struct pkt_file *pfile); void rtw_os_pkt_complete(struct adapter *padapter, struct sk_buff *pkt); void rtw_os_xmit_complete(struct adapter *padapter, diff --git a/drivers/staging/rtl8188eu/os_dep/xmit_linux.c b/drivers/staging/rtl8188eu/os_dep/xmit_linux.c index 4b1b04e..019ded9 100644 --- a/drivers/staging/rtl8188eu/os_dep/xmit_linux.c +++ b/drivers/staging/rtl8188eu/os_dep/xmit_linux.c @@ -59,11 +59,6 @@ uint _rtw_pktfile_read(struct pkt_file *pfile, u8 *rmem, uint rlen) return len; } -int rtw_endofpktfile(struct pkt_file *pfile) -{ - return pfile->pkt_len == 0; -} - int rtw_os_xmit_resource_alloc(struct adapter *padapter, struct xmit_buf *pxmitbuf, u32 alloc_sz) { int i; -- 2.7.3