staging: rtl8192u: remove redundant macro definitions

Several ieee80211_* symbol names are extended with _rsl tag using
macros. This is done to avoid a conflict when a similar symbol is
already in use in another part of kernel and may lead to conflicts.
However, most of these base symbol names are not found to being used
anywhere in the code and hence are not useful today. These symbols
are not used outside of the module and hence can be safely removed.
The code continues to use the original symbol names.

Suggested-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Signed-off-by: Deepak R Varma <drv@mailo.com>
Link: https://lore.kernel.org/r/17f69a042e215c484931a0327fdf7775eea5f918.1667930292.git.drv@mailo.com
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/drivers/staging/rtl8192u/ieee80211/ieee80211.h b/drivers/staging/rtl8192u/ieee80211/ieee80211.h
index 00c0745..c5c43d2 100644 (file)
--- a/drivers/staging/rtl8192u/ieee80211/ieee80211.h
+++ b/drivers/staging/rtl8192u/ieee80211/ieee80211.h
@@ -223,71 +223,10 @@ struct cb_desc {
 #define MAX_IE_LEN  0xff
 
 // added for kernel conflict
-#define ieee80211_crypt_deinit_entries ieee80211_crypt_deinit_entries_rsl
-#define ieee80211_crypt_deinit_handler ieee80211_crypt_deinit_handler_rsl
-#define ieee80211_crypt_delayed_deinit ieee80211_crypt_delayed_deinit_rsl
-#define ieee80211_register_crypto_ops  ieee80211_register_crypto_ops_rsl
-#define ieee80211_unregister_crypto_ops ieee80211_unregister_crypto_ops_rsl
-#define ieee80211_get_crypto_ops       ieee80211_get_crypto_ops_rsl
-
-#define ieee80211_ccmp_null            ieee80211_ccmp_null_rsl
-
-#define free_ieee80211                 free_ieee80211_rsl
-#define alloc_ieee80211                        alloc_ieee80211_rsl
-
-#define ieee80211_rx                   ieee80211_rx_rsl
-#define ieee80211_rx_mgt               ieee80211_rx_mgt_rsl
-
-#define ieee80211_get_beacon           ieee80211_get_beacon_rsl
 #define ieee80211_wake_queue           ieee80211_wake_queue_rsl
 #define ieee80211_stop_queue           ieee80211_stop_queue_rsl
-#define ieee80211_reset_queue          ieee80211_reset_queue_rsl
-#define ieee80211_softmac_stop_protocol        ieee80211_softmac_stop_protocol_rsl
-#define ieee80211_softmac_start_protocol ieee80211_softmac_start_protocol_rsl
-#define ieee80211_is_shortslot         ieee80211_is_shortslot_rsl
-#define ieee80211_is_54g               ieee80211_is_54g_rsl
-#define ieee80211_wpa_supplicant_ioctl ieee80211_wpa_supplicant_ioctl_rsl
-#define ieee80211_ps_tx_ack            ieee80211_ps_tx_ack_rsl
-#define ieee80211_softmac_xmit         ieee80211_softmac_xmit_rsl
-#define ieee80211_stop_send_beacons    ieee80211_stop_send_beacons_rsl
 #define notify_wx_assoc_event          notify_wx_assoc_event_rsl
 #define SendDisassociation             SendDisassociation_rsl
-#define ieee80211_disassociate         ieee80211_disassociate_rsl
-#define ieee80211_start_send_beacons   ieee80211_start_send_beacons_rsl
-#define ieee80211_stop_scan            ieee80211_stop_scan_rsl
-#define ieee80211_send_probe_requests  ieee80211_send_probe_requests_rsl
-#define ieee80211_softmac_scan_syncro  ieee80211_softmac_scan_syncro_rsl
-#define ieee80211_start_scan_syncro    ieee80211_start_scan_syncro_rsl
-
-#define ieee80211_wx_get_essid         ieee80211_wx_get_essid_rsl
-#define ieee80211_wx_set_essid         ieee80211_wx_set_essid_rsl
-#define ieee80211_wx_set_rate          ieee80211_wx_set_rate_rsl
-#define ieee80211_wx_get_rate          ieee80211_wx_get_rate_rsl
-#define ieee80211_wx_set_wap           ieee80211_wx_set_wap_rsl
-#define ieee80211_wx_get_wap           ieee80211_wx_get_wap_rsl
-#define ieee80211_wx_set_mode          ieee80211_wx_set_mode_rsl
-#define ieee80211_wx_get_mode          ieee80211_wx_get_mode_rsl
-#define ieee80211_wx_set_scan          ieee80211_wx_set_scan_rsl
-#define ieee80211_wx_get_freq          ieee80211_wx_get_freq_rsl
-#define ieee80211_wx_set_freq          ieee80211_wx_set_freq_rsl
-#define ieee80211_wx_set_rawtx         ieee80211_wx_set_rawtx_rsl
-#define ieee80211_wx_get_name          ieee80211_wx_get_name_rsl
-#define ieee80211_wx_set_power         ieee80211_wx_set_power_rsl
-#define ieee80211_wx_get_power         ieee80211_wx_get_power_rsl
-#define ieee80211_wlan_frequencies     ieee80211_wlan_frequencies_rsl
-#define ieee80211_wx_set_rts           ieee80211_wx_set_rts_rsl
-#define ieee80211_wx_get_rts           ieee80211_wx_get_rts_rsl
-
-#define ieee80211_txb_free             ieee80211_txb_free_rsl
-
-#define ieee80211_wx_set_gen_ie                ieee80211_wx_set_gen_ie_rsl
-#define ieee80211_wx_get_scan          ieee80211_wx_get_scan_rsl
-#define ieee80211_wx_set_encode                ieee80211_wx_set_encode_rsl
-#define ieee80211_wx_get_encode                ieee80211_wx_get_encode_rsl
-#define ieee80211_wx_set_mlme          ieee80211_wx_set_mlme_rsl
-#define ieee80211_wx_set_auth          ieee80211_wx_set_auth_rsl
-#define ieee80211_wx_set_encode_ext    ieee80211_wx_set_encode_ext_rsl
-#define ieee80211_wx_get_encode_ext    ieee80211_wx_get_encode_ext_rsl
 
 
 struct ieee_param {