diff -u bcmwl-6.30.223.141+bdcom/debian/dkms.conf.in bcmwl-6.30.223.141+bdcom/debian/dkms.conf.in --- bcmwl-6.30.223.141+bdcom/debian/dkms.conf.in +++ bcmwl-6.30.223.141+bdcom/debian/dkms.conf.in @@ -10,4 +10,6 @@ PATCH[2]="0003-Make-up-for-missing-init_MUTEX.patch" PATCH[3]="0009-add-support-for-linux-3.10.0.patch" +PATCH[4]="0010-change-the-network-interface-name-from-eth-to-wlan.patch" +PATCH[5]="0011-do-not-define-__devinit-as-__init-in-linux-3.8-as-__.patch" #PATCH_MATCH[6]="^3.[10-11]" AUTOINSTALL="yes" diff -u bcmwl-6.30.223.141+bdcom/debian/changelog bcmwl-6.30.223.141+bdcom/debian/changelog --- bcmwl-6.30.223.141+bdcom/debian/changelog +++ bcmwl-6.30.223.141+bdcom/debian/changelog @@ -1,3 +1,17 @@ +bcmwl (6.30.223.141+bdcom-0ubuntu2) trusty; urgency=low + + [ Shuduo Sang ] + * 0010-change-the-network-interface-name-from-eth-to-wlan.patch: + - Change the network interface name from eth to wlan + (LP: #1157136). + + [ Krzysztof Kolasa ] + * 0011-do-not-define-__devinit-as-__init-in-linux-3.8-as-__.patch: + - Do not define __devinit as __init when dealing with + Linux >= 3.8. + + -- Alberto Milone Fri, 22 Nov 2013 11:24:36 +0100 + bcmwl (6.30.223.141+bdcom-0ubuntu1) saucy; urgency=low * New upstream release: only in patch2: unchanged: --- bcmwl-6.30.223.141+bdcom.orig/debian/patches/0010-change-the-network-interface-name-from-eth-to-wlan.patch +++ bcmwl-6.30.223.141+bdcom/debian/patches/0010-change-the-network-interface-name-from-eth-to-wlan.patch @@ -0,0 +1,26 @@ +From c51168b8481e84743b50d3d5cba18a4a0a188448 Mon Sep 17 00:00:00 2001 +From: Alberto Milone +Date: Fri, 22 Nov 2013 10:07:33 +0100 +Subject: [PATCH 1/1] Change the network interface name from eth to wlan + +Thanks to Shuduo Sang for the patch. +--- + src/wl/sys/wl_linux.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/wl/sys/wl_linux.c b/src/wl/sys/wl_linux.c +index 3ead3c3..b662ff7 100644 +--- a/src/wl/sys/wl_linux.c ++++ b/src/wl/sys/wl_linux.c +@@ -235,7 +235,7 @@ module_param(nompc, int, 0); + #define to_str(s) #s + #define quote_str(s) to_str(s) + +-#define BRCM_WLAN_IFNAME eth%d ++#define BRCM_WLAN_IFNAME wlan%d + + static char intf_name[IFNAMSIZ] = quote_str(BRCM_WLAN_IFNAME); + +-- +1.7.9.5 + only in patch2: unchanged: --- bcmwl-6.30.223.141+bdcom.orig/debian/patches/0011-do-not-define-__devinit-as-__init-in-linux-3.8-as-__.patch +++ bcmwl-6.30.223.141+bdcom/debian/patches/0011-do-not-define-__devinit-as-__init-in-linux-3.8-as-__.patch @@ -0,0 +1,31 @@ +From 463082d4d3141d89f5d174d4a85800501f71d5db Mon Sep 17 00:00:00 2001 +From: Alberto Milone +Date: Fri, 22 Nov 2013 10:15:22 +0100 +Subject: [PATCH 1/1] Do not define __devinit as __init in linux >= 3.8 as + __init was removed + +Thanks to Krzysztof Kolasa for the patch. +--- + src/include/linuxver.h | 4 ++++ + 1 file changed, 4 insertions(+) + +diff --git a/src/include/linuxver.h b/src/include/linuxver.h +index 5548e71..5044739 100644 +--- a/src/include/linuxver.h ++++ b/src/include/linuxver.h +@@ -169,8 +169,12 @@ typedef irqreturn_t(*FN_ISR) (int irq, void *dev_id, struct pt_regs *ptregs); + #define __devexit + #endif + #ifndef __devinit ++#if LINUX_VERSION_CODE >= KERNEL_VERSION(3, 8, 0) ++#define __devinit ++#else + #define __devinit __init + #endif ++#endif + #ifndef __devinitdata + #define __devinitdata + #endif +-- +1.7.9.5 +