rpms/wl-kmod/devel broadcom-wl-5.100.82.112-kernel-3.9.patch, NONE, 1.1 wl-kmod.spec, 1.72, 1.73

[Nicolas Viéville]

Author: nvieville

Update of /cvs/nonfree/rpms/wl-kmod/devel
In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv3462

Modified Files:
	wl-kmod.spec 
Added Files:
	broadcom-wl-5.100.82.112-kernel-3.9.patch 
Log Message:
* Mon Mar 04 2013 Nicolas Vieville <nicolas.vieville at univ-valenciennes.fr> - 5.100.82.112-9
- Added patch to build for kernel >= 3.9


broadcom-wl-5.100.82.112-kernel-3.9.patch:
 wl_cfg80211.c |   25 ++++++++++++++++++++++---
 1 file changed, 22 insertions(+), 3 deletions(-)

--- NEW FILE broadcom-wl-5.100.82.112-kernel-3.9.patch ---
diff -Naur hybrid-portsrc_x86_32-v5_100_82_112.orig/src/wl/sys/wl_cfg80211.c hybrid-portsrc_x86_32-v5_100_82_112/src/wl/sys/wl_cfg80211.c
--- hybrid-portsrc_x86_32-v5_100_82_112.orig/src/wl/sys/wl_cfg80211.c	2013-03-01 16:40:19.344706682 +0100
+++ hybrid-portsrc_x86_32-v5_100_82_112/src/wl/sys/wl_cfg80211.c	2013-03-04 12:06:11.761102854 +0100
@@ -61,13 +61,20 @@
 
 #if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 36)
 static s32 wl_cfg80211_set_tx_power(struct wiphy *wiphy,
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(3, 9, 0)
+           struct wireless_dev *wdev,
+#endif
            enum nl80211_tx_power_setting type, s32 dbm);
 #else
 static s32 wl_cfg80211_set_tx_power(struct wiphy *wiphy,
            enum tx_power_setting type, s32 dbm);
 #endif
 
-static s32 wl_cfg80211_get_tx_power(struct wiphy *wiphy, s32 *dbm);
+static s32 wl_cfg80211_get_tx_power(struct wiphy *wiphy,
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(3, 9, 0)
+           struct wireless_dev *wdev,
+#endif
+           s32 *dbm);
 
 #if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 38)
 static s32 wl_cfg80211_config_default_key(struct wiphy *wiphy,
@@ -1114,7 +1121,11 @@
 
 #if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 36)
 static s32
-wl_cfg80211_set_tx_power(struct wiphy *wiphy, enum nl80211_tx_power_setting type, s32 dbm)
+wl_cfg80211_set_tx_power(struct wiphy *wiphy, 
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(3, 9, 0)
+           struct wireless_dev *wdev,
+#endif
+           enum nl80211_tx_power_setting type, s32 dbm)
 #else
 #define NL80211_TX_POWER_AUTOMATIC TX_POWER_AUTOMATIC
 #define NL80211_TX_POWER_LIMITED TX_POWER_LIMITED
@@ -1171,7 +1182,11 @@
 	return err;
 }
 
-static s32 wl_cfg80211_get_tx_power(struct wiphy *wiphy, s32 *dbm)
+static s32 wl_cfg80211_get_tx_power(struct wiphy *wiphy,
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(3, 9, 0)
+           struct wireless_dev *wdev,
+#endif
+           s32 *dbm)
 {
 	struct wl_priv *wl = wiphy_to_wl(wiphy);
 	struct net_device *ndev = wl_to_ndev(wl);
@@ -2108,7 +2123,11 @@
 		ie_len = (size_t)(ies->len);
 #endif
 		beacon_interval = bss->beacon_interval;
+#if LINUX_VERSION_CODE < KERNEL_VERSION(3, 9, 0)
 		cfg80211_put_bss(bss);
+#else
+		cfg80211_put_bss(wl_to_wiphy(wl), bss);
+#endif
 	}
 
 	tim = bcm_parse_tlvs(ie, ie_len, WLAN_EID_TIM);


Index: wl-kmod.spec
===================================================================
RCS file: /cvs/nonfree/rpms/wl-kmod/devel/wl-kmod.spec,v
retrieving revision 1.72
retrieving revision 1.73
diff -u -r1.72 -r1.73
--- wl-kmod.spec	1 Mar 2013 16:55:22 -0000	1.72
+++ wl-kmod.spec	6 Mar 2013 08:47:13 -0000	1.73
@@ -7,7 +7,7 @@
 
 Name:       wl-kmod
 Version:    5.100.82.112
-Release:    8%{?dist}
+Release:    9%{?dist}
 Summary:    Kernel module for Broadcom wireless devices
 Group:      System Environment/Kernel
 License:    Redistributable, no modification permitted
@@ -24,6 +24,7 @@
 Patch6:     broadcom-wl-5.100.82.112-recent_kernel_ioctl.patch
 Patch7:     broadcom-wl-5.100.82.112-wext_workaround.patch
 Patch8:     broadcom-wl-5.100.82.112-kernel-3.8.patch
+Patch9:     broadcom-wl-5.100.82.112-kernel-3.9.patch
 
 BuildRequires:  %{_bindir}/kmodtool
 
@@ -70,6 +71,7 @@
 %patch6 -p1 -b .recent_kernel_ioctl
 %patch7 -p1 -b .wext_workaround.patch
 %patch8 -p1 -b .kernel-3.8
+%patch9 -p1 -b .kernel-3.9
 popd
 
 for kernel_version in %{?kernel_versions} ; do
@@ -99,6 +101,9 @@
 rm -rf $RPM_BUILD_ROOT
 
 %changelog
+* Mon Mar 04 2013 Nicolas Vieville <nicolas.vieville at univ-valenciennes.fr> - 5.100.82.112-9
+- Added patch to build for kernel >= 3.9
+
 * Fri Mar 01 2013 Nicolas Vieville <nicolas.vieville at univ-valenciennes.fr> - 5.100.82.112-8
 - Added patch to build for kernel >= 3.8
 
@@ -141,7 +146,7 @@
 * Sat Nov 05 2011 Nicolas Viéville <nicolas.vieville at univ-valenciennes.fr> - 5.100.82.38-1.1
 - Rebuilt for F-16
 
-* Thu Nov 04 2011 Nicolas Vieville <nicolas.vieville at univ-valenciennes.fr> - 5.100.82.38-1
+* Fri Nov 04 2011 Nicolas Vieville <nicolas.vieville at univ-valenciennes.fr> - 5.100.82.38-1
 - Updated version to 5.100.82.38
 
 * Wed Nov 02 2011 Nicolas Chauvet <kwizart at gmail.com> - 5.60.48.36-2.12