From: Michael Straube <straube.linux@gmail.com>
To: gregkh@linuxfoundation.org
Cc: Larry.Finger@lwfinger.net, phil@philpotter.co.uk,
linux-staging@lists.linux.dev, linux-kernel@vger.kernel.org,
Michael Straube <straube.linux@gmail.com>
Subject: [PATCH 16/19] staging: r8188eu: make rtw_os_pkt_complete() static
Date: Sat, 20 Aug 2022 20:16:20 +0200 [thread overview]
Message-ID: <20220820181623.12497-17-straube.linux@gmail.com> (raw)
In-Reply-To: <20220820181623.12497-1-straube.linux@gmail.com>
The function rtw_os_pkt_complete() is only used in rtw_xmit.c.
Make it static.
Signed-off-by: Michael Straube <straube.linux@gmail.com>
---
drivers/staging/r8188eu/core/rtw_xmit.c | 18 ++++++++++++++++++
drivers/staging/r8188eu/include/rtw_xmit.h | 3 +++
drivers/staging/r8188eu/include/xmit_osdep.h | 4 ----
drivers/staging/r8188eu/os_dep/xmit_linux.c | 20 --------------------
4 files changed, 21 insertions(+), 24 deletions(-)
diff --git a/drivers/staging/r8188eu/core/rtw_xmit.c b/drivers/staging/r8188eu/core/rtw_xmit.c
index 760b115938f2..c324dada4f5b 100644
--- a/drivers/staging/r8188eu/core/rtw_xmit.c
+++ b/drivers/staging/r8188eu/core/rtw_xmit.c
@@ -229,6 +229,24 @@ s32 _rtw_init_xmit_priv(struct xmit_priv *pxmitpriv, struct adapter *padapter)
return res;
}
+static void rtw_os_pkt_complete(struct adapter *padapter, struct sk_buff *pkt)
+{
+ u16 queue;
+ struct xmit_priv *pxmitpriv = &padapter->xmitpriv;
+
+ queue = skb_get_queue_mapping(pkt);
+ if (padapter->registrypriv.wifi_spec) {
+ if (__netif_subqueue_stopped(padapter->pnetdev, queue) &&
+ (pxmitpriv->hwxmits[queue].accnt < WMM_XMIT_THRESHOLD))
+ netif_wake_subqueue(padapter->pnetdev, queue);
+ } else {
+ if (__netif_subqueue_stopped(padapter->pnetdev, queue))
+ netif_wake_subqueue(padapter->pnetdev, queue);
+ }
+
+ dev_kfree_skb_any(pkt);
+}
+
void rtw_xmit_complete(struct adapter *padapter, struct xmit_frame *pxframe)
{
if (pxframe->pkt)
diff --git a/drivers/staging/r8188eu/include/rtw_xmit.h b/drivers/staging/r8188eu/include/rtw_xmit.h
index 2475ca084265..be9a7afad8ea 100644
--- a/drivers/staging/r8188eu/include/rtw_xmit.h
+++ b/drivers/staging/r8188eu/include/rtw_xmit.h
@@ -7,6 +7,9 @@
#include "osdep_service.h"
#include "drv_types.h"
+#define NR_XMITFRAME 256
+#define WMM_XMIT_THRESHOLD (NR_XMITFRAME * 2 / 5)
+
#define MAX_XMITBUF_SZ (20480) /* 20k */
#define NR_XMITBUFF (4)
diff --git a/drivers/staging/r8188eu/include/xmit_osdep.h b/drivers/staging/r8188eu/include/xmit_osdep.h
index b881399fd989..ae738d215e99 100644
--- a/drivers/staging/r8188eu/include/xmit_osdep.h
+++ b/drivers/staging/r8188eu/include/xmit_osdep.h
@@ -11,8 +11,6 @@ extern int rtw_ht_enable;
extern int rtw_cbw40_enable;
extern int rtw_ampdu_enable;/* for enable tx_ampdu */
-#define NR_XMITFRAME 256
-
struct xmit_priv;
struct pkt_attrib;
struct sta_xmit_priv;
@@ -21,6 +19,4 @@ struct xmit_buf;
int rtw_xmit_entry(struct sk_buff *pkt, struct net_device *pnetdev);
-void rtw_os_pkt_complete(struct adapter *padapter, struct sk_buff *pkt);
-
#endif /* __XMIT_OSDEP_H_ */
diff --git a/drivers/staging/r8188eu/os_dep/xmit_linux.c b/drivers/staging/r8188eu/os_dep/xmit_linux.c
index d67508096209..4721447a02e8 100644
--- a/drivers/staging/r8188eu/os_dep/xmit_linux.c
+++ b/drivers/staging/r8188eu/os_dep/xmit_linux.c
@@ -11,26 +11,6 @@
#include "../include/osdep_intf.h"
#include "../include/usb_osintf.h"
-#define WMM_XMIT_THRESHOLD (NR_XMITFRAME * 2 / 5)
-
-void rtw_os_pkt_complete(struct adapter *padapter, struct sk_buff *pkt)
-{
- u16 queue;
- struct xmit_priv *pxmitpriv = &padapter->xmitpriv;
-
- queue = skb_get_queue_mapping(pkt);
- if (padapter->registrypriv.wifi_spec) {
- if (__netif_subqueue_stopped(padapter->pnetdev, queue) &&
- (pxmitpriv->hwxmits[queue].accnt < WMM_XMIT_THRESHOLD))
- netif_wake_subqueue(padapter->pnetdev, queue);
- } else {
- if (__netif_subqueue_stopped(padapter->pnetdev, queue))
- netif_wake_subqueue(padapter->pnetdev, queue);
- }
-
- dev_kfree_skb_any(pkt);
-}
-
static void rtw_check_xmit_resource(struct adapter *padapter, struct sk_buff *pkt)
{
struct xmit_priv *pxmitpriv = &padapter->xmitpriv;
--
2.37.2
next prev parent reply other threads:[~2022-08-20 18:16 UTC|newest]
Thread overview: 23+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-08-20 18:16 [PATCH 00/19] staging: r8188eu: migrate os_dep/xmit_linux.c Michael Straube
2022-08-20 18:16 ` [PATCH 01/19] staging: r8188eu: make rtw_remainder_len() static Michael Straube
2022-08-21 19:57 ` Philipp Hortmann
2022-08-21 20:42 ` Michael Straube
2022-08-20 18:16 ` [PATCH 02/19] staging: r8188eu: make rtw_os_xmit_schedule() static Michael Straube
2022-08-20 18:16 ` [PATCH 03/19] staging: r8188eu: rename rtw_os_xmit_schedule() Michael Straube
2022-08-20 18:16 ` [PATCH 04/19] staging: r8188eu: make rtw_os_xmit_resource_alloc() static Michael Straube
2022-08-20 18:16 ` [PATCH 05/19] staging: r8188eu: rename rtw_os_xmit_resource_alloc() Michael Straube
2022-08-20 18:16 ` [PATCH 06/19] staging: r8188eu: make rtw_os_xmit_resource_free() static Michael Straube
2022-08-20 18:16 ` [PATCH 07/19] staging: r8188eu: rename rtw_os_xmit_resource_free() Michael Straube
2022-08-20 18:16 ` [PATCH 08/19] staging: r8188eu: make _rtw_open_pktfile() static Michael Straube
2022-08-20 18:16 ` [PATCH 09/19] staging: r8188eu: rename _rtw_open_pktfile() Michael Straube
2022-08-20 18:16 ` [PATCH 10/19] staging: r8188eu: make _rtw_pktfile_read() static Michael Straube
2022-08-20 18:16 ` [PATCH 11/19] staging: r8188eu: rename _rtw_pktfile_read() Michael Straube
2022-08-20 18:16 ` [PATCH 12/19] staging: r8188eu: remove unnecessary initialization to zero Michael Straube
2022-08-20 18:16 ` [PATCH 13/19] staging: r8188eu: move struct pkt_file to rtw_xmit.h Michael Straube
2022-08-20 18:16 ` [PATCH 14/19] staging: r8188eu: move rtw_os_xmit_complete() to rtw_xmit.c Michael Straube
2022-08-20 18:16 ` [PATCH 15/19] staging: r8188eu: rename rtw_os_xmit_complete() Michael Straube
2022-08-20 18:16 ` Michael Straube [this message]
2022-08-20 18:16 ` [PATCH 17/19] staging: r8188eu: rename rtw_os_pkt_complete() Michael Straube
2022-08-20 18:16 ` [PATCH 18/19] staging: r8188eu: remove os_dep/xmit_linux.c Michael Straube
2022-08-20 18:16 ` [PATCH 19/19] staging: r8188eu: remove xmit_osdep.h Michael Straube
2022-08-22 17:58 ` [PATCH 00/19] staging: r8188eu: migrate os_dep/xmit_linux.c Philipp Hortmann
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20220820181623.12497-17-straube.linux@gmail.com \
--to=straube.linux@gmail.com \
--cc=Larry.Finger@lwfinger.net \
--cc=gregkh@linuxfoundation.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-staging@lists.linux.dev \
--cc=phil@philpotter.co.uk \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.