diff options
Diffstat (limited to 'drivers/net/wireless/ath/ath6kl/cfg80211.c')
-rw-r--r-- | drivers/net/wireless/ath/ath6kl/cfg80211.c | 17 |
1 files changed, 9 insertions, 8 deletions
diff --git a/drivers/net/wireless/ath/ath6kl/cfg80211.c b/drivers/net/wireless/ath/ath6kl/cfg80211.c index 7a5337877a0c..85da63a67faf 100644 --- a/drivers/net/wireless/ath/ath6kl/cfg80211.c +++ b/drivers/net/wireless/ath/ath6kl/cfg80211.c | |||
@@ -1799,20 +1799,20 @@ static int ath6kl_get_station(struct wiphy *wiphy, struct net_device *dev, | |||
1799 | 1799 | ||
1800 | if (vif->target_stats.rx_byte) { | 1800 | if (vif->target_stats.rx_byte) { |
1801 | sinfo->rx_bytes = vif->target_stats.rx_byte; | 1801 | sinfo->rx_bytes = vif->target_stats.rx_byte; |
1802 | sinfo->filled |= STATION_INFO_RX_BYTES64; | 1802 | sinfo->filled |= BIT(NL80211_STA_INFO_RX_BYTES64); |
1803 | sinfo->rx_packets = vif->target_stats.rx_pkt; | 1803 | sinfo->rx_packets = vif->target_stats.rx_pkt; |
1804 | sinfo->filled |= STATION_INFO_RX_PACKETS; | 1804 | sinfo->filled |= BIT(NL80211_STA_INFO_RX_PACKETS); |
1805 | } | 1805 | } |
1806 | 1806 | ||
1807 | if (vif->target_stats.tx_byte) { | 1807 | if (vif->target_stats.tx_byte) { |
1808 | sinfo->tx_bytes = vif->target_stats.tx_byte; | 1808 | sinfo->tx_bytes = vif->target_stats.tx_byte; |
1809 | sinfo->filled |= STATION_INFO_TX_BYTES64; | 1809 | sinfo->filled |= BIT(NL80211_STA_INFO_TX_BYTES64); |
1810 | sinfo->tx_packets = vif->target_stats.tx_pkt; | 1810 | sinfo->tx_packets = vif->target_stats.tx_pkt; |
1811 | sinfo->filled |= STATION_INFO_TX_PACKETS; | 1811 | sinfo->filled |= BIT(NL80211_STA_INFO_TX_PACKETS); |
1812 | } | 1812 | } |
1813 | 1813 | ||
1814 | sinfo->signal = vif->target_stats.cs_rssi; | 1814 | sinfo->signal = vif->target_stats.cs_rssi; |
1815 | sinfo->filled |= STATION_INFO_SIGNAL; | 1815 | sinfo->filled |= BIT(NL80211_STA_INFO_SIGNAL); |
1816 | 1816 | ||
1817 | rate = vif->target_stats.tx_ucast_rate; | 1817 | rate = vif->target_stats.tx_ucast_rate; |
1818 | 1818 | ||
@@ -1827,6 +1827,7 @@ static int ath6kl_get_station(struct wiphy *wiphy, struct net_device *dev, | |||
1827 | } | 1827 | } |
1828 | 1828 | ||
1829 | sinfo->txrate.flags |= RATE_INFO_FLAGS_MCS; | 1829 | sinfo->txrate.flags |= RATE_INFO_FLAGS_MCS; |
1830 | sinfo->txrate.bw = RATE_INFO_BW_20; | ||
1830 | } else if (is_rate_ht40(rate, &mcs, &sgi)) { | 1831 | } else if (is_rate_ht40(rate, &mcs, &sgi)) { |
1831 | if (sgi) { | 1832 | if (sgi) { |
1832 | sinfo->txrate.flags |= RATE_INFO_FLAGS_SHORT_GI; | 1833 | sinfo->txrate.flags |= RATE_INFO_FLAGS_SHORT_GI; |
@@ -1835,7 +1836,7 @@ static int ath6kl_get_station(struct wiphy *wiphy, struct net_device *dev, | |||
1835 | sinfo->txrate.mcs = mcs; | 1836 | sinfo->txrate.mcs = mcs; |
1836 | } | 1837 | } |
1837 | 1838 | ||
1838 | sinfo->txrate.flags |= RATE_INFO_FLAGS_40_MHZ_WIDTH; | 1839 | sinfo->txrate.bw = RATE_INFO_BW_40; |
1839 | sinfo->txrate.flags |= RATE_INFO_FLAGS_MCS; | 1840 | sinfo->txrate.flags |= RATE_INFO_FLAGS_MCS; |
1840 | } else { | 1841 | } else { |
1841 | ath6kl_dbg(ATH6KL_DBG_WLAN_CFG, | 1842 | ath6kl_dbg(ATH6KL_DBG_WLAN_CFG, |
@@ -1844,12 +1845,12 @@ static int ath6kl_get_station(struct wiphy *wiphy, struct net_device *dev, | |||
1844 | return 0; | 1845 | return 0; |
1845 | } | 1846 | } |
1846 | 1847 | ||
1847 | sinfo->filled |= STATION_INFO_TX_BITRATE; | 1848 | sinfo->filled |= BIT(NL80211_STA_INFO_TX_BITRATE); |
1848 | 1849 | ||
1849 | if (test_bit(CONNECTED, &vif->flags) && | 1850 | if (test_bit(CONNECTED, &vif->flags) && |
1850 | test_bit(DTIM_PERIOD_AVAIL, &vif->flags) && | 1851 | test_bit(DTIM_PERIOD_AVAIL, &vif->flags) && |
1851 | vif->nw_type == INFRA_NETWORK) { | 1852 | vif->nw_type == INFRA_NETWORK) { |
1852 | sinfo->filled |= STATION_INFO_BSS_PARAM; | 1853 | sinfo->filled |= BIT(NL80211_STA_INFO_BSS_PARAM); |
1853 | sinfo->bss_param.flags = 0; | 1854 | sinfo->bss_param.flags = 0; |
1854 | sinfo->bss_param.dtim_period = vif->assoc_bss_dtim_period; | 1855 | sinfo->bss_param.dtim_period = vif->assoc_bss_dtim_period; |
1855 | sinfo->bss_param.beacon_interval = vif->assoc_bss_beacon_int; | 1856 | sinfo->bss_param.beacon_interval = vif->assoc_bss_beacon_int; |