diff options
| author | John W. Linville <linville@tuxdriver.com> | 2010-12-13 15:20:45 -0500 |
|---|---|---|
| committer | John W. Linville <linville@tuxdriver.com> | 2010-12-13 15:20:45 -0500 |
| commit | 1d212aa96e1b63459486f729af9a3fa38768b801 (patch) | |
| tree | e91e74db57a5bb7884b4681cdb788d405ec8f10f /net/wireless/core.h | |
| parent | 8c4877a4128e7931077b024a891a4b284d8756a3 (diff) | |
| parent | b7613370db5ba66ad81e41cd3a5417fde4d5e03c (diff) | |
| download | linux-1d212aa96e1b63459486f729af9a3fa38768b801.tar.gz linux-1d212aa96e1b63459486f729af9a3fa38768b801.tar.xz | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next-2.6 into for-davem
Diffstat (limited to 'net/wireless/core.h')
| -rw-r--r-- | net/wireless/core.h | 13 |
1 files changed, 13 insertions, 0 deletions
diff --git a/net/wireless/core.h b/net/wireless/core.h index ee80ad8dc655..743203bb61ac 100644 --- a/net/wireless/core.h +++ b/net/wireless/core.h @@ -285,6 +285,19 @@ void __cfg80211_ibss_joined(struct net_device *dev, const u8 *bssid); int cfg80211_ibss_wext_join(struct cfg80211_registered_device *rdev, struct wireless_dev *wdev); +/* mesh */ +extern const struct mesh_config default_mesh_config; +int __cfg80211_join_mesh(struct cfg80211_registered_device *rdev, + struct net_device *dev, + const u8 *mesh_id, u8 mesh_id_len, + const struct mesh_config *conf); +int cfg80211_join_mesh(struct cfg80211_registered_device *rdev, + struct net_device *dev, + const u8 *mesh_id, u8 mesh_id_len, + const struct mesh_config *conf); +int cfg80211_leave_mesh(struct cfg80211_registered_device *rdev, + struct net_device *dev); + /* MLME */ int __cfg80211_mlme_auth(struct cfg80211_registered_device *rdev, struct net_device *dev, |