diff options
| author | Hauke Mehrtens <hauke@hauke-m.de> | 2013-07-31 17:42:55 +0000 |
|---|---|---|
| committer | Hauke Mehrtens <hauke@hauke-m.de> | 2013-07-31 17:42:55 +0000 |
| commit | e77339b9e2126e166927f62178fabf13d7346ea6 (patch) | |
| tree | 70e2b8537461a50480af9cfac10e964a31b24dab /package/kernel/broadcom-wl/patches | |
| parent | e2b2e3886bb7466b65c6dda9ba784a58e9832fa1 (diff) | |
| download | upstream-e77339b9e2126e166927f62178fabf13d7346ea6.tar.gz upstream-e77339b9e2126e166927f62178fabf13d7346ea6.tar.bz2 upstream-e77339b9e2126e166927f62178fabf13d7346ea6.zip | |
broadcom-wl: fix compile error with kernel 3.10
Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
SVN-Revision: 37626
Diffstat (limited to 'package/kernel/broadcom-wl/patches')
| -rw-r--r-- | package/kernel/broadcom-wl/patches/012-compat-3.10.patch | 47 |
1 files changed, 47 insertions, 0 deletions
diff --git a/package/kernel/broadcom-wl/patches/012-compat-3.10.patch b/package/kernel/broadcom-wl/patches/012-compat-3.10.patch new file mode 100644 index 0000000000..0e0415f9cd --- /dev/null +++ b/package/kernel/broadcom-wl/patches/012-compat-3.10.patch @@ -0,0 +1,47 @@ +--- a/driver/wl_linux.c ++++ b/driver/wl_linux.c +@@ -349,7 +349,7 @@ static void wl_mic_error(wl_info_t *wl, + defined(WL_MONITOR) + static int wl_schedule_task(wl_info_t *wl, void (*fn)(struct wl_task *), void *context); + #endif +-#if defined(CONFIG_PROC_FS) ++#if defined(CONFIG_PROC_FS) && (LINUX_VERSION_CODE < KERNEL_VERSION(3,10,0)) + static int wl_read_proc(char *buffer, char **start, off_t offset, int length, int *eof, void *data); + #endif /* defined(CONFIG_PROC_FS) */ + #ifdef BCMDBG +@@ -516,7 +516,7 @@ wl_attach(uint16 vendor, uint16 device, + struct net_device *dev; + wl_if_t *wlif; + wl_info_t *wl; +-#if defined(CONFIG_PROC_FS) ++#if defined(CONFIG_PROC_FS) && (LINUX_VERSION_CODE < KERNEL_VERSION(3,10,0)) + char tmp[128]; + #endif + osl_t *osh; +@@ -660,7 +660,7 @@ wl_attach(uint16 vendor, uint16 device, + WL_ERROR(("wl%d: Error setting MPC variable to 0\n", unit)); + } + } +-#if defined(CONFIG_PROC_FS) ++#if defined(CONFIG_PROC_FS) && (LINUX_VERSION_CODE < KERNEL_VERSION(3,10,0)) + /* create /proc/net/wl<unit> */ + sprintf(tmp, "net/wl%d", wl->pub->unit); + create_proc_read_entry(tmp, 0, 0, wl_read_proc, (void*)wl); +@@ -806,7 +806,7 @@ wl_dbus_disconnect_cb(void *arg) + } + #endif /* BCMDBUS */ + +-#if defined(CONFIG_PROC_FS) ++#if defined(CONFIG_PROC_FS) && (LINUX_VERSION_CODE < KERNEL_VERSION(3,10,0)) + static int + wl_read_proc(char *buffer, char **start, off_t offset, int length, int *eof, void *data) + { +@@ -1137,7 +1137,7 @@ wl_free(wl_info_t *wl) + + /* free common resources */ + if (wl->wlc) { +-#if defined(CONFIG_PROC_FS) ++#if defined(CONFIG_PROC_FS) && (LINUX_VERSION_CODE < KERNEL_VERSION(3,10,0)) + char tmp[128]; + /* remove /proc/net/wl<unit> */ + sprintf(tmp, "net/wl%d", wl->pub->unit); |