103 lines
2.8 KiB
Diff
103 lines
2.8 KiB
Diff
|
diff -Naur bcmwl-6.30.223.30+bdcom.orig/src/src/wl/sys/wl_linux.c bcmwl-6.30.223.30+bdcom/src/src/wl/sys/wl_linux.c
|
||
|
|
--- bcmwl-6.30.223.30+bdcom.orig/src/src/wl/sys/wl_linux.c 2013-04-23 12:31:31.011588881 +0200
|
||
|
|
+++ bcmwl-6.30.223.30+bdcom/src/src/wl/sys/wl_linux.c 2013-05-20 18:27:18.830187333 +0200
|
||
|
|
@@ -3229,7 +3229,12 @@
|
||
|
|
wl_tkip_printstats(wl_info_t *wl, bool group_key)
|
||
|
|
{
|
||
|
|
#if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 14)
|
||
|
|
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(3, 10, 0)
|
||
|
|
+ struct seq_file sfile;
|
||
|
|
+ struct seq_file *debug_buf = &sfile;
|
||
|
|
+#else
|
||
|
|
char debug_buf[512];
|
||
|
|
+#endif
|
||
|
|
int idx;
|
||
|
|
if (wl->tkipmodops) {
|
||
|
|
if (group_key) {
|
||
|
|
@@ -3242,7 +3247,11 @@
|
||
|
|
wl->tkipmodops->print_stats(debug_buf, wl->tkip_ucast_data);
|
||
|
|
else
|
||
|
|
return;
|
||
|
|
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(3, 10, 0)
|
||
|
|
+ printk("%s: TKIP stats from module: %s\n", debug_buf->buf, group_key?"Bcast":"Ucast");
|
||
|
|
+#else
|
||
|
|
printk("%s: TKIP stats from module: %s\n", debug_buf, group_key?"Bcast":"Ucast");
|
||
|
|
+#endif
|
||
|
|
}
|
||
|
|
#endif
|
||
|
|
}
|
||
|
|
@@ -3401,17 +3410,24 @@
|
||
|
|
return 0;
|
||
|
|
}
|
||
|
|
|
||
|
|
+#if LINUX_VERSION_CODE < KERNEL_VERSION(3, 10, 0)
|
||
|
|
static int
|
||
|
|
wl_proc_read(char *buffer, char **start, off_t offset, int length, int *eof, void *data)
|
||
|
|
+#else
|
||
|
|
+static ssize_t
|
||
|
|
+wl_proc_read (struct file *filp, char __user *buffer, size_t length, loff_t *data)
|
||
|
|
+#endif
|
||
|
|
{
|
||
|
|
wl_info_t * wl = (wl_info_t *)data;
|
||
|
|
int bcmerror, to_user;
|
||
|
|
int len;
|
||
|
|
|
||
|
|
+#if LINUX_VERSION_CODE < KERNEL_VERSION(3, 10, 0)
|
||
|
|
if (offset > 0) {
|
||
|
|
*eof = 1;
|
||
|
|
return 0;
|
||
|
|
}
|
||
|
|
+#endif
|
||
|
|
|
||
|
|
if (!length) {
|
||
|
|
WL_ERROR(("%s: Not enough return buf space\n", __FUNCTION__));
|
||
|
|
@@ -3424,8 +3440,13 @@
|
||
|
|
return len;
|
||
|
|
}
|
||
|
|
|
||
|
|
+#if LINUX_VERSION_CODE < KERNEL_VERSION(3, 10, 0)
|
||
|
|
static int
|
||
|
|
wl_proc_write(struct file *filp, const char *buff, unsigned long length, void *data)
|
||
|
|
+#else
|
||
|
|
+static ssize_t
|
||
|
|
+wl_proc_write (struct file *filp, const char __user *buff, size_t length, loff_t *data)
|
||
|
|
+#endif
|
||
|
|
{
|
||
|
|
wl_info_t * wl = (wl_info_t *)data;
|
||
|
|
int from_user = 0;
|
||
|
|
@@ -3455,19 +3476,34 @@
|
||
|
|
return length;
|
||
|
|
}
|
||
|
|
|
||
|
|
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(3, 10, 0)
|
||
|
|
+static const struct file_operations wl_fops = {
|
||
|
|
+ .owner = THIS_MODULE,
|
||
|
|
+ .read = wl_proc_read,
|
||
|
|
+ .write = wl_proc_write,
|
||
|
|
+};
|
||
|
|
+#endif
|
||
|
|
+
|
||
|
|
static int
|
||
|
|
wl_reg_proc_entry(wl_info_t *wl)
|
||
|
|
{
|
||
|
|
char tmp[32];
|
||
|
|
sprintf(tmp, "%s%d", HYBRID_PROC, wl->pub->unit);
|
||
|
|
+#if LINUX_VERSION_CODE < KERNEL_VERSION(3, 10, 0)
|
||
|
|
if ((wl->proc_entry = create_proc_entry(tmp, 0644, NULL)) == NULL) {
|
||
|
|
WL_ERROR(("%s: create_proc_entry %s failed\n", __FUNCTION__, tmp));
|
||
|
|
+#else
|
||
|
|
+ if ((wl->proc_entry = proc_create(tmp, 0644, NULL, &wl_fops)) == NULL) {
|
||
|
|
+ WL_ERROR(("%s: proc_create %s failed\n", __FUNCTION__, tmp));
|
||
|
|
+#endif
|
||
|
|
ASSERT(0);
|
||
|
|
return -1;
|
||
|
|
}
|
||
|
|
+#if LINUX_VERSION_CODE < KERNEL_VERSION(3, 10, 0)
|
||
|
|
wl->proc_entry->read_proc = wl_proc_read;
|
||
|
|
wl->proc_entry->write_proc = wl_proc_write;
|
||
|
|
wl->proc_entry->data = wl;
|
||
|
|
+#endif
|
||
|
|
return 0;
|
||
|
|
}
|
||
|
|
#ifdef WLOFFLD
|