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

Proposed by Brian Norris on 2014-09-13
Status: Merged
Merge reported by: Sebastien Bacher
Merged at revision: not available
Proposed branch: lp:~computersforpeace/ubuntu/utopic/bcmwl/fix-for-1358966
Merge into: lp:ubuntu/utopic/bcmwl
Diff against target: 66 lines (+44/-0)
3 files modified
debian/changelog (+10/-0)
debian/dkms.conf.in (+1/-0)
debian/patches/0014-add-support-for-Linux-3.17-rc4.patch (+33/-0)
To merge this branch: bzr merge lp:~computersforpeace/ubuntu/utopic/bcmwl/fix-for-1358966
Reviewer Review Type Date Requested Status
Sebastien Bacher 2014-09-13 Approve on 2014-11-21
Review via email: mp+234562@code.launchpad.net

Description of the change

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

To post a comment you must log in.
Sebastien Bacher (seb128) wrote :
review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== 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 @@
1bcmwl (6.30.223.248+bdcom-0ubuntu3) UNRELEASED; urgency=medium
2
3 * debian/patches/0014-add-support-for-Linux-3.17-rc4.patch:
4 - Fix build for new alloc_netdev() API in 3.17 release candidate
5 (LP: #1358966)
6 * debian/dkms.conf.in:
7 - Build with new patch
8
9 -- Brian Norris <computersforpeace@gmail.com> Fri, 12 Sep 2014 22:06:11 -0700
10
1bcmwl (6.30.223.248+bdcom-0ubuntu1) utopic; urgency=medium11bcmwl (6.30.223.248+bdcom-0ubuntu1) utopic; urgency=medium
212
3 * New upstream release: (LP: #1342645)13 * New upstream release: (LP: #1342645)
414
=== 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 @@
12PATCH[4]="0011-do-not-define-__devinit-as-__init-in-linux-3.8-as-__.patch"12PATCH[4]="0011-do-not-define-__devinit-as-__init-in-linux-3.8-as-__.patch"
13PATCH[5]="0012-add-support-for-Linux-3.15.patch"13PATCH[5]="0012-add-support-for-Linux-3.15.patch"
14PATCH[6]="0013-gcc.patch"14PATCH[6]="0013-gcc.patch"
15PATCH[7]="0014-add-support-for-Linux-3.17-rc4.patch"
15#PATCH_MATCH[6]="^3.[10-11]"16#PATCH_MATCH[6]="^3.[10-11]"
16AUTOINSTALL="yes"17AUTOINSTALL="yes"
1718
=== 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 @@
1From 05dd11abffe27c2fd8f618e79036be026f71b20c Mon Sep 17 00:00:00 2001
2From: Brian Norris <computersforpeace@gmail.com>
3Date: Tue, 26 Aug 2014 01:21:19 -0800
4
5Subject: [PATCH] Add support for Linux 3.17-rc4
6
7Fixes Bug #1358966
8
9Signed-off-by: Brian Norris <computersforpeace@gmail.com>
10---
11 src/wl/sys/wl_linux.c | 19 +++++++++++++++++++
12 1 file changed, 19 insertions(+)
13
14diff --git a/src/wl/sys/wl_linux.c b/src/wl/sys/wl_linux.c
15index 3a5e46b..6384e58 100644
16--- a/src/wl/sys/wl_linux.c
17+++ b/src/wl/sys/wl_linux.c
18@@ -1351,7 +1351,12 @@
19 dev->priv = priv_link;
20 #else
21
22+#if (LINUX_VERSION_CODE < KERNEL_VERSION(3, 17, 0))
23 dev = alloc_netdev(sizeof(priv_link_t), intf_name, ether_setup);
24+#else
25+ dev = alloc_netdev(sizeof(priv_link_t), intf_name, NET_NAME_UNKNOWN,
26+ ether_setup);
27+#endif
28 if (!dev) {
29 WL_ERROR(("wl%d: %s: alloc_netdev failed\n",
30 (wl->pub)?wl->pub->unit:wlif->subunit, __FUNCTION__));
31--
321.9.1
33

Subscribers

People subscribed via source and target branches

to all changes: