diff options
| author | John W. Linville <linville@tuxdriver.com> | 2014-05-27 13:51:31 -0400 |
|---|---|---|
| committer | John W. Linville <linville@tuxdriver.com> | 2014-05-27 13:51:31 -0400 |
| commit | 9db7cb6901740453a442e598563b576987dd471b (patch) | |
| tree | e38911285b5cd9980280a92ea0e0260f6c1ef2ad /net/wireless/mesh.c | |
| parent | 3bea8eddfebe1c61ea824dd2880d4368791edc1f (diff) | |
| parent | 03c4444650969431b3a5effde4995de767e3013a (diff) | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next into for-davem
Diffstat (limited to 'net/wireless/mesh.c')
| -rw-r--r-- | net/wireless/mesh.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/net/wireless/mesh.c b/net/wireless/mesh.c index 3ddfb7cd335..092300b30c3 100644 --- a/net/wireless/mesh.c +++ b/net/wireless/mesh.c @@ -238,8 +238,8 @@ int cfg80211_set_mesh_channel(struct cfg80211_registered_device *rdev, return 0; } -static int __cfg80211_leave_mesh(struct cfg80211_registered_device *rdev, - struct net_device *dev) +int __cfg80211_leave_mesh(struct cfg80211_registered_device *rdev, + struct net_device *dev) { struct wireless_dev *wdev = dev->ieee80211_ptr; int err; |