Package: broadcom-sta-source
Version: 5.100.82.112-1
Severity: normal

Attached here are two patches for including in debian/patches

1) The first makes broadcom-sta-source build with a 2.6.39.X kernel

2) The other renames the interface ethX that the driver automatically
generates to another called wlanX like all the wireless drivers.
Index: broadcom-sta-5.100.82.112/i386/src/wl/sys/wl_cfg80211.c
===================================================================
--- broadcom-sta-5.100.82.112.orig/i386/src/wl/sys/wl_cfg80211.c	2011-10-22 18:55:54.000000000 +0200
+++ broadcom-sta-5.100.82.112/i386/src/wl/sys/wl_cfg80211.c	2011-11-08 16:16:00.000000000 +0100
@@ -1811,7 +1811,7 @@
 	notif_bss_info->frame_len = offsetof(struct ieee80211_mgmt, u.beacon.variable) +
 	                            wl_get_ielen(wl);
 	freq = ieee80211_channel_to_frequency(notif_bss_info->channel 
-#if LINUX_VERSION_CODE > KERNEL_VERSION(2, 6, 39)
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 39)
 		,(notif_bss_info->channel <= CH_MAX_2G_CHANNEL) ? IEEE80211_BAND_2GHZ : IEEE80211_BAND_5GHZ
 #endif
 	);
Index: broadcom-sta-5.100.82.112/amd64/src/wl/sys/wl_cfg80211.c
===================================================================
--- broadcom-sta-5.100.82.112.orig/amd64/src/wl/sys/wl_cfg80211.c	2011-10-22 18:55:54.000000000 +0200
+++ broadcom-sta-5.100.82.112/amd64/src/wl/sys/wl_cfg80211.c	2011-11-08 16:16:00.000000000 +0100
@@ -1811,7 +1811,7 @@
 	notif_bss_info->frame_len = offsetof(struct ieee80211_mgmt, u.beacon.variable) +
 	                            wl_get_ielen(wl);
 	freq = ieee80211_channel_to_frequency(notif_bss_info->channel 
-#if LINUX_VERSION_CODE > KERNEL_VERSION(2, 6, 39)
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 39)
 		,(notif_bss_info->channel <= CH_MAX_2G_CHANNEL) ? IEEE80211_BAND_2GHZ : IEEE80211_BAND_5GHZ
 #endif
 	);
Index: broadcom-sta-5.100.82.112/i386/src/wl/sys/wl_linux.c
===================================================================
--- broadcom-sta-5.100.82.112.orig/i386/src/wl/sys/wl_linux.c	2011-11-08 19:54:08.000000000 +0100
+++ broadcom-sta-5.100.82.112/i386/src/wl/sys/wl_linux.c	2011-11-08 20:11:40.000000000 +0100
@@ -258,7 +256,7 @@
 #define quote_str(s) to_str(s)
 
 #ifndef BRCM_WLAN_IFNAME
-#define BRCM_WLAN_IFNAME eth%d
+#define BRCM_WLAN_IFNAME wlan%d
 #endif
 
 static char name[IFNAMSIZ] = quote_str(BRCM_WLAN_IFNAME);
Index: broadcom-sta-5.100.82.112/i386/src/wl/sys/wl_linux.c
===================================================================
--- broadcom-sta-5.100.82.112.orig/amd64/src/wl/sys/wl_linux.c	2011-11-08 19:54:08.000000000 +0100
+++ broadcom-sta-5.100.82.112/amd64/src/wl/sys/wl_linux.c	2011-11-08 20:11:40.000000000 +0100
@@ -258,7 +256,7 @@
 #define quote_str(s) to_str(s)
 
 #ifndef BRCM_WLAN_IFNAME
-#define BRCM_WLAN_IFNAME eth%d
+#define BRCM_WLAN_IFNAME wlan%d
 #endif
 
 static char name[IFNAMSIZ] = quote_str(BRCM_WLAN_IFNAME);

Attachment: signature.asc
Description: OpenPGP digital signature

Reply via email to