From 77ab735457443e03caf3fc140787c9da4f3550f7 Mon Sep 17 00:00:00 2001 From: Jeremy Soller Date: Thu, 20 Oct 2022 19:59:50 -0600 Subject: [PATCH] Patches for Linux 6.0 --- debian/dkms.conf.in | 1 + .../0041-add-support-for-linux-6.0.patch | 18 ++++++++++++++++++ 2 files changed, 19 insertions(+) create mode 100644 debian/patches/0041-add-support-for-linux-6.0.patch diff --git a/debian/dkms.conf.in b/debian/dkms.conf.in index 14bea56..446a07f 100644 --- a/debian/dkms.conf.in +++ b/debian/dkms.conf.in @@ -21,5 +21,6 @@ PATCH[12]="0027-add-support-for-linux-5.1.patch" PATCH[13]="0028-add-support-for-linux-5.6.patch" PATCH[14]="0029-Update-for-set_fs-removal-in-Linux-5.10.patch" PATCH[15]="0040-add-support-for-linux-5.18.patch" +PATCH[16]="0041-add-support-for-linux-6.0.patch" #PATCH_MATCH[6]="^3.[10-11]" AUTOINSTALL="yes" diff --git a/debian/patches/0041-add-support-for-linux-6.0.patch b/debian/patches/0041-add-support-for-linux-6.0.patch new file mode 100644 index 0000000..031d1de --- /dev/null +++ b/debian/patches/0041-add-support-for-linux-6.0.patch @@ -0,0 +1,18 @@ +diff --git a/src/wl/sys/wl_cfg80211_hybrid.c b/src/wl/sys/wl_cfg80211_hybrid.c +index dcc18ce..f0d34c7 100644 +--- a/src/wl/sys/wl_cfg80211_hybrid.c ++++ b/src/wl/sys/wl_cfg80211_hybrid.c +@@ -2367,8 +2367,13 @@ wl_bss_roaming_done(struct wl_cfg80211_priv *wl, struct net_device *ndev, + conn_info->req_ie, conn_info->req_ie_len, + conn_info->resp_ie, conn_info->resp_ie_len, GFP_KERNEL); + #else ++#if LINUX_VERSION_CODE < KERNEL_VERSION(6, 0, 0) + roam_info.channel = &wl->conf->channel; + roam_info.bssid = (u8 *)&wl->bssid; ++#else ++ roam_info.links[0].channel = &wl->conf->channel; ++ roam_info.links[0].bssid = (u8 *)&wl->bssid; ++#endif + roam_info.req_ie = conn_info->req_ie; + roam_info.req_ie_len = conn_info->req_ie_len; + roam_info.resp_ie = conn_info->resp_ie;