diff options
| author | John W. Linville <linville@tuxdriver.com> | 2014-05-22 13:58:36 -0400 |
|---|---|---|
| committer | John W. Linville <linville@tuxdriver.com> | 2014-05-22 13:58:36 -0400 |
| commit | 40a10fd740a4d5a9f3da255cf8dae48c6723d1a6 (patch) | |
| tree | a65eb4adca8e37ed7335345e94e36918593f7f92 /net/wireless/mesh.c | |
| parent | 99abe65ff18b6bbac2e55524827b571c3eccfa86 (diff) | |
| parent | 67af9811539be83dbdc0739215d29af23c870405 (diff) | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/jberg/mac80211-next
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 3ddfb7cd335e..092300b30c37 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, | |||
| 238 | return 0; | 238 | return 0; |
| 239 | } | 239 | } |
| 240 | 240 | ||
| 241 | static int __cfg80211_leave_mesh(struct cfg80211_registered_device *rdev, | 241 | int __cfg80211_leave_mesh(struct cfg80211_registered_device *rdev, |
| 242 | struct net_device *dev) | 242 | struct net_device *dev) |
| 243 | { | 243 | { |
| 244 | struct wireless_dev *wdev = dev->ieee80211_ptr; | 244 | struct wireless_dev *wdev = dev->ieee80211_ptr; |
| 245 | int err; | 245 | int err; |