Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 2ddddb98 authored by David S. Miller's avatar David S. Miller
Browse files

Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-2.6

parents 252815b0 814feefa

drivers/net/wireless/libertas/scan.c

+2 −2
Original line number Diff line number Diff line
@@ -567,11 +567,11 @@ static int lbs_process_bss(struct bss_descriptor *bss, 
	pos += 8;



	/* beacon interval is 2 bytes long */

	bss->beaconperiod = le16_to_cpup((void *) pos);

	bss->beaconperiod = get_unaligned_le16(pos);

	pos += 2;



	/* capability information is 2 bytes long */

	bss->capability = le16_to_cpup((void *) pos);

	bss->capability = get_unaligned_le16(pos);

	lbs_deb_scan("process_bss: capabilities 0x%04x\n", bss->capability);

	pos += 2;

drivers/net/wireless/rt2x00/rt2400pci.c

+11 −0
Original line number Diff line number Diff line
@@ -731,6 +731,17 @@ static int rt2400pci_init_registers(struct rt2x00_dev *rt2x00dev) 
			   (rt2x00dev->rx->data_size / 128));

	rt2x00pci_register_write(rt2x00dev, CSR9, reg);



	rt2x00pci_register_read(rt2x00dev, CSR14, &reg);

	rt2x00_set_field32(&reg, CSR14_TSF_COUNT, 0);

	rt2x00_set_field32(&reg, CSR14_TSF_SYNC, 0);

	rt2x00_set_field32(&reg, CSR14_TBCN, 0);

	rt2x00_set_field32(&reg, CSR14_TCFP, 0);

	rt2x00_set_field32(&reg, CSR14_TATIMW, 0);

	rt2x00_set_field32(&reg, CSR14_BEACON_GEN, 0);

	rt2x00_set_field32(&reg, CSR14_CFP_COUNT_PRELOAD, 0);

	rt2x00_set_field32(&reg, CSR14_TBCM_PRELOAD, 0);

	rt2x00pci_register_write(rt2x00dev, CSR14, reg);



	rt2x00pci_register_write(rt2x00dev, CNT3, 0x3f080000);



	rt2x00pci_register_read(rt2x00dev, ARCSR0, &reg);

drivers/net/wireless/rt2x00/rt2500pci.c

+11 −0
Original line number Diff line number Diff line
@@ -824,6 +824,17 @@ static int rt2500pci_init_registers(struct rt2x00_dev *rt2x00dev) 
	rt2x00_set_field32(&reg, CSR11_CW_SELECT, 0);

	rt2x00pci_register_write(rt2x00dev, CSR11, reg);



	rt2x00pci_register_read(rt2x00dev, CSR14, &reg);

	rt2x00_set_field32(&reg, CSR14_TSF_COUNT, 0);

	rt2x00_set_field32(&reg, CSR14_TSF_SYNC, 0);

	rt2x00_set_field32(&reg, CSR14_TBCN, 0);

	rt2x00_set_field32(&reg, CSR14_TCFP, 0);

	rt2x00_set_field32(&reg, CSR14_TATIMW, 0);

	rt2x00_set_field32(&reg, CSR14_BEACON_GEN, 0);

	rt2x00_set_field32(&reg, CSR14_CFP_COUNT_PRELOAD, 0);

	rt2x00_set_field32(&reg, CSR14_TBCM_PRELOAD, 0);

	rt2x00pci_register_write(rt2x00dev, CSR14, reg);



	rt2x00pci_register_write(rt2x00dev, CNT3, 0);



	rt2x00pci_register_read(rt2x00dev, TXCSR8, &reg);

drivers/net/wireless/rt2x00/rt2500usb.c

+7 −0
Original line number Diff line number Diff line
@@ -801,6 +801,13 @@ static int rt2500usb_init_registers(struct rt2x00_dev *rt2x00dev) 
	rt2x00_set_field16(&reg, TXRX_CSR8_BBP_ID1_VALID, 0);

	rt2500usb_register_write(rt2x00dev, TXRX_CSR8, reg);



	rt2500usb_register_read(rt2x00dev, TXRX_CSR19, &reg);

	rt2x00_set_field16(&reg, TXRX_CSR19_TSF_COUNT, 0);

	rt2x00_set_field16(&reg, TXRX_CSR19_TSF_SYNC, 0);

	rt2x00_set_field16(&reg, TXRX_CSR19_TBCN, 0);

	rt2x00_set_field16(&reg, TXRX_CSR19_BEACON_GEN, 0);

	rt2500usb_register_write(rt2x00dev, TXRX_CSR19, reg);



	rt2500usb_register_write(rt2x00dev, TXRX_CSR21, 0xe78f);

	rt2500usb_register_write(rt2x00dev, MAC_CSR9, 0xff1d);

drivers/net/wireless/rt2x00/rt61pci.c

+9 −0
Original line number Diff line number Diff line
@@ -1201,6 +1201,15 @@ static int rt61pci_init_registers(struct rt2x00_dev *rt2x00dev) 
	rt2x00_set_field32(&reg, TXRX_CSR8_ACK_CTS_54MBS, 42);

	rt2x00pci_register_write(rt2x00dev, TXRX_CSR8, reg);



	rt2x00pci_register_read(rt2x00dev, TXRX_CSR9, &reg);

	rt2x00_set_field32(&reg, TXRX_CSR9_BEACON_INTERVAL, 0);

	rt2x00_set_field32(&reg, TXRX_CSR9_TSF_TICKING, 0);

	rt2x00_set_field32(&reg, TXRX_CSR9_TSF_SYNC, 0);

	rt2x00_set_field32(&reg, TXRX_CSR9_TBTT_ENABLE, 0);

	rt2x00_set_field32(&reg, TXRX_CSR9_BEACON_GEN, 0);

	rt2x00_set_field32(&reg, TXRX_CSR9_TIMESTAMP_COMPENSATE, 0);

	rt2x00pci_register_write(rt2x00dev, TXRX_CSR9, reg);



	rt2x00pci_register_write(rt2x00dev, TXRX_CSR15, 0x0000000f);



	rt2x00pci_register_write(rt2x00dev, MAC_CSR6, 0x00000fff);