rpms/wl-kmod/F-20 wl-kmod-005_kernel_3.15.patch, NONE, 1.1 wl-kmod.spec, 1.109, 1.110

[Leigh Scott]

Author: leigh123linux

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

Modified Files:
	wl-kmod.spec 
Added Files:
	wl-kmod-005_kernel_3.15.patch 
Log Message:
* Tue Jul 08 2014 Leigh Scott <leigh123linux at googlemail.com> - 6.30.223.141-6
- Patch for 3.15 kernel


wl-kmod-005_kernel_3.15.patch:
 wl_cfg80211_hybrid.c |   20 +++++++++++++++++++-
 1 file changed, 19 insertions(+), 1 deletion(-)

--- NEW FILE wl-kmod-005_kernel_3.15.patch ---
>From 05dd11abffe27c2fd8f618e79036be026f71b20c Mon Sep 17 00:00:00 2001
From: Alberto Milone <alberto.milone at canonical.com>
Date: Mon, 12 May 2014 17:32:44 +0200
Subject: [PATCH 1/1] Add support for Linux 3.15

Make sure to pass the channel to cfg80211_ibss_joined().

This should fix LP: #1307744
---
 src/wl/sys/wl_cfg80211_hybrid.c | 19 +++++++++++++++++++
 1 file changed, 19 insertions(+)

diff --git a/src/wl/sys/wl_cfg80211_hybrid.c b/src/wl/sys/wl_cfg80211_hybrid.c
index 3a5e46b..6384e58 100644
--- a/src/wl/sys/wl_cfg80211_hybrid.c
+++ b/src/wl/sys/wl_cfg80211_hybrid.c
@@ -1841,7 +1841,26 @@ wl_notify_connect_status(struct wl_cfg80211_priv *wl, struct net_device *ndev,
 			wl_get_assoc_ies(wl);
 			memcpy(&wl->bssid, &e->addr, ETHER_ADDR_LEN);
 			wl_update_bss_info(wl);
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(3, 15, 0)
+			{
+				struct wl_bss_info *bi;
+				u16 bss_info_channel;
+				struct ieee80211_channel *channel;
+				u32 freq;
+
+				bi = (struct wl_bss_info *)(wl->extra_buf + 4);
+				bss_info_channel = bi->ctl_ch ? bi->ctl_ch : CHSPEC_CHANNEL(bi->chanspec);
+
+				freq = ieee80211_channel_to_frequency(bss_info_channel,
+					(bss_info_channel <= CH_MAX_2G_CHANNEL) ?
+					IEEE80211_BAND_2GHZ : IEEE80211_BAND_5GHZ);
+
+				channel = ieee80211_get_channel(wl_to_wiphy(wl), freq);
+				cfg80211_ibss_joined(ndev, (u8 *)&wl->bssid, channel, GFP_KERNEL);
+			}
+#else
 			cfg80211_ibss_joined(ndev, (u8 *)&wl->bssid, GFP_KERNEL);
+#endif
 			set_bit(WL_STATUS_CONNECTED, &wl->status);
 			wl->profile->active = true;
 		}
-- 
1.9.1



Index: wl-kmod.spec
===================================================================
RCS file: /cvs/nonfree/rpms/wl-kmod/F-20/wl-kmod.spec,v
retrieving revision 1.109
retrieving revision 1.110
diff -u -r1.109 -r1.110
--- wl-kmod.spec	8 Jul 2014 11:34:06 -0000	1.109
+++ wl-kmod.spec	8 Jul 2014 12:58:49 -0000	1.110
@@ -3,11 +3,11 @@
 # "buildforkernels newest" macro for just that build; immediately after
 # queuing that build enable the macro again for subsequent builds; that way
 # a new akmod package will only get build when a new one is actually needed
-%global buildforkernels newest
+%global buildforkernels current
 
 Name:       wl-kmod
 Version:    6.30.223.141
-Release:    5%{?dist}.29
+Release:    6%{?dist}
 Summary:    Kernel module for Broadcom wireless devices
 Group:      System Environment/Kernel
 License:    Redistributable, no modification permitted
@@ -19,6 +19,7 @@
 Patch1:     wl-kmod-002_wext_workaround.patch
 Patch2:     wl-kmod-003_kernel_3.8.patch
 Patch3:     wl-kmod-004_kernel_3.10.patch
+Patch4:     wl-kmod-005_kernel_3.15.patch
 
 BuildRequires:  %{_bindir}/kmodtool
 
@@ -61,6 +62,7 @@
 %patch1  -p1 -b .wext_workaround.patch
 %patch2  -p1 -b .kernel-3.8
 %patch3  -p1 -b .kernel-3.10
+%patch4  -p1 -b .kernel-3.15
 popd
 
 for kernel_version in %{?kernel_versions} ; do
@@ -90,6 +92,9 @@
 rm -rf $RPM_BUILD_ROOT
 
 %changelog
+* Tue Jul 08 2014 Leigh Scott <leigh123linux at googlemail.com> - 6.30.223.141-6
+- Patch for 3.15 kernel
+
 * Tue Jul 08 2014 Nicolas Chauvet <kwizart at gmail.com> - 6.30.223.141-5.29
 - Rebuilt for kernel