Source: broadcom-sta
Followup-For: Bug #928754

Attached patch, which is just a cleaner revised one of what koos
submitted, fixes the build with and upto Linux 5.2.

Please consider a new upload with this patch. Thanks.

-- System Information:
Debian Release: bullseye/sid
  APT prefers unstable
  APT policy: (990, 'unstable'), (990, 'testing'), (100, 'experimental')
Architecture: amd64 (x86_64)
Foreign Architectures: i386

Kernel: Linux 4.19.0-5-amd64 (SMP w/4 CPU cores)
Kernel taint flags: TAINT_PROPRIETARY_MODULE, TAINT_USER, TAINT_OOT_MODULE, 
TAINT_UNSIGNED_MODULE
Locale: LANG=en_US.UTF-8, LC_CTYPE=en_US.UTF-8 (charmap=UTF-8), 
LANGUAGE=en_US.UTF-8 (charmap=UTF-8)
Shell: /bin/sh linked to /bin/dash
Init: systemd (via /run/systemd/system)
LSM: AppArmor: enabled
diff -Nru broadcom-sta-6.30.223.271/debian/changelog 
broadcom-sta-6.30.223.271/debian/changelog
--- broadcom-sta-6.30.223.271/debian/changelog  2019-01-11 03:42:46.000000000 
+0530
+++ broadcom-sta-6.30.223.271/debian/changelog  2019-08-12 15:42:46.000000000 
+0530
@@ -1,3 +1,10 @@
+broadcom-sta (6.30.223.271-10.1) UNRELEASED; urgency=medium
+
+  * Non-maintainer upload.
+  * Add patch to fix build failure with Linux 5.1.0 
+
+ -- Ritesh Raj Sarraf <[email protected]>  Mon, 12 Aug 2019 15:42:46 +0530
+
 broadcom-sta (6.30.223.271-10) unstable; urgency=medium
 
   * debian/patches:
diff -Nru broadcom-sta-6.30.223.271/debian/patches/15-linux51.patch 
broadcom-sta-6.30.223.271/debian/patches/15-linux51.patch
--- broadcom-sta-6.30.223.271/debian/patches/15-linux51.patch   1970-01-01 
05:30:00.000000000 +0530
+++ broadcom-sta-6.30.223.271/debian/patches/15-linux51.patch   2019-08-12 
15:42:36.000000000 +0530
@@ -0,0 +1,32 @@
+Index: broadcom-sta-6.30.223.271/amd64/src/wl/sys/wl_cfg80211_hybrid.c
+===================================================================
+--- broadcom-sta-6.30.223.271.orig/amd64/src/wl/sys/wl_cfg80211_hybrid.c       
2019-08-12 15:32:23.000000000 +0530
++++ broadcom-sta-6.30.223.271/amd64/src/wl/sys/wl_cfg80211_hybrid.c    
2019-08-12 15:41:12.156060848 +0530
+@@ -457,7 +457,11 @@
+       ifr.ifr_data = (caddr_t)&ioc;
+ 
+       fs = get_fs();
++#if LINUX_VERSION_CODE < KERNEL_VERSION(5, 1, 0)
+       set_fs(get_ds());
++#else
++        set_fs(KERNEL_DS);
++#endif
+ #if defined(WL_USE_NETDEV_OPS)
+       err = dev->netdev_ops->ndo_do_ioctl(dev, &ifr, SIOCDEVPRIVATE);
+ #else
+Index: broadcom-sta-6.30.223.271/i386/src/wl/sys/wl_cfg80211_hybrid.c
+===================================================================
+--- broadcom-sta-6.30.223.271.orig/i386/src/wl/sys/wl_cfg80211_hybrid.c        
2015-10-05 03:34:51.000000000 +0530
++++ broadcom-sta-6.30.223.271/i386/src/wl/sys/wl_cfg80211_hybrid.c     
2019-08-12 15:42:33.917644038 +0530
+@@ -450,7 +450,11 @@
+       ifr.ifr_data = (caddr_t)&ioc;
+ 
+       fs = get_fs();
++#if LINUX_VERSION_CODE < KERNEL_VERSION(5, 1, 0)
+       set_fs(get_ds());
++#else
++        set_fs(KERNEL_DS);
++#endif
+ #if defined(WL_USE_NETDEV_OPS)
+       err = dev->netdev_ops->ndo_do_ioctl(dev, &ifr, SIOCDEVPRIVATE);
+ #else
diff -Nru broadcom-sta-6.30.223.271/debian/patches/broadcom51.diff 
broadcom-sta-6.30.223.271/debian/patches/broadcom51.diff
--- broadcom-sta-6.30.223.271/debian/patches/broadcom51.diff    1970-01-01 
05:30:00.000000000 +0530
+++ broadcom-sta-6.30.223.271/debian/patches/broadcom51.diff    2019-08-12 
15:36:12.000000000 +0530
@@ -0,0 +1,14 @@
+--- src/wl/sys/wl_cfg80211_hybrid.c.orig       2019-05-07 16:52:35.903359637 
+0200
++++ src/wl/sys/wl_cfg80211_hybrid.c    2019-05-10 13:40:54.327109866 +0200
+@@ -457,7 +457,11 @@ wl_dev_ioctl(struct net_device *dev, u32
+       ifr.ifr_data = (caddr_t)&ioc;
+ 
+       fs = get_fs();
++#if LINUX_VERSION_CODE < KERNEL_VERSION(5, 1, 0)
+       set_fs(get_ds());
++#else
++      set_fs(KERNEL_DS);
++#endif
+ #if defined(WL_USE_NETDEV_OPS)
+       err = dev->netdev_ops->ndo_do_ioctl(dev, &ifr, SIOCDEVPRIVATE);
+ #else
diff -Nru broadcom-sta-6.30.223.271/debian/patches/series 
broadcom-sta-6.30.223.271/debian/patches/series
--- broadcom-sta-6.30.223.271/debian/patches/series     2019-01-11 
03:42:46.000000000 +0530
+++ broadcom-sta-6.30.223.271/debian/patches/series     2019-08-12 
15:38:28.000000000 +0530
@@ -12,3 +12,4 @@
 12-linux412.patch
 13-linux414.patch
 14-linux415.patch
+15-linux51.patch

Reply via email to