mac80211: merge latest from trunk - improves reliability with intel clients

[openwrt-10.03/.git] / package / mac80211 / patches / 530-ath9k_chainmask_read_fix.patch

diff --git a/package/mac80211/patches/530-ath9k_chainmask_read_fix.patch b/package/mac80211/patches/530-ath9k_chainmask_read_fix.patch
deleted file mode 100644 (file)
index a0eebf5..0000000
--- a/package/mac80211/patches/530-ath9k_chainmask_read_fix.patch
+++ /dev/null
@@ -1,28 +0,0 @@
---- a/drivers/net/wireless/ath/ath9k/debug.c
-+++ b/drivers/net/wireless/ath/ath9k/debug.c
-@@ -81,11 +81,10 @@ static ssize_t read_file_tx_chainmask(st
-                            size_t count, loff_t *ppos)
- {
-       struct ath_softc *sc = file->private_data;
--      struct ath_common *common = ath9k_hw_common(sc->sc_ah);
-       char buf[32];
-       unsigned int len;
- 
--      len = sprintf(buf, "0x%08x\n", common->tx_chainmask);
-+      len = sprintf(buf, "0x%08x\n", sc->sc_ah->caps.tx_chainmask);
-       return simple_read_from_buffer(user_buf, count, ppos, buf, len);
- }
- 
-@@ -124,11 +123,10 @@ static ssize_t read_file_rx_chainmask(st
-                            size_t count, loff_t *ppos)
- {
-       struct ath_softc *sc = file->private_data;
--      struct ath_common *common = ath9k_hw_common(sc->sc_ah);
-       char buf[32];
-       unsigned int len;
- 
--      len = sprintf(buf, "0x%08x\n", common->rx_chainmask);
-+      len = sprintf(buf, "0x%08x\n", sc->sc_ah->caps.rx_chainmask);
-       return simple_read_from_buffer(user_buf, count, ppos, buf, len);
- }
-