mirror of
https://github.com/LibreELEC/LibreELEC.tv
synced 2025-09-24 19:46:01 +07:00
299d664a9b
move 5.100.82.112 patches to their own folder for safekeeping then add patches for 6.20.155.1 (sources are uploaded) and set meta
65 lines
2.6 KiB
Diff
65 lines
2.6 KiB
Diff
--- a/x86-32/src/wl/sys/wl_cfg80211.c
|
|
+++ b/x86-32/src/wl/sys/wl_cfg80211.c
|
|
@@ -46,7 +46,10 @@ u32 wl_dbg_level = WL_DBG_ERR | WL_DBG_INFO;
|
|
|
|
static s32 wl_cfg80211_change_iface(struct wiphy *wiphy, struct net_device *ndev,
|
|
enum nl80211_iftype type, u32 *flags, struct vif_params *params);
|
|
-static s32 wl_cfg80211_scan(struct wiphy *wiphy, struct net_device *ndev,
|
|
+static s32 wl_cfg80211_scan(struct wiphy *wiphy,
|
|
+#if LINUX_VERSION_CODE < KERNEL_VERSION(3, 6, 0)
|
|
+ struct net_device *ndev,
|
|
+#endif
|
|
struct cfg80211_scan_request *request);
|
|
static s32 wl_cfg80211_set_wiphy_params(struct wiphy *wiphy, u32 changed);
|
|
static s32 wl_cfg80211_join_ibss(struct wiphy *wiphy, struct net_device *dev,
|
|
@@ -482,9 +485,15 @@ wl_cfg80211_change_iface(struct wiphy *wiphy, struct net_device *ndev,
|
|
}
|
|
|
|
static s32
|
|
-wl_cfg80211_scan(struct wiphy *wiphy, struct net_device *ndev,
|
|
+wl_cfg80211_scan(struct wiphy *wiphy,
|
|
+#if LINUX_VERSION_CODE < KERNEL_VERSION(3, 6, 0)
|
|
+ struct net_device *ndev,
|
|
+#endif
|
|
struct cfg80211_scan_request *request)
|
|
{
|
|
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(3, 6, 0)
|
|
+ struct net_device *ndev = request->wdev->netdev;
|
|
+#endif
|
|
struct wl_cfg80211_priv *wl = ndev_to_wl(ndev);
|
|
struct cfg80211_ssid *ssids;
|
|
struct wl_cfg80211_scan_req *sr = wl_to_sr(wl);
|
|
|
|
--- a/x86-64/src/wl/sys/wl_cfg80211.c
|
|
+++ b/x86-64/src/wl/sys/wl_cfg80211.c
|
|
@@ -46,7 +46,10 @@ u32 wl_dbg_level = WL_DBG_ERR | WL_DBG_INFO;
|
|
|
|
static s32 wl_cfg80211_change_iface(struct wiphy *wiphy, struct net_device *ndev,
|
|
enum nl80211_iftype type, u32 *flags, struct vif_params *params);
|
|
-static s32 wl_cfg80211_scan(struct wiphy *wiphy, struct net_device *ndev,
|
|
+static s32 wl_cfg80211_scan(struct wiphy *wiphy,
|
|
+#if LINUX_VERSION_CODE < KERNEL_VERSION(3, 6, 0)
|
|
+ struct net_device *ndev,
|
|
+#endif
|
|
struct cfg80211_scan_request *request);
|
|
static s32 wl_cfg80211_set_wiphy_params(struct wiphy *wiphy, u32 changed);
|
|
static s32 wl_cfg80211_join_ibss(struct wiphy *wiphy, struct net_device *dev,
|
|
@@ -482,9 +485,15 @@ wl_cfg80211_change_iface(struct wiphy *wiphy, struct net_device *ndev,
|
|
}
|
|
|
|
static s32
|
|
-wl_cfg80211_scan(struct wiphy *wiphy, struct net_device *ndev,
|
|
+wl_cfg80211_scan(struct wiphy *wiphy,
|
|
+#if LINUX_VERSION_CODE < KERNEL_VERSION(3, 6, 0)
|
|
+ struct net_device *ndev,
|
|
+#endif
|
|
struct cfg80211_scan_request *request)
|
|
{
|
|
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(3, 6, 0)
|
|
+ struct net_device *ndev = request->wdev->netdev;
|
|
+#endif
|
|
struct wl_cfg80211_priv *wl = ndev_to_wl(ndev);
|
|
struct cfg80211_ssid *ssids;
|
|
struct wl_cfg80211_scan_req *sr = wl_to_sr(wl);
|
|
|