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 13/19] staging: r8188eu: move struct pkt_file to rtw_xmit.h
Date: Sat, 20 Aug 2022 20:16:17 +0200 [thread overview]
Message-ID: <20220820181623.12497-14-straube.linux@gmail.com> (raw)
In-Reply-To: <20220820181623.12497-1-straube.linux@gmail.com>
The code that uses struct pkt_file has been moved to rtw_xmit.c.
Move the structure definition to rtw_xmit.h.
Signed-off-by: Michael Straube <straube.linux@gmail.com>
---
drivers/staging/r8188eu/include/rtw_xmit.h | 9 +++++++++
drivers/staging/r8188eu/include/xmit_osdep.h | 9 ---------
2 files changed, 9 insertions(+), 9 deletions(-)
diff --git a/drivers/staging/r8188eu/include/rtw_xmit.h b/drivers/staging/r8188eu/include/rtw_xmit.h
index 034a9f8f51c9..0e9471fb19e4 100644
--- a/drivers/staging/r8188eu/include/rtw_xmit.h
+++ b/drivers/staging/r8188eu/include/rtw_xmit.h
@@ -304,6 +304,15 @@ struct xmit_priv {
struct submit_ctx ack_tx_ops;
};
+struct pkt_file {
+ struct sk_buff *pkt;
+ size_t pkt_len; /* the remainder length of the open_file */
+ unsigned char *cur_buffer;
+ u8 *buf_start;
+ u8 *cur_addr;
+ size_t buf_len;
+};
+
struct xmit_buf *rtw_alloc_xmitbuf_ext(struct xmit_priv *pxmitpriv);
s32 rtw_free_xmitbuf_ext(struct xmit_priv *pxmitpriv,
struct xmit_buf *pxmitbuf);
diff --git a/drivers/staging/r8188eu/include/xmit_osdep.h b/drivers/staging/r8188eu/include/xmit_osdep.h
index bcecf0bb2b18..612cdab52a9f 100644
--- a/drivers/staging/r8188eu/include/xmit_osdep.h
+++ b/drivers/staging/r8188eu/include/xmit_osdep.h
@@ -7,15 +7,6 @@
#include "osdep_service.h"
#include "drv_types.h"
-struct pkt_file {
- struct sk_buff *pkt;
- size_t pkt_len; /* the remainder length of the open_file */
- unsigned char *cur_buffer;
- u8 *buf_start;
- u8 *cur_addr;
- size_t buf_len;
-};
-
extern int rtw_ht_enable;
extern int rtw_cbw40_enable;
extern int rtw_ampdu_enable;/* for enable tx_ampdu */
--
2.37.2
next prev parent reply other threads:[~2022-08-20 18:17 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 ` Michael Straube [this message]
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 ` [PATCH 16/19] staging: r8188eu: make rtw_os_pkt_complete() static Michael Straube
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-14-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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox