Bug#762711: broadcom-sta-dkms: Compatibility with linux 3.17

[Elías Alejandro]

Package: broadcom-sta-dkms
Version: 6.30.223.248-1
Severity: normal
Tags: patch

Dear Maintainer,

Installing linux 3.17 I got the following messages:

error: macro "alloc_netdev" requires 4 arguments, but only 3 given dev = 
alloc_netdev(sizeof(priv_link_t), intf_name, ether_setup);

I'm attaching a patch.


Best regards.

--
Elías Alejandro


-- System Information:
Debian Release: jessie/sid
  APT prefers unstable
  APT policy: (500, 'unstable'), (500, 'stable')
Architecture: i386 (i686)

Kernel: Linux 3.17.0-eudyptula+ (SMP w/2 CPU cores)
Locale: LANG=es_PE.UTF-8, LC_CTYPE=es_PE.UTF-8 (charmap=UTF-8)
Shell: /bin/sh linked to /bin/dash

Versions of packages broadcom-sta-dkms depends on:
ii  dkms  2.2.0.3-1.3

Versions of packages broadcom-sta-dkms recommends:
ii  wireless-tools  30~pre9-8

broadcom-sta-dkms suggests no packages.

-- no debconf information

Index: broadcom-sta-6.30.223.248/amd64/src/wl/sys/wl_linux.c
===================================================================
--- broadcom-sta-6.30.223.248.orig/amd64/src/wl/sys/wl_linux.c	2014-09-24 10:45:55.000000000 -0500
+++ broadcom-sta-6.30.223.248/amd64/src/wl/sys/wl_linux.c	2014-09-24 10:49:08.000000000 -0500
@@ -1309,7 +1309,12 @@
 	dev->priv = priv_link;
 #else
 
-	dev = alloc_netdev(sizeof(priv_link_t), intf_name, ether_setup);
+	#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__));
Index: broadcom-sta-6.30.223.248/i386/src/wl/sys/wl_linux.c
===================================================================
--- broadcom-sta-6.30.223.248.orig/i386/src/wl/sys/wl_linux.c	2014-09-24 10:45:55.000000000 -0500
+++ broadcom-sta-6.30.223.248/i386/src/wl/sys/wl_linux.c	2014-09-24 10:48:13.000000000 -0500
@@ -1307,7 +1307,12 @@
 	dev->priv = priv_link;
 #else
 
-	dev = alloc_netdev(sizeof(priv_link_t), intf_name, ether_setup);
+	#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__));