diff options
Diffstat (limited to 'net/mac80211/cfg.c')
-rw-r--r-- | net/mac80211/cfg.c | 20 |
1 files changed, 11 insertions, 9 deletions
diff --git a/net/mac80211/cfg.c b/net/mac80211/cfg.c index e7535ffc8e1c..006da6a2e71b 100644 --- a/net/mac80211/cfg.c +++ b/net/mac80211/cfg.c | |||
@@ -34,7 +34,8 @@ nl80211_type_to_mac80211_type(enum nl80211_iftype type) | |||
34 | } | 34 | } |
35 | 35 | ||
36 | static int ieee80211_add_iface(struct wiphy *wiphy, char *name, | 36 | static int ieee80211_add_iface(struct wiphy *wiphy, char *name, |
37 | enum nl80211_iftype type, u32 *flags) | 37 | enum nl80211_iftype type, u32 *flags, |
38 | struct vif_params *params) | ||
38 | { | 39 | { |
39 | struct ieee80211_local *local = wiphy_priv(wiphy); | 40 | struct ieee80211_local *local = wiphy_priv(wiphy); |
40 | enum ieee80211_if_types itype; | 41 | enum ieee80211_if_types itype; |
@@ -78,7 +79,8 @@ static int ieee80211_del_iface(struct wiphy *wiphy, int ifindex) | |||
78 | } | 79 | } |
79 | 80 | ||
80 | static int ieee80211_change_iface(struct wiphy *wiphy, int ifindex, | 81 | static int ieee80211_change_iface(struct wiphy *wiphy, int ifindex, |
81 | enum nl80211_iftype type, u32 *flags) | 82 | enum nl80211_iftype type, u32 *flags, |
83 | struct vif_params *params) | ||
82 | { | 84 | { |
83 | struct ieee80211_local *local = wiphy_priv(wiphy); | 85 | struct ieee80211_local *local = wiphy_priv(wiphy); |
84 | struct net_device *dev; | 86 | struct net_device *dev; |
@@ -296,7 +298,7 @@ static int ieee80211_config_default_key(struct wiphy *wiphy, | |||
296 | } | 298 | } |
297 | 299 | ||
298 | static int ieee80211_get_station(struct wiphy *wiphy, struct net_device *dev, | 300 | static int ieee80211_get_station(struct wiphy *wiphy, struct net_device *dev, |
299 | u8 *mac, struct station_stats *stats) | 301 | u8 *mac, struct station_info *sinfo) |
300 | { | 302 | { |
301 | struct ieee80211_local *local = wdev_priv(dev->ieee80211_ptr); | 303 | struct ieee80211_local *local = wdev_priv(dev->ieee80211_ptr); |
302 | struct sta_info *sta; | 304 | struct sta_info *sta; |
@@ -307,13 +309,13 @@ static int ieee80211_get_station(struct wiphy *wiphy, struct net_device *dev, | |||
307 | 309 | ||
308 | /* XXX: verify sta->dev == dev */ | 310 | /* XXX: verify sta->dev == dev */ |
309 | 311 | ||
310 | stats->filled = STATION_STAT_INACTIVE_TIME | | 312 | sinfo->filled = STATION_INFO_INACTIVE_TIME | |
311 | STATION_STAT_RX_BYTES | | 313 | STATION_INFO_RX_BYTES | |
312 | STATION_STAT_TX_BYTES; | 314 | STATION_INFO_TX_BYTES; |
313 | 315 | ||
314 | stats->inactive_time = jiffies_to_msecs(jiffies - sta->last_rx); | 316 | sinfo->inactive_time = jiffies_to_msecs(jiffies - sta->last_rx); |
315 | stats->rx_bytes = sta->rx_bytes; | 317 | sinfo->rx_bytes = sta->rx_bytes; |
316 | stats->tx_bytes = sta->tx_bytes; | 318 | sinfo->tx_bytes = sta->tx_bytes; |
317 | 319 | ||
318 | sta_info_put(sta); | 320 | sta_info_put(sta); |
319 | 321 | ||