[wl-kmod/f41] (4 commits) ...Update Release number and changelog in SPEC file
by Nicolas Viéville
Summary of changes:
a96b884... Add patch to fix warning suggest braces around empty body i (*)
e1e46b3... Add patch to make wpa_supplicant 2.11 scans not to fail - R (*)
0e1b502... SPEC file: add bcond to build for current kernel and akmod (*)
a043302... Update Release number and changelog in SPEC file (*)
(*) This commit already existed in another branch; no separate mail sent
3 months
[wl-kmod] Update Release number and changelog in SPEC file
by Nicolas Viéville
commit a04330284bfc38fd91eade6f8b28fa63cfcdc95e
Author: Nicolas Viéville <nicolas.vieville(a)uphf.fr>
Date: Thu Aug 22 00:25:07 2024 +0200
Update Release number and changelog in SPEC file
Signed-off-by: Nicolas Viéville <nicolas.vieville(a)uphf.fr>
wl-kmod.spec | 7 ++++++-
1 file changed, 6 insertions(+), 1 deletion(-)
---
diff --git a/wl-kmod.spec b/wl-kmod.spec
index d8c21c0..6300d96 100644
--- a/wl-kmod.spec
+++ b/wl-kmod.spec
@@ -16,7 +16,7 @@
Name: wl-kmod
Version: 6.30.223.271
-Release: 52%{?dist}
+Release: 53%{?dist}
Summary: Kernel module for Broadcom wireless devices
Group: System Environment/Kernel
License: Redistributable, no modification permitted
@@ -386,6 +386,11 @@ chmod 0755 $RPM_BUILD_ROOT%{kmodinstdir_prefix}*%{kmodinstdir_postfix}/* || :
%{?akmod_install}
%changelog
+* Thu Aug 22 2024 Nicolas Viéville <nicolas.vieville(a)uphf.fr> - 6.30.223.271-53
+- Fix warning empty body in if statement - kernel 6.10
+- Add max_scan_ie_len in order to make wpa_supplicant 2.11 scans not to fail - RFBZ#7030
+- SPEC file add bcond to build for current kernel and akmod
+
* Sat Aug 03 2024 RPM Fusion Release Engineering <sergiomb(a)rpmfusion.org> - 6.30.223.271-52
- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild
3 months
[wl-kmod] SPEC file: add bcond to build for current kernel and akmod
by Nicolas Viéville
commit 0e1b502a3bfbf2f58d9d315a87fe5823107a8602
Author: Nicolas Viéville <nicolas.vieville(a)uphf.fr>
Date: Thu Aug 22 00:22:36 2024 +0200
SPEC file: add bcond to build for current kernel and akmod
Signed-off-by: Nicolas Viéville <nicolas.vieville(a)uphf.fr>
wl-kmod.spec | 8 +++++++-
1 file changed, 7 insertions(+), 1 deletion(-)
---
diff --git a/wl-kmod.spec b/wl-kmod.spec
index 77ba9a1..d8c21c0 100644
--- a/wl-kmod.spec
+++ b/wl-kmod.spec
@@ -4,9 +4,15 @@
# queuing that build enable the macro again for subsequent builds; that way
# a new akmod package will only get build when a new one is actually needed
%if 0%{?fedora} || 0%{?rhel} >= 9
+%bcond_with kmod
+
+%if %{with kmod}
+%global buildforkernels current
+%else
%global buildforkernels akmod
-%global debug_package %{nil}
%endif
+%endif
+%global debug_package %{nil}
Name: wl-kmod
Version: 6.30.223.271
3 months
[wl-kmod] Add patch to make wpa_supplicant 2.11 scans not to fail - RFBZ#7030
by Nicolas Viéville
commit e1e46b3794858d776ab41096c38a1709ae47d81a
Author: Nicolas Viéville <nicolas.vieville(a)uphf.fr>
Date: Thu Aug 22 00:20:43 2024 +0200
Add patch to make wpa_supplicant 2.11 scans not to fail - RFBZ#7030
Signed-off-by: Nicolas Viéville <nicolas.vieville(a)uphf.fr>
...7_wpa_supplicant-2.11_add_max_scan_ie_len.patch | 35 ++++++++++++++++++++++
wl-kmod.spec | 2 ++
2 files changed, 37 insertions(+)
---
diff --git a/wl-kmod-027_wpa_supplicant-2.11_add_max_scan_ie_len.patch b/wl-kmod-027_wpa_supplicant-2.11_add_max_scan_ie_len.patch
new file mode 100644
index 0000000..3f0d36b
--- /dev/null
+++ b/wl-kmod-027_wpa_supplicant-2.11_add_max_scan_ie_len.patch
@@ -0,0 +1,35 @@
+From d9d6f584c57f10349876a68f9bf029ef47c9a74b Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Nicolas=20Vi=C3=A9ville?= <nicolas.vieville(a)uphf.fr>
+Date: Wed, 21 Aug 2024 23:49:28 +0200
+Subject: [PATCH] wpa_supplicant-2.11: wl_cfg80211_hybrid.c: add
+ max_scan_ie_len in order to make wpa_supplicant scans not to fail
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Signed-off-by: Nicolas Viéville <nicolas.vieville(a)uphf.fr>
+---
+ src/wl/sys/wl_cfg80211_hybrid.c | 7 +++++++
+ 1 file changed, 7 insertions(+)
+
+diff --git a/src/wl/sys/wl_cfg80211_hybrid.c b/src/wl/sys/wl_cfg80211_hybrid.c
+index ff5a3fb..5ffa0b3 100644
+--- a/src/wl/sys/wl_cfg80211_hybrid.c
++++ b/src/wl/sys/wl_cfg80211_hybrid.c
+@@ -2011,6 +2011,13 @@ static s32 wl_alloc_wdev(struct device *dev, struct wireless_dev **rwdev)
+ }
+ set_wiphy_dev(wdev->wiphy, dev);
+ wdev->wiphy->max_scan_ssids = WL_NUM_SCAN_MAX;
++
++ /* Set max_scan_ie_len to a random value in order to make wpa_supplicant
++ * scans not to fail. The driver should ignore the extra passed IEs.
++ * Value taken and fix inspired from:
++ * https://patchwork.kernel.org/project/linux-wireless/patch/20211212221310....
++ */
++ wdev->wiphy->max_scan_ie_len = 512;
+ #if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 33)
+ wdev->wiphy->max_num_pmkids = WL_NUM_PMKIDS_MAX;
+ #endif
+--
+2.46.0
+
diff --git a/wl-kmod.spec b/wl-kmod.spec
index 1896fae..77ba9a1 100644
--- a/wl-kmod.spec
+++ b/wl-kmod.spec
@@ -44,6 +44,7 @@ Patch22: wl-kmod-023_kernel_6.0_adaptation.patch
Patch23: wl-kmod-024_kernel_6.1_adaptation.patch
Patch24: wl-kmod-025_kernel_6.5_adaptation.patch
Patch25: wl-kmod-026_kernel_6.10_fix_empty_body_in_if_warning.patch
+Patch26: wl-kmod-027_wpa_supplicant-2.11_add_max_scan_ie_len.patch
# needed for plague to make sure it builds for i586 and i686
ExclusiveArch: i686 x86_64
@@ -110,6 +111,7 @@ pushd %{name}-%{version}-src
%patch -P 23 -p1 -b .kernel_6.1_adaptation
%patch -P 24 -p1 -b .kernel_6.5_adaptation
%patch -P 25 -p1 -b .kernel_6.10_adaptation
+%patch -P 26 -p1 -b .wpa_supplicant-2.11_adaptation
# Manual patching to build for RHEL - inspired by CentOS wl-kmod.spec
# Actually works for RHEL 6.x and 7.x
3 months
[wl-kmod] Add patch to fix warning suggest braces around empty body in an ‘if’ statement - kernel 6.10
by Nicolas Viéville
commit a96b8843f026f9c424201a45236df2ab9f5ef7c0
Author: Nicolas Viéville <nicolas.vieville(a)uphf.fr>
Date: Thu Aug 22 00:17:41 2024 +0200
Add patch to fix warning suggest braces around empty body in an ‘if’ statement - kernel 6.10
Signed-off-by: Nicolas Viéville <nicolas.vieville(a)uphf.fr>
..._kernel_6.10_fix_empty_body_in_if_warning.patch | 57 ++++++++++++++++++++++
wl-kmod.spec | 2 +
2 files changed, 59 insertions(+)
---
diff --git a/wl-kmod-026_kernel_6.10_fix_empty_body_in_if_warning.patch b/wl-kmod-026_kernel_6.10_fix_empty_body_in_if_warning.patch
new file mode 100644
index 0000000..ad47e58
--- /dev/null
+++ b/wl-kmod-026_kernel_6.10_fix_empty_body_in_if_warning.patch
@@ -0,0 +1,57 @@
+From 92a12d8861c51ec2f35aba4c746653fb0e9b7256 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Nicolas=20Vi=C3=A9ville?= <nicolas.vieville(a)uphf.fr>
+Date: Wed, 21 Aug 2024 19:35:27 +0200
+Subject: [PATCH] =?UTF-8?q?kernel=206.10:=20wl=5Flinux.c:=20fix=20warning?=
+ =?UTF-8?q?=20suggest=20braces=20around=20empty=20body=20in=20an=20?=
+ =?UTF-8?q?=E2=80=98if=E2=80=99=20statement?=
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Signed-off-by: Nicolas Viéville <nicolas.vieville(a)uphf.fr>
+---
+ src/wl/sys/wl_linux.c | 9 ++++++---
+ 1 file changed, 6 insertions(+), 3 deletions(-)
+
+diff --git a/src/wl/sys/wl_linux.c b/src/wl/sys/wl_linux.c
+index 499752b..2000f6f 100644
+--- a/src/wl/sys/wl_linux.c
++++ b/src/wl/sys/wl_linux.c
+@@ -1100,8 +1100,9 @@ wl_open(struct net_device *dev)
+ }
+ WL_UNLOCK(wl);
+
+- if (!error)
++ if (!error) {
+ OLD_MOD_INC_USE_COUNT;
++ }
+
+ #if defined(USE_CFG80211)
+ if (wl_cfg80211_up(dev)) {
+@@ -1874,9 +1875,10 @@ wl_set_mac_address(struct net_device *dev, void *addr)
+ err = wlc_iovar_op(wl->wlc, "cur_etheraddr", NULL, 0, sa->sa_data, ETHER_ADDR_LEN,
+ IOV_SET, (WL_DEV_IF(dev))->wlcif);
+ WL_UNLOCK(wl);
+- if (err)
++ if (err) {
+ WL_ERROR(("wl%d: wl_set_mac_address: error setting MAC addr override\n",
+ wl->pub->unit));
++ }
+ return err;
+ }
+
+@@ -2274,9 +2276,10 @@ wl_start(struct sk_buff *skb, struct net_device *dev)
+ if (!err) {
+ atomic_inc(&wl->callbacks);
+ wl->txq_dispatched = TRUE;
+- } else
++ } else {
+ WL_ERROR(("wl%d: wl_start/schedule_work failed\n",
+ wl->pub->unit));
++ }
+ }
+
+ TXQ_UNLOCK(wl);
+--
+2.46.0
+
diff --git a/wl-kmod.spec b/wl-kmod.spec
index 49af14a..1896fae 100644
--- a/wl-kmod.spec
+++ b/wl-kmod.spec
@@ -43,6 +43,7 @@ Patch21: wl-kmod-022_kernel_5.18_adaptation.patch
Patch22: wl-kmod-023_kernel_6.0_adaptation.patch
Patch23: wl-kmod-024_kernel_6.1_adaptation.patch
Patch24: wl-kmod-025_kernel_6.5_adaptation.patch
+Patch25: wl-kmod-026_kernel_6.10_fix_empty_body_in_if_warning.patch
# needed for plague to make sure it builds for i586 and i686
ExclusiveArch: i686 x86_64
@@ -108,6 +109,7 @@ pushd %{name}-%{version}-src
%patch -P 22 -p1 -b .kernel_6.0_adaptation
%patch -P 23 -p1 -b .kernel_6.1_adaptation
%patch -P 24 -p1 -b .kernel_6.5_adaptation
+%patch -P 25 -p1 -b .kernel_6.10_adaptation
# Manual patching to build for RHEL - inspired by CentOS wl-kmod.spec
# Actually works for RHEL 6.x and 7.x
3 months
[nvidia-xconfig/f39: 5/5] Merge branch 'master' into f39
by Leigh Scott
commit 71dfa882369ed32c3536e0f993dce5cd12e7b3e1
Merge: 0bdda6f c7cf8be
Author: Leigh Scott <leigh123linux(a)gmail.com>
Date: Wed Aug 21 20:16:41 2024 +0100
Merge branch 'master' into f39
nvidia-xconfig.spec | 14 +++++++++++++-
sources | 2 +-
2 files changed, 14 insertions(+), 2 deletions(-)
---
3 months
[nvidia-xconfig/f40: 5/5] Merge branch 'master' into f40
by Leigh Scott
commit deb46f205c9340919415188f2f1f10684ceb9624
Merge: 59e17a3 c7cf8be
Author: Leigh Scott <leigh123linux(a)gmail.com>
Date: Wed Aug 21 20:16:15 2024 +0100
Merge branch 'master' into f40
nvidia-xconfig.spec | 14 +++++++++++++-
sources | 2 +-
2 files changed, 14 insertions(+), 2 deletions(-)
---
3 months
