mirror of
https://github.com/terrapkg/packages.git
synced 2026-06-02 09:52:18 +00:00
madonuko
85 lines
4.1 KiB
Diff
85 lines
4.1 KiB
Diff
diff -Naur hybrid-v35_64-nodebug-pcoem-6_30_223_271.orig/src/wl/sys/wl_cfg80211_hybrid.c hybrid-v35_64-nodebug-pcoem-6_30_223_271/src/wl/sys/wl_cfg80211_hybrid.c
|
|
--- hybrid-v35_64-nodebug-pcoem-6_30_223_271.orig/src/wl/sys/wl_cfg80211_hybrid.c 2022-10-17 01:08:31.537677649 +0200
|
|
+++ hybrid-v35_64-nodebug-pcoem-6_30_223_271/src/wl/sys/wl_cfg80211_hybrid.c 2023-01-03 09:20:31.743032501 +0100
|
|
@@ -107,14 +107,25 @@
|
|
static s32 wl_cfg80211_get_tx_power(struct wiphy *wiphy, s32 *dbm);
|
|
#endif
|
|
|
|
-#if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 38)
|
|
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(6, 1, 0)
|
|
+static s32 wl_cfg80211_config_default_key(struct wiphy *wiphy,
|
|
+ struct net_device *dev, int link_id, u8 key_idx, bool unicast, bool multicast);
|
|
+#elif LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 38)
|
|
static s32 wl_cfg80211_config_default_key(struct wiphy *wiphy,
|
|
struct net_device *dev, u8 key_idx, bool unicast, bool multicast);
|
|
#else
|
|
static s32 wl_cfg80211_config_default_key(struct wiphy *wiphy,
|
|
struct net_device *dev, u8 key_idx);
|
|
#endif
|
|
-#if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 37)
|
|
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(6, 1, 0)
|
|
+static s32 wl_cfg80211_add_key(struct wiphy *wiphy, struct net_device *dev,
|
|
+ int link_id, u8 key_idx, bool pairwise, const u8 *mac_addr, struct key_params *params);
|
|
+static s32 wl_cfg80211_del_key(struct wiphy *wiphy, struct net_device *dev,
|
|
+ int link_id, u8 key_idx, bool pairwise, const u8 *mac_addr);
|
|
+static s32 wl_cfg80211_get_key(struct wiphy *wiphy, struct net_device *dev,
|
|
+ int link_id, u8 key_idx, bool pairwise, const u8 *mac_addr,
|
|
+ void *cookie, void (*callback) (void *cookie, struct key_params *params));
|
|
+#elif LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 37)
|
|
static s32 wl_cfg80211_add_key(struct wiphy *wiphy, struct net_device *dev,
|
|
u8 key_idx, bool pairwise, const u8 *mac_addr, struct key_params *params);
|
|
static s32 wl_cfg80211_del_key(struct wiphy *wiphy, struct net_device *dev,
|
|
@@ -1237,7 +1248,11 @@
|
|
return err;
|
|
}
|
|
|
|
-#if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 38)
|
|
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(6, 1, 0)
|
|
+static s32
|
|
+wl_cfg80211_config_default_key(struct wiphy *wiphy,
|
|
+ struct net_device *dev, int link_id, u8 key_idx, bool unicast, bool multicast)
|
|
+#elif LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 38)
|
|
static s32
|
|
wl_cfg80211_config_default_key(struct wiphy *wiphy,
|
|
struct net_device *dev, u8 key_idx, bool unicast, bool multicast)
|
|
@@ -1262,7 +1277,11 @@
|
|
return 0;
|
|
}
|
|
|
|
-#if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 37)
|
|
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(6, 1, 0)
|
|
+static s32
|
|
+wl_cfg80211_add_key(struct wiphy *wiphy, struct net_device *dev,
|
|
+ int link_id, u8 key_idx, bool pairwise, const u8 *mac_addr, struct key_params *params)
|
|
+#elif LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 37)
|
|
static s32
|
|
wl_cfg80211_add_key(struct wiphy *wiphy, struct net_device *dev,
|
|
u8 key_idx, bool pairwise, const u8 *mac_addr, struct key_params *params)
|
|
@@ -1383,7 +1402,11 @@
|
|
return err;
|
|
}
|
|
|
|
-#if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 37)
|
|
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(6, 1, 0)
|
|
+static s32
|
|
+wl_cfg80211_del_key(struct wiphy *wiphy, struct net_device *dev,
|
|
+ int link_id, u8 key_idx, bool pairwise, const u8 *mac_addr)
|
|
+#elif LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 37)
|
|
static s32
|
|
wl_cfg80211_del_key(struct wiphy *wiphy, struct net_device *dev,
|
|
u8 key_idx, bool pairwise, const u8 *mac_addr)
|
|
@@ -1426,7 +1449,12 @@
|
|
return err;
|
|
}
|
|
|
|
-#if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 37)
|
|
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(6, 1, 0)
|
|
+static s32
|
|
+wl_cfg80211_get_key(struct wiphy *wiphy, struct net_device *dev,
|
|
+ int link_id, u8 key_idx, bool pairwise, const u8 *mac_addr, void *cookie,
|
|
+ void (*callback) (void *cookie, struct key_params * params))
|
|
+#elif LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 37)
|
|
static s32
|
|
wl_cfg80211_get_key(struct wiphy *wiphy, struct net_device *dev,
|
|
u8 key_idx, bool pairwise, const u8 *mac_addr, void *cookie,
|