aboutsummaryrefslogtreecommitdiffstats
path: root/package/mac80211/patches/618-rt2x00-msi-fix.patch
diff options
context:
space:
mode:
authorFelix Fietkau <nbd@openwrt.org>2014-03-14 10:53:42 +0000
committerFelix Fietkau <nbd@openwrt.org>2014-03-14 10:53:42 +0000
commit705d7a8aa438a21daa646e1dc8c5d0a45295de0c (patch)
treefc4abc713ed39e07d94d500e5f7d44cbc985f43e /package/mac80211/patches/618-rt2x00-msi-fix.patch
parent9b1e65073a8b1a571c390a1041bfe7fcd07d97ba (diff)
downloadupstream-705d7a8aa438a21daa646e1dc8c5d0a45295de0c.tar.gz
upstream-705d7a8aa438a21daa646e1dc8c5d0a45295de0c.tar.bz2
upstream-705d7a8aa438a21daa646e1dc8c5d0a45295de0c.zip
AA: mac80211: backport package from trunk r39886
Signed-off-by: Felix Fietkau <nbd@openwrt.org> git-svn-id: svn://svn.openwrt.org/openwrt/branches/attitude_adjustment@39928 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'package/mac80211/patches/618-rt2x00-msi-fix.patch')
-rw-r--r--package/mac80211/patches/618-rt2x00-msi-fix.patch32
1 files changed, 0 insertions, 32 deletions
diff --git a/package/mac80211/patches/618-rt2x00-msi-fix.patch b/package/mac80211/patches/618-rt2x00-msi-fix.patch
deleted file mode 100644
index ceddbe439d..0000000000
--- a/package/mac80211/patches/618-rt2x00-msi-fix.patch
+++ /dev/null
@@ -1,32 +0,0 @@
---- a/drivers/net/wireless/rt2x00/rt2x00pci.c
-+++ b/drivers/net/wireless/rt2x00/rt2x00pci.c
-@@ -108,7 +108,9 @@ int rt2x00pci_probe(struct pci_dev *pci_
- goto exit_release_regions;
- }
-
-+#ifdef CONFIG_PCI_MSI
- pci_enable_msi(pci_dev);
-+#endif
-
- hw = ieee80211_alloc_hw(sizeof(struct rt2x00_dev), ops->hw);
- if (!hw) {
-@@ -162,7 +164,9 @@ exit_free_device:
- ieee80211_free_hw(hw);
-
- exit_disable_msi:
-+#ifdef CONFIG_PCI_SET_MWI
- pci_disable_msi(pci_dev);
-+#endif
-
- exit_release_regions:
- pci_release_regions(pci_dev);
-@@ -188,7 +192,9 @@ void rt2x00pci_remove(struct pci_dev *pc
- rt2x00pci_free_reg(rt2x00dev);
- ieee80211_free_hw(hw);
-
-+#ifdef CONFIG_PCI_MSI
- pci_disable_msi(pci_dev);
-+#endif
-
- /*
- * Free the PCI device data.