diff options
| author | Jaehoon Chung <jh80.chung@samsung.com> | 2015-03-12 14:58:28 +0900 |
|---|---|---|
| committer | Seung-Woo Kim <sw0312.kim@samsung.com> | 2016-12-14 13:44:30 +0900 |
| commit | f38d6c91f9634c5c8a486f659e8826129d8604b4 (patch) | |
| tree | 02948e332fbf14ec4cac47cd28123d8ef2545a30 | |
| parent | a704c333d55af6b574bc22fd2b5e84a08af72d56 (diff) | |
local/net: bcm4358: use nl80211 attribute instead of station_info_flags
Use the nl80211 attribute instead of station_info_flags.
(Refer to below patch)
commit 319090bf6c75e3ad42a8c74973be5e78ae4f948f
Author: Johannes Berg <johannes.berg@intel.com>
AuthorDate: Mon Nov 17 14:08:11 2014 +0100
Commit: Johannes Berg <johannes.berg@intel.com>
CommitDate: Thu Jan 8 15:28:10 2015 +0100
cfg80211: remove enum station_info_flags
This is really just duplicating the list of information that's
already available in the nl80211 attribute, so remove the list.
Two small changes are needed:
* remove STATION_INFO_ASSOC_REQ_IES complete, but the length
(assoc_req_ies_len) can be used instead
* add NL80211_STA_INFO_RX_DROP_MISC which exists internally
but not in nl80211 yet
This gets rid of the duplicate maintenance of the two lists.
Signed-off-by: Jaehoon Chung <jh80.chung@samsung.com>
| -rw-r--r-- | drivers/net/wireless/bcmdhd4358/wl_cfg80211.c | 17 |
1 files changed, 8 insertions, 9 deletions
diff --git a/drivers/net/wireless/bcmdhd4358/wl_cfg80211.c b/drivers/net/wireless/bcmdhd4358/wl_cfg80211.c index 199098f880db..84672f3a4adf 100644 --- a/drivers/net/wireless/bcmdhd4358/wl_cfg80211.c +++ b/drivers/net/wireless/bcmdhd4358/wl_cfg80211.c @@ -5093,7 +5093,7 @@ wl_cfg80211_get_station(struct wiphy *wiphy, struct net_device *dev, WL_ERR(("GET STA INFO failed, %d\n", err)); return err; } - sinfo->filled = STATION_INFO_INACTIVE_TIME; + sinfo->filled = BIT(NL80211_STA_INFO_INACTIVE_TIME); sta = (sta_info_t *)cfg->ioctl_buf; sta->len = dtoh16(sta->len); sta->cap = dtoh16(sta->cap); @@ -5103,7 +5103,7 @@ wl_cfg80211_get_station(struct wiphy *wiphy, struct net_device *dev, sinfo->inactive_time = sta->idle * 1000; #if (LINUX_VERSION_CODE >= KERNEL_VERSION(3, 0, 0)) || defined(WL_COMPAT_WIRELESS) if (sta->flags & WL_STA_ASSOC) { - sinfo->filled |= STATION_INFO_CONNECTED_TIME; + sinfo->filled |= BIT(NL80211_STA_INFO_CONNECTED_TIME); sinfo->connected_time = sta->in; } WL_INFORM(("STA %s : idle time : %d sec, connected time :%d ms\n", @@ -5154,7 +5154,7 @@ wl_cfg80211_get_station(struct wiphy *wiphy, struct net_device *dev, int rxpktglom; #endif rate = dtoh32(rate); - sinfo->filled |= STATION_INFO_TX_BITRATE; + sinfo->filled |= BIT(NL80211_STA_INFO_TX_BITRATE); sinfo->txrate.legacy = rate * 5; WL_DBG(("Rate %d Mbps\n", (rate / 2))); #if defined(USE_DYNAMIC_MAXPKT_RXGLOM) @@ -5183,16 +5183,16 @@ wl_cfg80211_get_station(struct wiphy *wiphy, struct net_device *dev, goto get_station_err; } rssi = wl_rssi_offset(dtoh32(scb_val.val)); - sinfo->filled |= STATION_INFO_SIGNAL; + sinfo->filled |= BIT(NL80211_STA_INFO_SIGNAL); sinfo->signal = rssi; WL_DBG(("RSSI %d dBm\n", rssi)); err = wldev_ioctl(dev, WLC_GET_PKTCNTS, &pktcnt, sizeof(pktcnt), false); if (!err) { - sinfo->filled |= (STATION_INFO_RX_PACKETS | - STATION_INFO_RX_DROP_MISC | - STATION_INFO_TX_PACKETS | - STATION_INFO_TX_FAILED); + sinfo->filled |= BIT(NL80211_STA_INFO_RX_PACKETS) | + BIT(NL80211_STA_INFO_RX_DROP_MISC) | + BIT(NL80211_STA_INFO_TX_PACKETS) | + BIT(NL80211_STA_INFO_TX_FAILED); sinfo->rx_packets = pktcnt.rx_good_pkt; sinfo->rx_dropped_misc = pktcnt.rx_bad_pkt; sinfo->tx_packets = pktcnt.tx_good_pkt; @@ -8875,7 +8875,6 @@ exit: sinfo.filled = 0; if (((event == WLC_E_ASSOC_IND) || (event == WLC_E_REASSOC_IND)) && reason == DOT11_SC_SUCCESS) { - sinfo.filled = STATION_INFO_ASSOC_REQ_IES; if (!data) { WL_ERR(("No IEs present in ASSOC/REASSOC_IND")); return -EINVAL; |