/[packages]/updates/8/broadcom-wl/current/SOURCES/broadcom-wl-6.30.223.271-kernel-6.1.0.patch
ViewVC logotype

Contents of /updates/8/broadcom-wl/current/SOURCES/broadcom-wl-6.30.223.271-kernel-6.1.0.patch

Parent Directory Parent Directory | Revision Log Revision Log


Revision 1928607 - (show annotations) (download)
Sun Jan 1 13:16:31 2023 UTC (14 months, 3 weeks ago) by tmb
File size: 4412 byte(s)
- fix build with kernel 6.1 series
- update kernel module blacklist


1 diff -Nurp broadcom-wl-6.30.223.271.orig/src/wl/sys/wl_cfg80211_hybrid.c broadcom-wl-6.30.223.271/src/wl/sys/wl_cfg80211_hybrid.c
2 --- broadcom-wl-6.30.223.271.orig/src/wl/sys/wl_cfg80211_hybrid.c 2022-12-18 21:46:50.713440263 +0200
3 +++ broadcom-wl-6.30.223.271/src/wl/sys/wl_cfg80211_hybrid.c 2022-12-18 21:47:28.288436459 +0200
4 @@ -105,14 +105,28 @@ static s32 wl_cfg80211_get_tx_power(stru
5 static s32 wl_cfg80211_get_tx_power(struct wiphy *wiphy, s32 *dbm);
6 #endif
7
8 -#if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 38)
9 +#if LINUX_VERSION_CODE >= KERNEL_VERSION(6, 1, 0)
10 +static s32 wl_cfg80211_config_default_key(struct wiphy *wiphy,
11 + struct net_device *dev, int link_id, u8 key_idx, bool unicast,
12 + bool multicast);
13 +#elif LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 38)
14 static s32 wl_cfg80211_config_default_key(struct wiphy *wiphy,
15 struct net_device *dev, u8 key_idx, bool unicast, bool multicast);
16 #else
17 static s32 wl_cfg80211_config_default_key(struct wiphy *wiphy,
18 struct net_device *dev, u8 key_idx);
19 #endif
20 -#if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 37)
21 +#if LINUX_VERSION_CODE >= KERNEL_VERSION(6, 1, 0)
22 +static s32 wl_cfg80211_add_key(struct wiphy *wiphy, struct net_device *dev,
23 + int link_id, u8 key_idx, bool pairwise, const u8 *mac_addr,
24 + struct key_params *params);
25 +static s32 wl_cfg80211_del_key(struct wiphy *wiphy, struct net_device *dev,
26 + int link_id, u8 key_idx, bool pairwise, const u8 *mac_addr);
27 +static s32 wl_cfg80211_get_key(struct wiphy *wiphy, struct net_device *dev,
28 + int link_id, u8 key_idx, bool pairwise, const u8 *mac_addr,
29 + void *cookie,
30 + void (*callback) (void *cookie, struct key_params *params));
31 +#elif LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 37)
32 static s32 wl_cfg80211_add_key(struct wiphy *wiphy, struct net_device *dev,
33 u8 key_idx, bool pairwise, const u8 *mac_addr, struct key_params *params);
34 static s32 wl_cfg80211_del_key(struct wiphy *wiphy, struct net_device *dev,
35 @@ -1163,7 +1177,12 @@ static s32 wl_cfg80211_get_tx_power(stru
36 return err;
37 }
38
39 -#if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 38)
40 +#if LINUX_VERSION_CODE >= KERNEL_VERSION(6, 1, 0)
41 +static s32
42 +wl_cfg80211_config_default_key(struct wiphy *wiphy,
43 + struct net_device *dev, int link_id, u8 key_idx, bool unicast,
44 + bool multicast)
45 +#elif LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 38)
46 static s32
47 wl_cfg80211_config_default_key(struct wiphy *wiphy,
48 struct net_device *dev, u8 key_idx, bool unicast, bool multicast)
49 @@ -1188,7 +1207,12 @@ wl_cfg80211_config_default_key(struct wi
50 return 0;
51 }
52
53 -#if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 37)
54 +#if LINUX_VERSION_CODE >= KERNEL_VERSION(6, 1, 0)
55 +static s32
56 +wl_cfg80211_add_key(struct wiphy *wiphy, struct net_device *dev,
57 + int link_id, u8 key_idx, bool pairwise, const u8 *mac_addr,
58 + struct key_params *params)
59 +#elif LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 37)
60 static s32
61 wl_cfg80211_add_key(struct wiphy *wiphy, struct net_device *dev,
62 u8 key_idx, bool pairwise, const u8 *mac_addr, struct key_params *params)
63 @@ -1309,7 +1333,11 @@ wl_cfg80211_add_key(struct wiphy *wiphy,
64 return err;
65 }
66
67 -#if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 37)
68 +#if LINUX_VERSION_CODE >= KERNEL_VERSION(6, 1, 0)
69 +static s32
70 +wl_cfg80211_del_key(struct wiphy *wiphy, struct net_device *dev,
71 + int link_id, u8 key_idx, bool pairwise, const u8 *mac_addr)
72 +#elif LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 37)
73 static s32
74 wl_cfg80211_del_key(struct wiphy *wiphy, struct net_device *dev,
75 u8 key_idx, bool pairwise, const u8 *mac_addr)
76 @@ -1352,7 +1380,13 @@ wl_cfg80211_del_key(struct wiphy *wiphy,
77 return err;
78 }
79
80 -#if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 37)
81 +#if LINUX_VERSION_CODE >= KERNEL_VERSION(6, 1, 0)
82 +static s32
83 +wl_cfg80211_get_key(struct wiphy *wiphy, struct net_device *dev,
84 + int link_id, u8 key_idx, bool pairwise, const u8 *mac_addr,
85 + void *cookie,
86 + void (*callback) (void *cookie, struct key_params * params))
87 +#elif LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 37)
88 static s32
89 wl_cfg80211_get_key(struct wiphy *wiphy, struct net_device *dev,
90 u8 key_idx, bool pairwise, const u8 *mac_addr, void *cookie,

  ViewVC Help
Powered by ViewVC 1.1.30