Merge lp:~computersforpeace/ubuntu/utopic/bcmwl/fix-for-1358966 into lp:ubuntu/utopic/bcmwl

[Brian Norris]

Fix for new alloc_netdev() API in 3.17 Linux release candidate (LP: #1358966)

[Sebastien Bacher (seb128)]

Looks like it has been uploaded with https://launchpad.net/ubuntu/+source/bcmwl/6.30.223.248+bdcom-0ubuntu2 , thanks

review: Approve

=== modified file 'debian/changelog'
--- debian/changelog	2014-08-01 11:09:43 +0000
+++ debian/changelog	2014-09-13 05:17:33 +0000
@@ -1,3 +1,13 @@
+bcmwl (6.30.223.248+bdcom-0ubuntu3) UNRELEASED; urgency=medium
+
+  * debian/patches/0014-add-support-for-Linux-3.17-rc4.patch:
+    - Fix build for new alloc_netdev() API in 3.17 release candidate
+      (LP: #1358966)
+  * debian/dkms.conf.in:
+    - Build with new patch
+
+ -- Brian Norris <[e-mail]>  Fri, 12 Sep 2014 22:06:11 -0700
+
 bcmwl (6.30.223.248+bdcom-0ubuntu1) utopic; urgency=medium
 
   * New upstream release: (LP: #1342645)

=== modified file 'debian/dkms.conf.in'
--- debian/dkms.conf.in	2014-08-01 11:09:43 +0000
+++ debian/dkms.conf.in	2014-09-13 05:17:33 +0000
@@ -12,5 +12,6 @@
 PATCH[4]="0011-do-not-define-__devinit-as-__init-in-linux-3.8-as-__.patch"
 PATCH[5]="0012-add-support-for-Linux-3.15.patch"
 PATCH[6]="0013-gcc.patch"
+PATCH[7]="0014-add-support-for-Linux-3.17-rc4.patch"
 #PATCH_MATCH[6]="^3.[10-11]"
 AUTOINSTALL="yes"

=== added file 'debian/patches/0014-add-support-for-Linux-3.17-rc4.patch'
--- debian/patches/0014-add-support-for-Linux-3.17-rc4.patch	1970-01-01 00:00:00 +0000
+++ debian/patches/0014-add-support-for-Linux-3.17-rc4.patch	2014-09-13 05:17:33 +0000
@@ -0,0 +1,33 @@
+From 05dd11abffe27c2fd8f618e79036be026f71b20c Mon Sep 17 00:00:00 2001
+From: Brian Norris <[e-mail]>
+Date: Tue, 26 Aug 2014 01:21:19 -0800
+
+Subject: [PATCH] Add support for Linux 3.17-rc4
+
+Fixes Bug #1358966
+
+Signed-off-by: Brian Norris <[e-mail]>
+---
+ src/wl/sys/wl_linux.c | 19 +++++++++++++++++++
+ 1 file changed, 19 insertions(+)
+
+diff --git a/src/wl/sys/wl_linux.c b/src/wl/sys/wl_linux.c
+index 3a5e46b..6384e58 100644
+--- a/src/wl/sys/wl_linux.c
++++ b/src/wl/sys/wl_linux.c
+@@ -1351,7 +1351,12 @@
+ 	dev->priv = priv_link;
+ #else
+ 
++#if (LINUX_VERSION_CODE < KERNEL_VERSION(3, 17, 0))
+ 	dev = alloc_netdev(sizeof(priv_link_t), intf_name, ether_setup);
++#else
++	dev = alloc_netdev(sizeof(priv_link_t), intf_name, NET_NAME_UNKNOWN,
++			   ether_setup);
++#endif
+ 	if (!dev) {
+ 		WL_ERROR(("wl%d: %s: alloc_netdev failed\n",
+ 			(wl->pub)?wl->pub->unit:wlif->subunit, __FUNCTION__));
+-- 
+1.9.1
+