diff --git a/packages/linux-drivers/bcm_sta/patches/6.20.155.1/bcm_sta-010-add-support-for-linux-3.10.0.patch b/packages/linux-drivers/bcm_sta/patches/6.20.155.1/bcm_sta-010-add-support-for-linux-3.10.0.patch index e3b35a31c4..602bef112f 100644 --- a/packages/linux-drivers/bcm_sta/patches/6.20.155.1/bcm_sta-010-add-support-for-linux-3.10.0.patch +++ b/packages/linux-drivers/bcm_sta/patches/6.20.155.1/bcm_sta-010-add-support-for-linux-3.10.0.patch @@ -1,8 +1,7 @@ -diff --git a/x86-32/src/wl/sys/wl_linux.c b/x86-32/src/wl/sys/wl_linux.c -index 9ee69e1..409bda7 100644 ---- a/x86-32/src/wl/sys/wl_linux.c -+++ b/x86-32/src/wl/sys/wl_linux.c -@@ -2693,7 +2693,7 @@ wl_tkip_keyset(wl_info_t *wl, wsec_key_t *key) +diff -Naur bcm_sta-6.20.155.1/x86-32/src/wl/sys/wl_linux.c bcm_sta-6.20.155.1.patch/x86-32/src/wl/sys/wl_linux.c +--- bcm_sta-6.20.155.1/x86-32/src/wl/sys/wl_linux.c 2013-04-14 23:10:38.000000000 +0200 ++++ bcm_sta-6.20.155.1.patch/x86-32/src/wl/sys/wl_linux.c 2014-05-14 21:47:59.249976234 +0200 +@@ -2681,7 +2681,7 @@ void wl_tkip_printstats(wl_info_t *wl, bool group_key) { @@ -11,7 +10,7 @@ index 9ee69e1..409bda7 100644 char debug_buf[512]; int idx; if (wl->tkipmodops) { -@@ -2855,6 +2855,7 @@ wl_linux_watchdog(void *ctx) +@@ -2843,6 +2843,7 @@ return 0; } @@ -19,7 +18,7 @@ index 9ee69e1..409bda7 100644 static int wl_proc_read(char *buffer, char **start, off_t offset, int length, int *eof, void *data) { -@@ -2909,18 +2910,89 @@ wl_proc_write(struct file *filp, const char *buff, unsigned long length, void *d +@@ -2897,18 +2898,89 @@ return length; } @@ -99,7 +98,7 @@ index 9ee69e1..409bda7 100644 + wl->proc_entry->read_proc = wl_proc_read; + wl->proc_entry->write_proc = wl_proc_write; + wl->proc_entry->data = wl; -+ } ++ } +#else + wl->proc_entry = proc_create_data(tmp, 0644, NULL, &wl_proc_fops, wl); +#endif @@ -113,24 +112,10 @@ index 9ee69e1..409bda7 100644 - wl->proc_entry->data = wl; return 0; } -diff --git a/x86-32/src/wl/sys/wl_linux.c.orig b/x86-32/src/wl/sys/wl_linux.c.orig -index 38206ab..9ee69e1 100644 ---- a/x86-32/src/wl/sys/wl_linux.c.orig -+++ b/x86-32/src/wl/sys/wl_linux.c.orig -@@ -219,7 +219,7 @@ module_param(nompc, int, 0); - #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 intf_name[IFNAMSIZ] = quote_str(BRCM_WLAN_IFNAME); -diff --git a/x86-64/src/wl/sys/wl_linux.c b/x86-64/src/wl/sys/wl_linux.c -index 9ee69e1..409bda7 100644 ---- a/x86-64/src/wl/sys/wl_linux.c -+++ b/x86-64/src/wl/sys/wl_linux.c -@@ -2693,7 +2693,7 @@ wl_tkip_keyset(wl_info_t *wl, wsec_key_t *key) +diff -Naur bcm_sta-6.20.155.1/x86-64/src/wl/sys/wl_linux.c bcm_sta-6.20.155.1.patch/x86-64/src/wl/sys/wl_linux.c +--- bcm_sta-6.20.155.1/x86-64/src/wl/sys/wl_linux.c 2013-04-14 23:10:38.000000000 +0200 ++++ bcm_sta-6.20.155.1.patch/x86-64/src/wl/sys/wl_linux.c 2014-05-14 21:48:16.002975186 +0200 +@@ -2681,7 +2681,7 @@ void wl_tkip_printstats(wl_info_t *wl, bool group_key) { @@ -139,7 +124,7 @@ index 9ee69e1..409bda7 100644 char debug_buf[512]; int idx; if (wl->tkipmodops) { -@@ -2855,6 +2855,7 @@ wl_linux_watchdog(void *ctx) +@@ -2843,6 +2843,7 @@ return 0; } @@ -147,7 +132,7 @@ index 9ee69e1..409bda7 100644 static int wl_proc_read(char *buffer, char **start, off_t offset, int length, int *eof, void *data) { -@@ -2909,18 +2910,89 @@ wl_proc_write(struct file *filp, const char *buff, unsigned long length, void *d +@@ -2897,18 +2898,89 @@ return length; } @@ -227,7 +212,7 @@ index 9ee69e1..409bda7 100644 + wl->proc_entry->read_proc = wl_proc_read; + wl->proc_entry->write_proc = wl_proc_write; + wl->proc_entry->data = wl; -+ } ++ } +#else + wl->proc_entry = proc_create_data(tmp, 0644, NULL, &wl_proc_fops, wl); +#endif @@ -241,16 +226,3 @@ index 9ee69e1..409bda7 100644 - wl->proc_entry->data = wl; return 0; } -diff --git a/x86-64/src/wl/sys/wl_linux.c.orig b/x86-64/src/wl/sys/wl_linux.c.orig -index 38206ab..9ee69e1 100644 ---- a/x86-64/src/wl/sys/wl_linux.c.orig -+++ b/x86-64/src/wl/sys/wl_linux.c.orig -@@ -219,7 +219,7 @@ module_param(nompc, int, 0); - #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 intf_name[IFNAMSIZ] = quote_str(BRCM_WLAN_IFNAME);