ath9k: merge chainmask fix from r24657
[openwrt/svn-archive/archive.git] / package / mac80211 / patches / 550-ath9k_chainmask_read_fix.patch
1 --- a/drivers/net/wireless/ath/ath9k/debug.c
2 +++ b/drivers/net/wireless/ath/ath9k/debug.c
3 @@ -81,11 +81,10 @@ static ssize_t read_file_tx_chainmask(st
4 size_t count, loff_t *ppos)
5 {
6 struct ath_softc *sc = file->private_data;
7 - struct ath_common *common = ath9k_hw_common(sc->sc_ah);
8 char buf[32];
9 unsigned int len;
10
11 - len = sprintf(buf, "0x%08x\n", common->tx_chainmask);
12 + len = sprintf(buf, "0x%08x\n", sc->sc_ah->caps.tx_chainmask);
13 return simple_read_from_buffer(user_buf, count, ppos, buf, len);
14 }
15
16 @@ -124,11 +123,10 @@ static ssize_t read_file_rx_chainmask(st
17 size_t count, loff_t *ppos)
18 {
19 struct ath_softc *sc = file->private_data;
20 - struct ath_common *common = ath9k_hw_common(sc->sc_ah);
21 char buf[32];
22 unsigned int len;
23
24 - len = sprintf(buf, "0x%08x\n", common->rx_chainmask);
25 + len = sprintf(buf, "0x%08x\n", sc->sc_ah->caps.rx_chainmask);
26 return simple_read_from_buffer(user_buf, count, ppos, buf, len);
27 }
28