diff --git a/trunk/007-linux412.patch b/trunk/007-linux412.patch index 578c888..5b81584 100644 --- a/trunk/007-linux412.patch +++ b/trunk/007-linux412.patch @@ -1,7 +1,7 @@ -diff -ru sys0/wl_cfg80211_hybrid.c sys/wl_cfg80211_hybrid.c ---- a/src/wl/sys/wl_cfg80211_hybrid.c -+++ b/src/wl/sys/wl_cfg80211_hybrid.c -@@ -52,8 +52,13 @@ +diff -ru work.orig/src/wl/sys/wl_cfg80211_hybrid.c work.patched/src/wl/sys/wl_cfg80211_hybrid.c +--- work.orig/src/wl/sys/wl_cfg80211_hybrid.c 2017-06-10 15:50:27.328823384 -0700 ++++ work.patched/src/wl/sys/wl_cfg80211_hybrid.c 2017-06-10 15:52:40.540809187 -0700 +@@ -53,8 +53,13 @@ u32 wl_dbg_level = WL_DBG_ERR | WL_DBG_I u32 wl_dbg_level = WL_DBG_ERR; #endif @@ -15,7 +15,7 @@ diff -ru sys0/wl_cfg80211_hybrid.c sys/wl_cfg80211_hybrid.c #if LINUX_VERSION_CODE >= KERNEL_VERSION(3, 6, 0) static s32 wl_cfg80211_scan(struct wiphy *wiphy, -@@ -466,7 +471,11 @@ +@@ -467,7 +472,11 @@ wl_dev_ioctl(struct net_device *dev, u32 static s32 wl_cfg80211_change_iface(struct wiphy *wiphy, struct net_device *ndev, @@ -27,7 +27,7 @@ diff -ru sys0/wl_cfg80211_hybrid.c sys/wl_cfg80211_hybrid.c struct vif_params *params) { struct wl_cfg80211_priv *wl = wiphy_to_wl(wiphy); -@@ -2361,12 +2370,26 @@ +@@ -2388,6 +2397,9 @@ wl_bss_roaming_done(struct wl_cfg80211_p const wl_event_msg_t *e, void *data) { struct wl_cfg80211_connect_info *conn_info = wl_to_conn(wl); @@ -36,11 +36,11 @@ diff -ru sys0/wl_cfg80211_hybrid.c sys/wl_cfg80211_hybrid.c +#endif s32 err = 0; - wl_get_assoc_ies(wl); - memcpy(wl->profile->bssid, &e->addr, ETHER_ADDR_LEN); - memcpy(&wl->bssid, &e->addr, ETHER_ADDR_LEN); - wl_update_bss_info(wl); -+ + err = wl_get_assoc_ies(wl); +@@ -2401,6 +2413,16 @@ wl_bss_roaming_done(struct wl_cfg80211_p + if (err) + return err; + +#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 12, 0) + roam_info.channel = &wl->conf->channel, + roam_info.bssid = (u8 *)&wl->bssid, @@ -54,7 +54,7 @@ diff -ru sys0/wl_cfg80211_hybrid.c sys/wl_cfg80211_hybrid.c cfg80211_roamed(ndev, #if LINUX_VERSION_CODE > KERNEL_VERSION(2, 6, 39) &wl->conf->channel, -@@ -2374,6 +2397,7 @@ +@@ -2408,6 +2430,7 @@ wl_bss_roaming_done(struct wl_cfg80211_p (u8 *)&wl->bssid, conn_info->req_ie, conn_info->req_ie_len, conn_info->resp_ie, conn_info->resp_ie_len, GFP_KERNEL); diff --git a/trunk/PKGBUILD b/trunk/PKGBUILD index 452e781..1fb2505 100644 --- a/trunk/PKGBUILD +++ b/trunk/PKGBUILD @@ -6,7 +6,7 @@ pkgname=broadcom-wl-dkms pkgver=6.30.223.271 -pkgrel=13 +pkgrel=14 pkgdesc='Broadcom 802.11 Linux STA wireless driver' arch=('x86_64' 'i686') url="https://www.broadcom.com/support/download-search/?pf=Wireless+LAN+Infrastructure" @@ -26,14 +26,14 @@ source=('broadcom-wl-dkms.conf' source_i686=("https://docs.broadcom.com/docs-and-downloads/docs/linux_sta/hybrid-v35-nodebug-pcoem-${pkgver//./_}.tar.gz") source_x86_64=("https://docs.broadcom.com/docs-and-downloads/docs/linux_sta/hybrid-v35_64-nodebug-pcoem-${pkgver//./_}.tar.gz") sha256sums=('b97bc588420d1542f73279e71975ccb5d81d75e534e7b5717e01d6e6adf6a283' - '06b20686c0dce5d7c5ca8930ac896ed9444be6638051d8aace117462fabd628a' + '17a4857279d99e14847fa66e8d8ce0d5dc4851856a0683f4a6bfc93f67a8f6f6' '32e505a651fdb9fd5e4870a9d6de21dd703dead768c2b3340a2ca46671a5852f' '4ea03f102248beb8963ad00bd3e36e67519a90fa39244db065e74038c98360dd' '30ce1d5e8bf78aee487d0f3ac76756e1060777f70ed1a9cf95215c3a52cfbe2e' '09d709df0c764118ca43117f5c096163d9669a28170da8476d4b8211bd225d2e' '2306a59f9e7413f35a0669346dcd05ef86fa37c23b566dceb0c6dbee67e4d299' '5bc12cb57712e6a944dff1c90de50135c2508085d8497ab99284ccccdb35c32b' - '207559303f411de84821fbf16a94ba1ccf1e57495628fda98b9501c47cb64614') + 'e7bfe6ffc723251aaa5952da7bf9fb1bedbd2c09ab10a78a4caf67d0906be2d4') sha256sums_x86_64=('5f79774d5beec8f7636b59c0fb07a03108eef1e3fd3245638b20858c714144be') sha256sums_i686=('4f8b70b293ac8cc5c70e571ad5d1878d0f29d133a46fe7869868d9c19b5058cd') diff --git a/trunk/dkms.conf.in b/trunk/dkms.conf.in index 902c8f2..d065664 100644 --- a/trunk/dkms.conf.in +++ b/trunk/dkms.conf.in @@ -8,4 +8,5 @@ PATCH[2]="003-linux47.patch" PATCH[3]="004-linux48.patch" PATCH[4]="005-debian-fix-kernel-warnings.patch" PATCH[5]="006-linux411.patch" +PATCH[6]="007-linux412.patch" AUTOINSTALL="yes"