forked from ~ljy/RK356X_SDK_RELEASE

hc
2024-05-13 9d77db3c730780c8ef5ccd4b66403ff5675cfe4e
kernel/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd/wl_cfg80211.h
old mode 100644new mode 100755
....@@ -1959,17 +1959,14 @@
19591959 u32 join_iovar_ver;
19601960 struct delayed_work ap_work; /* AP linkup timeout handler */
19611961 wl_event_idx_t eidx; /* event state tracker */
1962
+#if defined (WL_SCHED_SCAN) && defined (SCHED_SCAN_DELAYED_WORK)
1963
+ struct delayed_work sched_scan_stop_work;
1964
+#endif
19621965 #ifdef WL_P2P_6G
19631966 bool p2p_6g_enabled; /* P2P 6G support enabled */
19641967 #endif /* WL_P2P_6G */
19651968 u32 halpid;
19661969 u8 country[WLC_CNTRY_BUF_SZ];
1967
-#ifdef BCMDBUS
1968
- bool bus_resuming;
1969
-#endif /* BCMDBUS */
1970
-#ifdef WL_ROAM_WAR
1971
- struct ether_addr roaming_bssid;
1972
-#endif /* WL_ROAM_WAR */
19731970 #if defined(RSSIAVG)
19741971 wl_rssi_cache_ctrl_t g_rssi_cache_ctrl;
19751972 wl_rssi_cache_ctrl_t g_connected_rssi_cache_ctrl;
....@@ -3045,15 +3042,6 @@
30453042 } \
30463043 } while (0)
30473044
3048
-#define WL_CHANNEL_COPY_FLAG(band_chan_arr) \
3049
-do { \
3050
- u32 arr_size, k; \
3051
- arr_size = ARRAYSIZE(band_chan_arr); \
3052
- for (k = 0; k < arr_size; k++) { \
3053
- band_chan_arr[k].orig_flags = band_chan_arr[k].flags; \
3054
- } \
3055
-} while (0)
3056
-
30573045 #if (LINUX_VERSION_CODE >= KERNEL_VERSION(3, 9, 0))
30583046 #define CFG80211_PUT_BSS(wiphy, bss) cfg80211_put_bss(wiphy, bss);
30593047 #else
....@@ -3103,14 +3091,6 @@
31033091 extern bool wl_customer6_legacy_chip_check(struct bcm_cfg80211 *cfg,
31043092 struct net_device *ndev);
31053093 #endif /* CUSTOMER_HW6 */
3106
-#if !defined(WL_TWT) && defined(WL_TWT_HAL_IF)
3107
-extern s32 wl_cfgvendor_notify_twt_event(struct bcm_cfg80211 *cfg,
3108
- bcm_struct_cfgdev *cfgdev, const wl_event_msg_t *e, void *data);
3109
-#endif /* !WL_TWT && WL_TWT_HAL_IF */
3110
-#ifdef BCMDBUS
3111
-s32
3112
-__wl_cfg80211_up_resume(dhd_pub_t *dhd);
3113
-#endif /* BCMDBUS */
31143094 void wl_wlfc_enable(struct bcm_cfg80211 *cfg, bool enable);
31153095 s32 wl_handle_join(struct bcm_cfg80211 *cfg, struct net_device *dev,
31163096 wlcfg_assoc_info_t *assoc_info);