|
|
@@ -1412,16 +1412,16 @@ static int cfg80211_rtw_get_station(struct wiphy *wiphy, |
|
|
goto exit;
|
|
|
}
|
|
|
|
|
|
- sinfo->filled |= STATION_INFO_SIGNAL;
|
|
|
+ sinfo->filled |= BIT(NL80211_STA_INFO_SIGNAL);
|
|
|
sinfo->signal = translate_percentage_to_dbm(padapter->recvpriv.signal_strength);
|
|
|
|
|
|
- sinfo->filled |= STATION_INFO_TX_BITRATE;
|
|
|
+ sinfo->filled |= BIT(NL80211_STA_INFO_TX_BITRATE);
|
|
|
sinfo->txrate.legacy = rtw_get_cur_max_rate(padapter);
|
|
|
|
|
|
- sinfo->filled |= STATION_INFO_RX_PACKETS;
|
|
|
+ sinfo->filled |= BIT(NL80211_STA_INFO_RX_PACKETS);
|
|
|
sinfo->rx_packets = sta_rx_data_pkts(psta);
|
|
|
|
|
|
- sinfo->filled |= STATION_INFO_TX_PACKETS;
|
|
|
+ sinfo->filled |= BIT(NL80211_STA_INFO_TX_PACKETS);
|
|
|
sinfo->tx_packets = psta->sta_stats.tx_pkts;
|
|
|
|
|
|
}
|
|
|
@@ -2634,7 +2634,6 @@ void rtw_cfg80211_indicate_sta_assoc(_adapter *padapter, u8 *pmgmt_frame, uint f |
|
|
ie_offset = _REASOCREQ_IE_OFFSET_;
|
|
|
|
|
|
sinfo.filled = 0;
|
|
|
- sinfo.filled = STATION_INFO_ASSOC_REQ_IES;
|
|
|
sinfo.assoc_req_ies = pmgmt_frame + WLAN_HDR_A3_LEN + ie_offset;
|
|
|
sinfo.assoc_req_ies_len = frame_len - WLAN_HDR_A3_LEN - ie_offset;
|
|
|
cfg80211_new_sta(ndev, GetAddr2Ptr(pmgmt_frame), &sinfo, GFP_ATOMIC);
|
|
|
@@ -3112,16 +3111,8 @@ static int cfg80211_rtw_add_station(struct wiphy *wiphy, struct net_device *ndev |
|
|
return 0;
|
|
|
}
|
|
|
|
|
|
-#if (LINUX_VERSION_CODE >= KERNEL_VERSION(3, 19, 0))
|
|
|
static int cfg80211_rtw_del_station(struct wiphy *wiphy, struct net_device *ndev,
|
|
|
struct station_del_parameters *params)
|
|
|
-#elif (LINUX_VERSION_CODE > KERNEL_VERSION(3, 14, 0))
|
|
|
-static int cfg80211_rtw_del_station(struct wiphy *wiphy, struct net_device *ndev,
|
|
|
- const u8 *mac)
|
|
|
-#else
|
|
|
-static int cfg80211_rtw_del_station(struct wiphy *wiphy, struct net_device *ndev,
|
|
|
- u8 *mac)
|
|
|
-#endif
|
|
|
{
|
|
|
int ret=0;
|
|
|
_irqL irqL;
|
|
|
@@ -3131,9 +3122,7 @@ static int cfg80211_rtw_del_station(struct wiphy *wiphy, struct net_device *ndev |
|
|
_adapter *padapter = (_adapter *)rtw_netdev_priv(ndev);
|
|
|
struct mlme_priv *pmlmepriv = &(padapter->mlmepriv);
|
|
|
struct sta_priv *pstapriv = &padapter->stapriv;
|
|
|
-#if (LINUX_VERSION_CODE >= KERNEL_VERSION(3,19,0))
|
|
|
const u8 *mac = params->mac;
|
|
|
-#endif
|
|
|
|
|
|
DBG_871X("+"FUNC_NDEV_FMT"\n", FUNC_NDEV_ARG(ndev));
|
|
|
|
|
|
@@ -3214,13 +3203,8 @@ static int cfg80211_rtw_del_station(struct wiphy *wiphy, struct net_device *ndev |
|
|
|
|
|
}
|
|
|
|
|
|
-#if (LINUX_VERSION_CODE > KERNEL_VERSION(3, 14, 0))
|
|
|
static int cfg80211_rtw_change_station(struct wiphy *wiphy, struct net_device *ndev,
|
|
|
const u8 *mac, struct station_parameters *params)
|
|
|
-#else
|
|
|
-static int cfg80211_rtw_change_station(struct wiphy *wiphy, struct net_device *ndev,
|
|
|
- u8 *mac, struct station_parameters *params)
|
|
|
-#endif
|
|
|
{
|
|
|
DBG_871X(FUNC_NDEV_FMT"\n", FUNC_NDEV_ARG(ndev));
|
|
|
|
|
|
@@ -3268,8 +3252,7 @@ static int cfg80211_rtw_dump_station(struct wiphy *wiphy, struct net_device *nde |
|
|
goto exit;
|
|
|
}
|
|
|
memcpy(mac, psta->hwaddr, ETH_ALEN);
|
|
|
- sinfo->filled = 0;
|
|
|
- sinfo->filled |= STATION_INFO_SIGNAL;
|
|
|
+ sinfo->filled = BIT(NL80211_STA_INFO_SIGNAL);
|
|
|
sinfo->signal = psta->rssi;
|
|
|
|
|
|
exit:
|
|
|
|
0 comments on commit
86fe2db