mac80211: backport latest version from trunk (as of r37265)
[openwrt/svn-archive/archive.git] / package / mac80211 / patches / 618-rt2x00-msi-fix.patch
1 --- a/drivers/net/wireless/rt2x00/rt2x00pci.c
2 +++ b/drivers/net/wireless/rt2x00/rt2x00pci.c
3 @@ -108,7 +108,9 @@ int rt2x00pci_probe(struct pci_dev *pci_
4 goto exit_release_regions;
5 }
6
7 +#ifdef CONFIG_PCI_MSI
8 pci_enable_msi(pci_dev);
9 +#endif
10
11 hw = ieee80211_alloc_hw(sizeof(struct rt2x00_dev), ops->hw);
12 if (!hw) {
13 @@ -162,7 +164,9 @@ exit_free_device:
14 ieee80211_free_hw(hw);
15
16 exit_disable_msi:
17 +#ifdef CONFIG_PCI_SET_MWI
18 pci_disable_msi(pci_dev);
19 +#endif
20
21 exit_release_regions:
22 pci_release_regions(pci_dev);
23 @@ -188,7 +192,9 @@ void rt2x00pci_remove(struct pci_dev *pc
24 rt2x00pci_free_reg(rt2x00dev);
25 ieee80211_free_hw(hw);
26
27 +#ifdef CONFIG_PCI_MSI
28 pci_disable_msi(pci_dev);
29 +#endif
30
31 /*
32 * Free the PCI device data.