commit 1a7c1615bf580c247f1ae1202d0705187e6d18bb · pyrox.dev/nixpkgs

+6 -6

pkgs/os-specific/linux/broadcom-sta/default.nix

···

       1
       1
        
       { stdenv, fetchurl, kernel }:

     

       2
       2
        
       let

     

       3
       3
       -
         version = "6_30_223_141";

     

       3
       3
       +
         version = "6.30.223.248";

     

       4
       4
        
       in

     

       5
       5
        
       stdenv.mkDerivation {

     

       6
       6
        
         name = "broadcom-sta-${version}-${kernel.version}";

     

       7
       7
        
       

     

       8
       8
        
         src = if stdenv.system == "i686-linux" then (

     

       9
       9
        
           fetchurl {

     

       10
       10
       -
             url = "http://www.broadcom.com/docs/linux_sta/hybrid-v35-nodebug-pcoem-${version}.tar.gz";

     

       11
       11
       -
             sha256 = "19wra62dpm0x0byksh871yxr128b4v13kzkzqv56igjfpzv36z6m";

     

       10
       10
       +
             url = http://www.broadcom.com/docs/linux_sta/hybrid-v35-nodebug-pcoem-6_30_223_248.tar.gz;

     

       11
       11
       +
             sha256 = "1bd13pq5hj4yzp32rx71sg1i5wkzdsg1s32xsywb48lw88x595mi";

     

       12
       12
        
           } ) else (

     

       13
       13
        
           fetchurl {

     

       14
       14
       -
             url = "http://www.broadcom.com/docs/linux_sta/hybrid-v35_64-nodebug-pcoem-${version}.tar.gz";

     

       15
       15
       -
             sha256 = "0jlvch7d3khmmg5kp80x4ka33hidj8yykqjcqq6j56z2g6wb4dsz";

     

       14
       14
       +
             url = http://www.broadcom.com/docs/linux_sta/hybrid-v35_64-nodebug-pcoem-6_30_223_248.tar.gz;

     

       15
       15
       +
             sha256 = "08ihbhwnqpnazskw9rlrk0alanp4x70kl8bsy2vg962iq334r69x";

     

       16
       16
        
           }

     

       17
       17
        
         );

     

       18
       18
        
       

     

       19
       19
        
         patches = [

     

       20
       20
       -
           ./linux-recent.patch

     

       21
       20
        
           ./license.patch

     

       22
       21
        
           ./cfg80211_ibss_joined-channel-parameter.patch

     

       22
       22
       +
           ./netdev-3.17.patch

     

       23
       23
        
         ];

     

       24
       24
        
       

     

       25
       25
        
         makeFlags = "KBASE=${kernel.dev}/lib/modules/${kernel.modDirVersion}";

-126

pkgs/os-specific/linux/broadcom-sta/linux-recent.patch

···

       1
       1
       -
       --- a/src/wl/sys/wl_linux.c	2013-08-01 08:52:22.000000000 +0200

     

       2
       2
       -
       +++ b/src/wl/sys/wl_linux.c	2013-09-13 14:25:36.463020788 +0200

     

       3
       3
       -
       @@ -910,7 +910,11 @@

     

       4
       4
       -
        	pci_set_drvdata(pdev, NULL);

     

       5
       5
       -
        }

     

       6
       6
       -
        

     

       7
       7
       -
       +#if LINUX_VERSION_CODE < KERNEL_VERSION(3, 8, 0)

     

       8
       8
       -
        static struct pci_driver wl_pci_driver = {

     

       9
       9
       -
       +#else

     

       10
       10
       -
       +static struct pci_driver wl_pci_driver __refdata = {

     

       11
       11
       -
       +#endif

     

       12
       12
       -
        	name:		"wl",

     

       13
       13
       -
        	probe:		wl_pci_probe,

     

       14
       14
       -
        	suspend:	wl_suspend,

     

       15
       15
       -
       @@ -3235,7 +3239,7 @@

     

       16
       16
       -
        void

     

       17
       17
       -
        wl_tkip_printstats(wl_info_t *wl, bool group_key)

     

       18
       18
       -
        {

     

       19
       19
       -
       -#if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 14)

     

       20
       20
       -
       +#if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 14) && LINUX_VERSION_CODE < KERNEL_VERSION(3, 10, 0)

     

       21
       21
       -
        	char debug_buf[512];

     

       22
       22
       -
        	int idx;

     

       23
       23
       -
        	if (wl->tkipmodops) {

     

       24
       24
       -
       @@ -3408,6 +3412,7 @@

     

       25
       25
       -
        	return 0;

     

       26
       26
       -
        }

     

       27
       27
       -
        

     

       28
       28
       -
       +#if LINUX_VERSION_CODE < KERNEL_VERSION(3, 10, 0)

     

       29
       29
       -
        static int

     

       30
       30
       -
        wl_proc_read(char *buffer, char **start, off_t offset, int length, int *eof, void *data)

     

       31
       31
       -
        {

     

       32
       32
       -
       @@ -3462,19 +3467,90 @@

     

       33
       33
       -
        	return length;

     

       34
       34
       -
        }

     

       35
       35
       -
        

     

       36
       36
       -
       +#else

     

       37
       37
       -
       +

     

       38
       38
       -
       +static int

     

       39
       39
       -
       +wl_proc_read(struct seq_file *seq, void *offset)

     

       40
       40
       -
       +{

     

       41
       41
       -
       +	wl_info_t * wl = (wl_info_t *)seq->private;

     

       42
       42
       -
       +	int bcmerror, to_user;

     

       43
       43
       -
       +

     

       44
       44
       -
       +	WL_LOCK(wl);

     

       45
       45
       -
       +	bcmerror = wlc_ioctl(wl->wlc, WLC_GET_MONITOR, &to_user, sizeof(int), NULL);

     

       46
       46
       -
       +	WL_UNLOCK(wl);

     

       47
       47
       -
       +

     

       48
       48
       -
       +	seq_printf(seq, "%d\n", to_user);

     

       49
       49
       -
       +	return bcmerror;

     

       50
       50
       -
       +}

     

       51
       51
       -
       +

     

       52
       52
       -
       +static ssize_t wl_proc_write(struct file *file, const char __user *buff,

     

       53
       53
       -
       +			     size_t length, loff_t *ppos)

     

       54
       54
       -
       +{

     

       55
       55
       -
       +	struct seq_file *seq = file->private_data;

     

       56
       56
       -
       +	wl_info_t * wl = (wl_info_t *)seq->private;

     

       57
       57
       -
       +	int bcmerror, from_user = 0;

     

       58
       58
       -
       +

     

       59
       59
       -
       +	if (length != 1) {

     

       60
       60
       -
       +		WL_ERROR(("%s: Invalid data length\n", __FUNCTION__));

     

       61
       61
       -
       +		return -EIO;

     

       62
       62
       -
       +	}

     

       63
       63
       -
       +

     

       64
       64
       -
       +	if (copy_from_user(&from_user, buff, 1)) {

     

       65
       65
       -
       +		WL_ERROR(("%s: copy from user failed\n", __FUNCTION__));

     

       66
       66
       -
       +		return -EFAULT;

     

       67
       67
       -
       +	}

     

       68
       68
       -
       +

     

       69
       69
       -
       +	if (from_user >= 0x30)

     

       70
       70
       -
       +		from_user -= 0x30;

     

       71
       71
       -
       +

     

       72
       72
       -
       +	WL_LOCK(wl);

     

       73
       73
       -
       +	bcmerror = wlc_ioctl(wl->wlc, WLC_SET_MONITOR, &from_user, sizeof(int), NULL);

     

       74
       74
       -
       +	WL_UNLOCK(wl);

     

       75
       75
       -
       +

     

       76
       76
       -
       +	if (bcmerror < 0) {

     

       77
       77
       -
       +		WL_ERROR(("%s: SET_MONITOR failed with %d\n", __FUNCTION__, bcmerror));

     

       78
       78
       -
       +		return -EIO;

     

       79
       79
       -
       +	}

     

       80
       80
       -
       +	*ppos += length;

     

       81
       81
       -
       +	return length;

     

       82
       82
       -
       +}

     

       83
       83
       -
       +

     

       84
       84
       -
       +static int wl_proc_open(struct inode *inode, struct file *file)

     

       85
       85
       -
       +{

     

       86
       86
       -
       +	return single_open(file, wl_proc_read, PDE_DATA(inode));

     

       87
       87
       -
       +}

     

       88
       88
       -
       +

     

       89
       89
       -
       +static const struct file_operations wl_proc_fops = {

     

       90
       90
       -
       +	.owner = THIS_MODULE,

     

       91
       91
       -
       +	.open = wl_proc_open,

     

       92
       92
       -
       +	.read = seq_read,

     

       93
       93
       -
       +	.write = wl_proc_write,

     

       94
       94
       -
       +	.llseek = seq_lseek,

     

       95
       95
       -
       +	.release = single_release,

     

       96
       96
       -
       +};

     

       97
       97
       -
       +#endif

     

       98
       98
       -
       +

     

       99
       99
       -
        static int

     

       100
       100
       -
        wl_reg_proc_entry(wl_info_t *wl)

     

       101
       101
       -
        {

     

       102
       102
       -
        	char tmp[32];

     

       103
       103
       -
        	sprintf(tmp, "%s%d", HYBRID_PROC, wl->pub->unit);

     

       104
       104
       -
       -	if ((wl->proc_entry = create_proc_entry(tmp, 0644, NULL)) == NULL) {

     

       105
       105
       -
       +

     

       106
       106
       -
       +#if LINUX_VERSION_CODE < KERNEL_VERSION(3, 10, 0)

     

       107
       107
       -
       +	wl->proc_entry = create_proc_entry(tmp, 0644, NULL);

     

       108
       108
       -
       +	if (wl->proc_entry) {

     

       109
       109
       -
       +		wl->proc_entry->read_proc = wl_proc_read;

     

       110
       110
       -
       +		wl->proc_entry->write_proc = wl_proc_write;

     

       111
       111
       -
       +		wl->proc_entry->data = wl;

     

       112
       112
       -
       +	} 

     

       113
       113
       -
       +#else

     

       114
       114
       -
       +	wl->proc_entry = proc_create_data(tmp, 0644, NULL, &wl_proc_fops, wl);

     

       115
       115
       -
       +#endif

     

       116
       116
       -
       +	if (!wl->proc_entry) {

     

       117
       117
       -
        		WL_ERROR(("%s: create_proc_entry %s failed\n", __FUNCTION__, tmp));

     

       118
       118
       -
        		ASSERT(0);

     

       119
       119
       -
        		return -1;

     

       120
       120
       -
        	}

     

       121
       121
       -
       -	wl->proc_entry->read_proc = wl_proc_read;

     

       122
       122
       -
       -	wl->proc_entry->write_proc = wl_proc_write;

     

       123
       123
       -
       -	wl->proc_entry->data = wl;

     

       124
       124
       -
        	return 0;

     

       125
       125
       -
        }

     

       126
       126
       -
        #ifdef WLOFFLD

+15

pkgs/os-specific/linux/broadcom-sta/netdev-3.17.patch

···

       1
       1
       +
       diff -Naur a/src/wl/sys/wl_linux.c b/src/wl/sys/wl_linux.c

     

       2
       2
       +
       --- a/src/wl/sys/wl_linux.c	2014-06-26 06:42:08.000000000 -0400

     

       3
       3
       +
       +++ b/src/wl/sys/wl_linux.c	2014-10-13 12:00:04.446122588 -0400

     

       4
       4
       +
       @@ -1307,7 +1307,11 @@

     

       5
       5
       +
        	dev->priv = priv_link;

     

       6
       6
       +
        #else

     

       7
       7
       +
        

     

       8
       8
       +
       +#if LINUX_VERSION_CODE >= KERNEL_VERSION(3, 17, 0)

     

       9
       9
       +
       +	dev = alloc_netdev(sizeof(priv_link_t), intf_name, NET_NAME_UNKNOWN, ether_setup);

     

       10
       10
       +
       +#else

     

       11
       11
       +
        	dev = alloc_netdev(sizeof(priv_link_t), intf_name, ether_setup);

     

       12
       12
       +
       +#endif

     

       13
       13
       +
        	if (!dev) {

     

       14
       14
       +
        		WL_ERROR(("wl%d: %s: alloc_netdev failed\n",

     

       15
       15
       +
        			(wl->pub)?wl->pub->unit:wlif->subunit, __FUNCTION__));