[PATCH] staging: r8188eu: remove cfg80211 residuals

[PATCH] staging: r8188eu: remove cfg80211 residuals

[Fabio Aiuto]

remove cfg80211 implementation residuals:
an headeer file and build condition in Kconfig
file.

Signed-off-by: Fabio Aiuto <fabioaiuto83@gmail.com>
---
Dear Greg and Larry,
I thought that cfg80211 had been implemented.
Should we add a TODO file telling developers to
do it in the near future? Is that a condition
for mainlining r8188eu? If so please drop this
patch and sorry for noise.

 drivers/staging/r8188eu/Kconfig               |  2 +-
 .../staging/r8188eu/include/ioctl_cfg80211.h  | 91 -------------------
 drivers/staging/r8188eu/os_dep/rtw_android.c  |  1 -
 3 files changed, 1 insertion(+), 93 deletions(-)
 delete mode 100644 drivers/staging/r8188eu/include/ioctl_cfg80211.h

diff --git a/drivers/staging/r8188eu/Kconfig b/drivers/staging/r8188eu/Kconfig
index dc1719d3f2e4..beb768416ab9 100644
--- a/drivers/staging/r8188eu/Kconfig
+++ b/drivers/staging/r8188eu/Kconfig
@@ -1,7 +1,7 @@
 # SPDX-License-Identifier: GPL-2.0
 config R8188EU
 	tristate "Realtek RTL8188EU Wireless LAN NIC driver"
-	depends on WLAN && USB && CFG80211
+	depends on WLAN && USB
 	depends on m
 	select WIRELESS_EXT
 	select WEXT_PRIV
diff --git a/drivers/staging/r8188eu/include/ioctl_cfg80211.h b/drivers/staging/r8188eu/include/ioctl_cfg80211.h
deleted file mode 100644
index e22481050ef8..000000000000
--- a/drivers/staging/r8188eu/include/ioctl_cfg80211.h
+++ /dev/null
@@ -1,91 +0,0 @@
-/* SPDX-License-Identifier: GPL-2.0 OR BSD-3-Clause */
-/* Copyright(c) 2007 - 2011 Realtek Corporation. i*/
-
-#ifndef __IOCTL_CFG80211_H__
-#define __IOCTL_CFG80211_H__
-
-struct rtw_wdev_invit_info {
-	u8 token;
-	u8 flags;
-	u8 status;
-	u8 req_op_ch;
-	u8 rsp_op_ch;
-};
-
-#define rtw_wdev_invit_info_init(invit_info) \
-	do { \
-		(invit_info)->token = 0; \
-		(invit_info)->flags = 0x00; \
-		(invit_info)->status = 0xff; \
-		(invit_info)->req_op_ch = 0; \
-		(invit_info)->rsp_op_ch = 0; \
-	} while (0)
-
-struct rtw_wdev_priv {
-	struct wireless_dev *rtw_wdev;
-
-	struct adapter *padapter;
-
-	struct cfg80211_scan_request *scan_request;
-	spinlock_t scan_req_lock;
-
-	struct net_device *pmon_ndev;/* for monitor interface */
-	char ifname_mon[IFNAMSIZ + 1]; /* name of monitor interface */
-
-	u8 p2p_enabled;
-
-	u8 provdisc_req_issued;
-
-	struct rtw_wdev_invit_info invit_info;
-
-	u8 bandroid_scan;
-	bool block;
-	bool power_mgmt;
-};
-
-#define wdev_to_priv(w) ((struct rtw_wdev_priv *)(wdev_priv(w)))
-
-#define wiphy_to_wdev(x)				\
-((struct wireless_dev *)(((struct rtw_wdev_priv *)wiphy_priv(x))->rtw_wdev))
-
-int rtw_wdev_alloc(struct adapter *padapter, struct device *dev);
-void rtw_wdev_free(struct wireless_dev *wdev);
-void rtw_wdev_unregister(struct wireless_dev *wdev);
-
-void rtw_cfg80211_init_wiphy(struct adapter *padapter);
-
-void rtw_cfg80211_surveydone_event_callback(struct adapter *padapter);
-
-void rtw_cfg80211_indicate_connect(struct adapter *padapter);
-void rtw_cfg80211_indicate_disconnect(struct adapter *padapter);
-void rtw_cfg80211_indicate_scan_done(struct rtw_wdev_priv *pwdev_priv,
-				     bool aborted);
-
-#ifdef CONFIG_88EU_AP_MODE
-void rtw_cfg80211_indicate_sta_assoc(struct adapter *padapter,
-				     u8 *pmgmt_frame, uint frame_len);
-void rtw_cfg80211_indicate_sta_disassoc(struct adapter *padapter,
-					unsigned char *da,
-					unsigned short reason);
-#endif /* CONFIG_88EU_AP_MODE */
-
-void rtw_cfg80211_issue_p2p_provision_request(struct adapter *padapter,
-					      const u8 *buf, size_t len);
-void rtw_cfg80211_rx_p2p_action_public(struct adapter *padapter,
-				       u8 *pmgmt_frame, uint frame_len);
-void rtw_cfg80211_rx_action_p2p(struct adapter *padapter, u8 *pmgmt_frame,
-				uint frame_len);
-void rtw_cfg80211_rx_action(struct adapter *adapter, u8 *frame,
-			    uint frame_len, const char *msg);
-
-int rtw_cfg80211_set_mgnt_wpsp2pie(struct net_device *net,
-				   char *buf, int len, int type);
-
-bool rtw_cfg80211_pwr_mgmt(struct adapter *adapter);
-
-#define rtw_cfg80211_rx_mgmt(dev, freq, sig_dbm, buf, len, gfp)		\
-	cfg80211_rx_mgmt(dev, freq, sig_dbm, buf, len, gfp)
-#define rtw_cfg80211_send_rx_assoc(dev, bss, buf, len)			\
-	cfg80211_send_rx_assoc(dev, bss, buf, len)
-
-#endif /* __IOCTL_CFG80211_H__ */
diff --git a/drivers/staging/r8188eu/os_dep/rtw_android.c b/drivers/staging/r8188eu/os_dep/rtw_android.c
index d666feb87a7a..7c5e5c8007e3 100644
--- a/drivers/staging/r8188eu/os_dep/rtw_android.c
+++ b/drivers/staging/r8188eu/os_dep/rtw_android.c
@@ -7,7 +7,6 @@
 #include "../include/rtw_android.h"
 #include "../include/osdep_service.h"
 #include "../include/rtw_debug.h"
-#include "../include/ioctl_cfg80211.h"
 #include "../include/rtw_ioctl_set.h"
 
 static const char *android_wifi_cmd_str[ANDROID_WIFI_CMD_MAX] = {
-- 
2.20.1

Re: [PATCH] staging: r8188eu: remove cfg80211 residuals

[Larry Finger]

On 8/12/21 8:27 AM, Fabio Aiuto wrote:
> remove cfg80211 implementation residuals:
> an headeer file and build condition in Kconfig
> file.
> 
> Signed-off-by: Fabio Aiuto<fabioaiuto83@gmail.com>
> ---
> Dear Greg and Larry,
> I thought that cfg80211 had been implemented.
> Should we add a TODO file telling developers to
> do it in the near future? Is that a condition
> for mainlining r8188eu? If so please drop this
> patch and sorry for noise.

I thought so too, but something has gone very wrong. Please hold off on this 
patch until I figure out why cfg80211 is not being used.

Larry

Re: [PATCH] staging: r8188eu: remove cfg80211 residuals

[Greg KH]

On Thu, Aug 12, 2021 at 11:51:56AM -0500, Larry Finger wrote:
> On 8/12/21 8:27 AM, Fabio Aiuto wrote:
> > remove cfg80211 implementation residuals:
> > an headeer file and build condition in Kconfig
> > file.
> > 
> > Signed-off-by: Fabio Aiuto<fabioaiuto83@gmail.com>
> > ---
> > Dear Greg and Larry,
> > I thought that cfg80211 had been implemented.
> > Should we add a TODO file telling developers to
> > do it in the near future? Is that a condition
> > for mainlining r8188eu? If so please drop this
> > patch and sorry for noise.
> 
> I thought so too, but something has gone very wrong. Please hold off on this
> patch until I figure out why cfg80211 is not being used.

That's odd, I'll drop this from my queue, we should be using cfg80211

Re: [PATCH] staging: r8188eu: remove cfg80211 residuals

[Phillip Potter]

On Fri, 13 Aug 2021 at 19:42, Larry Finger <Larry.Finger@lwfinger.net> wrote:
>
>
>
> On Fri, Aug 13, 2021 at 2:36 AM Greg KH <gregkh@linuxfoundation.org> wrote:
> > That's odd, I'll drop this from my queue, we should be using cfg80211
>
> I will be going dark for a while as I add the cfg80211 bits back in.
>
> One piece of good news. I dug out my PowerBook G4 with a PowerPC CPU and tested. Even with all the changes, the driver still works on a big-endian CPU.
>
> Larry
>
>

Thanks Larry, and awesome news - a PowerBook G4 - one machine I'm sad
I never owned back in the day :-)

Regards,
Phil