diff options
Diffstat (limited to 'net/wireless/core.h')
-rw-r--r-- | net/wireless/core.h | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/net/wireless/core.h b/net/wireless/core.h index 8523f3878677..9348a47562a4 100644 --- a/net/wireless/core.h +++ b/net/wireless/core.h | |||
@@ -303,14 +303,17 @@ extern const struct mesh_config default_mesh_config; | |||
303 | extern const struct mesh_setup default_mesh_setup; | 303 | extern const struct mesh_setup default_mesh_setup; |
304 | int __cfg80211_join_mesh(struct cfg80211_registered_device *rdev, | 304 | int __cfg80211_join_mesh(struct cfg80211_registered_device *rdev, |
305 | struct net_device *dev, | 305 | struct net_device *dev, |
306 | const struct mesh_setup *setup, | 306 | struct mesh_setup *setup, |
307 | const struct mesh_config *conf); | 307 | const struct mesh_config *conf); |
308 | int cfg80211_join_mesh(struct cfg80211_registered_device *rdev, | 308 | int cfg80211_join_mesh(struct cfg80211_registered_device *rdev, |
309 | struct net_device *dev, | 309 | struct net_device *dev, |
310 | const struct mesh_setup *setup, | 310 | struct mesh_setup *setup, |
311 | const struct mesh_config *conf); | 311 | const struct mesh_config *conf); |
312 | int cfg80211_leave_mesh(struct cfg80211_registered_device *rdev, | 312 | int cfg80211_leave_mesh(struct cfg80211_registered_device *rdev, |
313 | struct net_device *dev); | 313 | struct net_device *dev); |
314 | int cfg80211_set_mesh_freq(struct cfg80211_registered_device *rdev, | ||
315 | struct wireless_dev *wdev, int freq, | ||
316 | enum nl80211_channel_type channel_type); | ||
314 | 317 | ||
315 | /* MLME */ | 318 | /* MLME */ |
316 | int __cfg80211_mlme_auth(struct cfg80211_registered_device *rdev, | 319 | int __cfg80211_mlme_auth(struct cfg80211_registered_device *rdev, |
@@ -441,9 +444,8 @@ cfg80211_can_add_interface(struct cfg80211_registered_device *rdev, | |||
441 | struct ieee80211_channel * | 444 | struct ieee80211_channel * |
442 | rdev_freq_to_chan(struct cfg80211_registered_device *rdev, | 445 | rdev_freq_to_chan(struct cfg80211_registered_device *rdev, |
443 | int freq, enum nl80211_channel_type channel_type); | 446 | int freq, enum nl80211_channel_type channel_type); |
444 | int cfg80211_set_freq(struct cfg80211_registered_device *rdev, | 447 | int cfg80211_set_monitor_channel(struct cfg80211_registered_device *rdev, |
445 | struct wireless_dev *wdev, int freq, | 448 | int freq, enum nl80211_channel_type chantype); |
446 | enum nl80211_channel_type channel_type); | ||
447 | 449 | ||
448 | int ieee80211_get_ratemask(struct ieee80211_supported_band *sband, | 450 | int ieee80211_get_ratemask(struct ieee80211_supported_band *sband, |
449 | const u8 *rates, unsigned int n_rates, | 451 | const u8 *rates, unsigned int n_rates, |