Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-2.6 (8e0f36ec) · Commits · 戴 / test

Documentation/rfkill.txt

+5 −0

Original line number	Diff line number	Diff line
		@@ -363,6 +363,11 @@ This rule exists because users of the rfkill subsystem expect to get (and set,
		when possible) the overall transmitter rfkill state, not of a particular rfkill
		line.

		5. During suspend, the rfkill class will attempt to soft-block the radio
		through a call to rfkill->toggle_radio, and will try to restore its previous
		state during resume. After a rfkill class is suspended, it will not call
		rfkill->toggle_radio until it is resumed.

		Example of a WLAN wireless driver connected to the rfkill subsystem:
		--------------------------------------------------------------------

+2 −7

Original line number	Diff line number	Diff line
		@@ -40,7 +40,6 @@
		*
		*/

		#include <linux/version.h>
		#include <linux/module.h>
		#include <linux/delay.h>
		#include <linux/hardirq.h>
		@@ -587,7 +586,6 @@ ath5k_pci_suspend(struct pci_dev *pdev, pm_message_t state)
		ath5k_stop_hw(sc);

		free_irq(pdev->irq, sc);
		pci_disable_msi(pdev);
		pci_save_state(pdev);
		pci_disable_device(pdev);
		pci_set_power_state(pdev, PCI_D3hot);
		@@ -616,12 +614,10 @@ ath5k_pci_resume(struct pci_dev *pdev)
		*/
		pci_write_config_byte(pdev, 0x41, 0);

		pci_enable_msi(pdev);

		err = request_irq(pdev->irq, ath5k_intr, IRQF_SHARED, "ath", sc);
		if (err) {
		ATH5K_ERR(sc, "request_irq failed\n");
		goto err_msi;
		goto err_no_irq;
		}

		err = ath5k_init(sc);
		@@ -642,8 +638,7 @@ ath5k_pci_resume(struct pci_dev *pdev)
		return 0;
		err_irq:
		free_irq(pdev->irq, sc);
		err_msi:
		pci_disable_msi(pdev);
		err_no_irq:
		pci_disable_device(pdev);
		return err;
		}

+5 −1

Original line number	Diff line number	Diff line
		@@ -5017,7 +5017,11 @@ static void ath9k_hw_spur_mitigate(struct ath_hal *ah,

		for (i = 0; i < 123; i++) {
		if ((cur_vit_mask > lower) && (cur_vit_mask < upper)) {
		if ((abs(cur_vit_mask - bin)) < 75)

		/* workaround for gcc bug #37014 */
		volatile int tmp = abs(cur_vit_mask - bin);

		if (tmp < 75)
		mask_amt = 1;
		else
		mask_amt = 0;

+2 −1

Original line number	Diff line number	Diff line
		@@ -33,7 +33,6 @@
		#include <linux/moduleparam.h>
		#include <linux/if_arp.h>
		#include <linux/etherdevice.h>
		#include <linux/version.h>
		#include <linux/firmware.h>
		#include <linux/wireless.h>
		#include <linux/workqueue.h>
		@@ -4615,7 +4614,9 @@ static void b43_sprom_fixup(struct ssb_bus *bus)
		if (bus->bustype == SSB_BUSTYPE_PCI) {
		pdev = bus->host_pci;
		if (IS_PDEV(pdev, BROADCOM, 0x4318, ASUSTEK, 0x100F) \|\|
		IS_PDEV(pdev, BROADCOM, 0x4320, DELL, 0x0003) \|\|
		IS_PDEV(pdev, BROADCOM, 0x4320, LINKSYS, 0x0015) \|\|
		IS_PDEV(pdev, BROADCOM, 0x4320, LINKSYS, 0x0014) \|\|
		IS_PDEV(pdev, BROADCOM, 0x4320, LINKSYS, 0x0013))
		bus->sprom.boardflags_lo &= ~B43_BFL_BTCOEXIST;
		}

+0 −1

Original line number	Diff line number	Diff line
		@@ -157,7 +157,6 @@ that only one external action is invoked at a time.
		#include <linux/stringify.h>
		#include <linux/tcp.h>
		#include <linux/types.h>
		#include <linux/version.h>
		#include <linux/time.h>
		#include <linux/firmware.h>
		#include <linux/acpi.h>