rpms/wl-kmod/F-17 broadcom-wl-5.100.82.112-kernel-3.8.patch, 1.1, 1.2 wl-kmod.spec, 1.120, 1.121

[Nicolas Viéville]

Author: nvieville

Update of /cvs/nonfree/rpms/wl-kmod/F-17
In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv27545

Modified Files:
	broadcom-wl-5.100.82.112-kernel-3.8.patch wl-kmod.spec 
Log Message:
* Fri Mar 08 2013 Nicolas Vieville <nicolas.vieville at univ-valenciennes.fr> - 5.100.82.112-9
- Modified patch to build for kernel >= 3.8 rfbz#2715


broadcom-wl-5.100.82.112-kernel-3.8.patch:
 include/bcmutils.h   |    4 ++++
 wl/sys/wl_cfg80211.c |   41 ++++++++++++++++++++++++++++++++++++++---
 2 files changed, 42 insertions(+), 3 deletions(-)

Index: broadcom-wl-5.100.82.112-kernel-3.8.patch
===================================================================
RCS file: /cvs/nonfree/rpms/wl-kmod/F-17/broadcom-wl-5.100.82.112-kernel-3.8.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- broadcom-wl-5.100.82.112-kernel-3.8.patch	6 Mar 2013 09:13:42 -0000	1.1
+++ broadcom-wl-5.100.82.112-kernel-3.8.patch	8 Mar 2013 19:38:57 -0000	1.2
@@ -15,8 +15,30 @@
  extern const char *bcmerrorstr(int bcmerror);
 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	2012-11-07 18:16:51.000000000 +0100
-+++ hybrid-portsrc_x86_32-v5_100_82_112/src/wl/sys/wl_cfg80211.c	2013-03-01 16:40:19.344706682 +0100
-@@ -751,7 +751,11 @@
++++ hybrid-portsrc_x86_32-v5_100_82_112/src/wl/sys/wl_cfg80211.c	2013-03-08 17:34:37.798272480 +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, 8, 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, 8, 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,
+@@ -751,7 +758,11 @@
  	else
  		memset(&join_params.params.bssid, 0, ETHER_ADDR_LEN);
  
@@ -28,7 +50,33 @@
  
  	err = wl_dev_ioctl(dev, WLC_SET_SSID, &join_params, join_params_size);
  	if (err) {
-@@ -2054,7 +2058,12 @@
+@@ -1110,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, 8, 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
+@@ -1167,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, 8, 0)
++           struct wireless_dev *wdev,
++#endif
++           s32 *dbm)
+ {
+ 	struct wl_priv *wl = wiphy_to_wl(wiphy);
+ 	struct net_device *ndev = wl_to_ndev(wl);
+@@ -2054,7 +2073,12 @@
  	u16 beacon_interval;
  	s32 dtim_period;
  	size_t ie_len;
@@ -41,7 +89,7 @@
  	s32 err = 0;
  
  	ssid = &wl->profile->ssid;
-@@ -2085,8 +2094,19 @@
+@@ -2085,8 +2109,19 @@
  		beacon_interval = cpu_to_le16(bi->beacon_period);
  	} else {
  		WL_DBG(("Found the AP in the list - BSSID %pM\n", bss->bssid));


Index: wl-kmod.spec
===================================================================
RCS file: /cvs/nonfree/rpms/wl-kmod/F-17/wl-kmod.spec,v
retrieving revision 1.120
retrieving revision 1.121
diff -u -r1.120 -r1.121
--- wl-kmod.spec	6 Mar 2013 09:13:42 -0000	1.120
+++ wl-kmod.spec	8 Mar 2013 19:38:57 -0000	1.121
@@ -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
@@ -99,6 +99,9 @@
 rm -rf $RPM_BUILD_ROOT
 
 %changelog
+* Fri Mar 08 2013 Nicolas Vieville <nicolas.vieville at univ-valenciennes.fr> - 5.100.82.112-9
+- Modified patch to build for kernel >= 3.8 rfbz#2715
+
 * Wed Mar 06 2013 Nicolas Vieville <nicolas.vieville at univ-valenciennes.fr> - 5.100.82.112-8
 - Added patch to build for kernel >= 3.8