mirror of
https://github.com/NixOS/nixpkgs.git
synced 2024-11-18 15:56:50 +01:00
a589bfae17
In most cases, this just meant changing kernelDev (now removed from linuxPackagesFor) to kernel.dev. Some packages needed more work (though whether that was because of my changes or because they were already broken, I'm not sure). Specifics: * psmouse-alps builds on 3.4 but not 3.10, as noted in the comments that were already there * blcr builds on 3.4 but not 3.10, as noted in comments that were already there * open-iscsi, ati-drivers, wis-go7007, and openafsClient don't build on 3.4 or 3.10 on this branch or on master, so they're marked broken * A version-specific kernelHeaders package was added The following packages were removed: * atheros/madwifi is superceded by official ath*k modules * aufs is no longer used by any of our kernels * broadcom-sta v6 (which was already packaged) replaces broadcom-sta * exmap has not been updated since 2011 and doesn't build * iscis-target has not been updated since 2010 and doesn't build * iwlwifi is part of mainline now and doesn't build * nivida-x11-legacy-96 hasn't been updated since 2008 and doesn't build Everything not specifically mentioned above builds successfully on 3.10. I haven't yet tested on 3.4, but will before opening a pull request. Signed-off-by: Shea Levy <shea@shealevy.com>
126 lines
3.1 KiB
Diff
126 lines
3.1 KiB
Diff
--- a/src/wl/sys/wl_linux.c 2013-08-01 08:52:22.000000000 +0200
|
|
+++ b/src/wl/sys/wl_linux.c 2013-09-13 14:25:36.463020788 +0200
|
|
@@ -910,7 +910,11 @@
|
|
pci_set_drvdata(pdev, NULL);
|
|
}
|
|
|
|
+#if LINUX_VERSION_CODE < KERNEL_VERSION(3, 8, 0)
|
|
static struct pci_driver wl_pci_driver = {
|
|
+#else
|
|
+static struct pci_driver wl_pci_driver __refdata = {
|
|
+#endif
|
|
name: "wl",
|
|
probe: wl_pci_probe,
|
|
suspend: wl_suspend,
|
|
@@ -3235,7 +3239,7 @@
|
|
void
|
|
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(2, 6, 14) && LINUX_VERSION_CODE < KERNEL_VERSION(3, 10, 0)
|
|
char debug_buf[512];
|
|
int idx;
|
|
if (wl->tkipmodops) {
|
|
@@ -3408,6 +3412,7 @@
|
|
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)
|
|
{
|
|
@@ -3462,19 +3467,90 @@
|
|
return length;
|
|
}
|
|
|
|
+#else
|
|
+
|
|
+static int
|
|
+wl_proc_read(struct seq_file *seq, void *offset)
|
|
+{
|
|
+ wl_info_t * wl = (wl_info_t *)seq->private;
|
|
+ int bcmerror, to_user;
|
|
+
|
|
+ WL_LOCK(wl);
|
|
+ bcmerror = wlc_ioctl(wl->wlc, WLC_GET_MONITOR, &to_user, sizeof(int), NULL);
|
|
+ WL_UNLOCK(wl);
|
|
+
|
|
+ seq_printf(seq, "%d\n", to_user);
|
|
+ return bcmerror;
|
|
+}
|
|
+
|
|
+static ssize_t wl_proc_write(struct file *file, const char __user *buff,
|
|
+ size_t length, loff_t *ppos)
|
|
+{
|
|
+ struct seq_file *seq = file->private_data;
|
|
+ wl_info_t * wl = (wl_info_t *)seq->private;
|
|
+ int bcmerror, from_user = 0;
|
|
+
|
|
+ if (length != 1) {
|
|
+ WL_ERROR(("%s: Invalid data length\n", __FUNCTION__));
|
|
+ return -EIO;
|
|
+ }
|
|
+
|
|
+ if (copy_from_user(&from_user, buff, 1)) {
|
|
+ WL_ERROR(("%s: copy from user failed\n", __FUNCTION__));
|
|
+ return -EFAULT;
|
|
+ }
|
|
+
|
|
+ if (from_user >= 0x30)
|
|
+ from_user -= 0x30;
|
|
+
|
|
+ WL_LOCK(wl);
|
|
+ bcmerror = wlc_ioctl(wl->wlc, WLC_SET_MONITOR, &from_user, sizeof(int), NULL);
|
|
+ WL_UNLOCK(wl);
|
|
+
|
|
+ if (bcmerror < 0) {
|
|
+ WL_ERROR(("%s: SET_MONITOR failed with %d\n", __FUNCTION__, bcmerror));
|
|
+ return -EIO;
|
|
+ }
|
|
+ *ppos += length;
|
|
+ return length;
|
|
+}
|
|
+
|
|
+static int wl_proc_open(struct inode *inode, struct file *file)
|
|
+{
|
|
+ return single_open(file, wl_proc_read, PDE_DATA(inode));
|
|
+}
|
|
+
|
|
+static const struct file_operations wl_proc_fops = {
|
|
+ .owner = THIS_MODULE,
|
|
+ .open = wl_proc_open,
|
|
+ .read = seq_read,
|
|
+ .write = wl_proc_write,
|
|
+ .llseek = seq_lseek,
|
|
+ .release = single_release,
|
|
+};
|
|
+#endif
|
|
+
|
|
static int
|
|
wl_reg_proc_entry(wl_info_t *wl)
|
|
{
|
|
char tmp[32];
|
|
sprintf(tmp, "%s%d", HYBRID_PROC, wl->pub->unit);
|
|
- if ((wl->proc_entry = create_proc_entry(tmp, 0644, NULL)) == NULL) {
|
|
+
|
|
+#if LINUX_VERSION_CODE < KERNEL_VERSION(3, 10, 0)
|
|
+ wl->proc_entry = create_proc_entry(tmp, 0644, NULL);
|
|
+ if (wl->proc_entry) {
|
|
+ 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
|
|
+ if (!wl->proc_entry) {
|
|
WL_ERROR(("%s: create_proc_entry %s failed\n", __FUNCTION__, tmp));
|
|
ASSERT(0);
|
|
return -1;
|
|
}
|
|
- wl->proc_entry->read_proc = wl_proc_read;
|
|
- wl->proc_entry->write_proc = wl_proc_write;
|
|
- wl->proc_entry->data = wl;
|
|
return 0;
|
|
}
|
|
#ifdef WLOFFLD
|