Build for kernel-3.10.0-327.el7.x86_64 with patches

atodorov · Nov 21, 2015 · 88d678a · 88d678a
1 parent bda4a9f
commit 88d678a
Show file tree

Hide file tree

Showing 2 changed files with 55 additions and 1 deletion.
diff --git a/wl-kmod-101_redhat_7.2.patch b/wl-kmod-101_redhat_7.2.patch
@@ -0,0 +1,29 @@
+--- hybrid-v35_64-nodebug-pcoem-6_30_223_248.orig/src/wl/sys/wl_cfg80211_hybrid.c	2015-11-21 10:28:08.388882146 +0200
++++ hybrid-v35_64-nodebug-pcoem-6_30_223_248/src/wl/sys/wl_cfg80211_hybrid.c	2015-11-21 10:39:54.455368556 +0200
+@@ -1456,7 +1456,7 @@
+ 		WL_DBG(("Could not get rate (%d)\n", err));
+ 	} else {
+ 		rate = dtoh32(rate);
+-		sinfo->filled |= STATION_INFO_TX_BITRATE;
++		sinfo->filled |= NL80211_STA_INFO_TX_BITRATE;
+ 		sinfo->txrate.legacy = rate * 5;
+ 		WL_DBG(("Rate %d Mbps\n", (rate / 2)));
+ 	}
+@@ -1469,7 +1469,7 @@
+ 			return err;
+ 		}
+ 		rssi = dtoh32(scb_val.val);
+-		sinfo->filled |= STATION_INFO_SIGNAL;
++		sinfo->filled |= NL80211_STA_INFO_SIGNAL;
+ 		sinfo->signal = rssi;
+ 		WL_DBG(("RSSI %d dBm\n", rssi));
+ 	}
+@@ -2025,7 +2025,7 @@
+
+ 	notify_ie = (u8 *)bi + le16_to_cpu(bi->ie_offset);
+ 	notify_ielen = le32_to_cpu(bi->ie_length);
+-#if LINUX_VERSION_CODE >= KERNEL_VERSION(3, 18, 0)
++#if LINUX_VERSION_CODE >= KERNEL_VERSION(3, 10, 0)
+ 	cbss = cfg80211_inform_bss(wiphy, channel, 
+ 		(mgmt_type == IEEE80211_STYPE_PROBE_RESP) ? CFG80211_BSS_FTYPE_PRESP : CFG80211_BSS_FTYPE_BEACON,
+ 		(const u8 *)(bi->BSSID.octet),
diff --git a/wl-kmod.spec b/wl-kmod.spec
@@ -7,7 +7,7 @@
 
 Name:       wl-kmod
 Version:    6.30.223.248
-Release:    6%{?dist}
+Release:    7%{?dist}
 Summary:    Kernel module for Broadcom wireless devices
 Group:      System Environment/Kernel
 License:    Redistributable, no modification permitted
@@ -35,6 +35,26 @@ Patch7:     wl-kmod-008_kernel_3.18.patch
 #        ^
 Patch100:   wl-kmod-100_redhat.patch
 
+# fixes for kernel-3.10.0-327.el7.x86_64 introduced in RHEL 7.2:
+#
+#~/BUILD/wl-kmod-6.30.223.248/_kmod_build_3.10.0-327.el7.x86_64/src/wl/sys/wl_cfg80211_hybrid.c:1459:20: error: ‘STATION_INFO_TX_BITRATE’ undeclared (first use in this function)
+#   sinfo->filled |= STATION_INFO_TX_BITRATE;
+#                    ^
+#~/BUILD/wl-kmod-6.30.223.248/_kmod_build_3.10.0-327.el7.x86_64/src/wl/sys/wl_cfg80211_hybrid.c:1472:20: error: ‘STATION_INFO_SIGNAL’ undeclared (first use in this function)
+#   sinfo->filled |= STATION_INFO_SIGNAL;
+#                ^
+#~/BUILD/wl-kmod-6.30.223.248/_kmod_build_3.10.0-327.el7.x86_64/src/wl/sys/wl_cfg80211_hybrid.c:2037:3: error: incompatible type for argument 3 of ‘cfg80211_inform_bss’
+#   (const u8 *)notify_ie, notify_ielen, signal, GFP_KERNEL);
+#   ^
+#include/net/cfg80211.h:4029:1: note: expected ‘enum cfg80211_bss_frame_type’ but argument is of type ‘const u8 *’
+# cfg80211_inform_bss(struct wiphy *wiphy,
+# ^
+#
+#~/BUILD/wl-kmod-6.30.223.248/_kmod_build_3.10.0-327.el7.x86_64/src/wl/sys/wl_cfg80211_hybrid.c:2037:3: error: too few arguments to function ‘cfg80211_inform_bss’
+#   (const u8 *)notify_ie, notify_ielen, signal, GFP_KERNEL);
+#   ^
+Patch101:   wl-kmod-101_redhat_7.2.patch
+
 BuildRequires:  %{_bindir}/kmodtool
 
 # needed for plague to make sure it builds for i586 and i686
@@ -82,6 +102,7 @@ pushd %{name}-%{version}-src
 %patch7  -p1 -b .kernel-3.18
 
 %patch100  -p1 -b .redhat
+%patch101  -p1 -b .redhat_7.2
 popd
 
 for kernel_version in %{?kernel_versions} ; do
@@ -111,6 +132,10 @@ chmod 0755 $RPM_BUILD_ROOT%{kmodinstdir_prefix}*%{kmodinstdir_postfix}/* || :
 rm -rf $RPM_BUILD_ROOT
 
 %changelog
+
+* Sat Nov 21 2015 Alexander Todorov <atodorov@redhat.com> - 6.30.223.248-7
+- Rebuilt for RHEL 7.2 kernel-3.10.0-327.el7.x86_64 with patches
+
 * Fri Jun 26 2015 Alexander Todorov <atodorov@redhat.com> - 6.30.223.248-6
 - Rebuilt for RHEL7 kernel-3.10.0-229.7.2.el7.x86_64