rpms/wl-kmod/F-17 broadcom-wl-5.100.82.112-kernel-3.6.patch, 1.1, 1.2 wl-kmod.spec, 1.92, 1.93

[Nicolas Viéville]

Author: nvieville

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

Modified Files:
	broadcom-wl-5.100.82.112-kernel-3.6.patch wl-kmod.spec 
Log Message:
* Wed Oct 17 2012 Nicolas Vieville <nicolas.vieville at univ-valenciennes.fr> - 5.100.82.112-5.1
- Cleaned up patch for kernel >= 3.6


broadcom-wl-5.100.82.112-kernel-3.6.patch:
 wl_cfg80211.c |   12 ++++++++++++
 1 file changed, 12 insertions(+)

Index: broadcom-wl-5.100.82.112-kernel-3.6.patch
===================================================================
RCS file: /cvs/nonfree/rpms/wl-kmod/F-17/broadcom-wl-5.100.82.112-kernel-3.6.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- broadcom-wl-5.100.82.112-kernel-3.6.patch	16 Oct 2012 19:13:24 -0000	1.1
+++ broadcom-wl-5.100.82.112-kernel-3.6.patch	17 Oct 2012 05:58:56 -0000	1.2
@@ -1,6 +1,6 @@
 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	2011-10-22 18:56:55.000000000 +0200
-+++ hybrid-portsrc_x86_32-v5_100_82_112/src/wl/sys/wl_cfg80211.c	2012-10-16 14:30:42.882619819 +0200
++++ hybrid-portsrc_x86_32-v5_100_82_112/src/wl/sys/wl_cfg80211.c	2012-10-16 22:04:18.718673254 +0200
 @@ -42,7 +42,11 @@
             enum nl80211_iftype type, u32 *flags, struct vif_params *params);
  static s32 __wl_cfg80211_scan(struct wiphy *wiphy, struct net_device *ndev,
@@ -13,7 +13,7 @@
             struct cfg80211_scan_request *request);
  static s32 wl_cfg80211_set_wiphy_params(struct wiphy *wiphy, u32 changed);
  static s32 wl_cfg80211_join_ibss(struct wiphy *wiphy, struct net_device *dev,
-@@ -570,10 +574,16 @@
+@@ -570,10 +574,18 @@
  }
  
  static s32
@@ -25,8 +25,10 @@
                   struct cfg80211_scan_request *request)
  {
  	s32 err = 0;
++#if LINUX_VERSION_CODE >= KERNEL_VERSION(3, 6, 0)
 +	struct wl_priv *wl = wiphy_to_wl(wiphy);
 +	struct net_device *ndev = wl_to_ndev(wl);
++#endif
  
  	CHECK_SYS_UP();
  	err = __wl_cfg80211_scan(wiphy, ndev, request, NULL);


Index: wl-kmod.spec
===================================================================
RCS file: /cvs/nonfree/rpms/wl-kmod/F-17/wl-kmod.spec,v
retrieving revision 1.92
retrieving revision 1.93
diff -u -r1.92 -r1.93
--- wl-kmod.spec	16 Oct 2012 19:13:24 -0000	1.92
+++ wl-kmod.spec	17 Oct 2012 05:58:56 -0000	1.93
@@ -7,7 +7,7 @@
 
 Name:		wl-kmod
 Version:	5.100.82.112
-Release:	5%{?dist}
+Release:	5%{?dist}.1
 Summary:	Kernel module for Broadcom wireless devices
 Group:		System Environment/Kernel
 License:	Redistributable, no modification permitted
@@ -89,6 +89,9 @@
 rm -rf $RPM_BUILD_ROOT
 
 %changelog
+* Wed Oct 17 2012 Nicolas Vieville <nicolas.vieville at univ-valenciennes.fr> - 5.100.82.112-5.1
+- Cleaned up patch for kernel >= 3.6
+
 * Tue Oct 16 2012 Nicolas Vieville <nicolas.vieville at univ-valenciennes.fr> - 5.100.82.112-5
 - Added patch to build for kernel >= 3.6