projects
/
linux-2.6-microblaze.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge remote-tracking branch 'torvalds/master' into perf/core
[linux-2.6-microblaze.git]
/
net
/
wireless
/
util.c
diff --git
a/net/wireless/util.c
b/net/wireless/util.c
index
7ec021a
..
18dba3d
100644
(file)
--- a/
net/wireless/util.c
+++ b/
net/wireless/util.c
@@
-1059,6
+1059,9
@@
int cfg80211_change_iface(struct cfg80211_registered_device *rdev,
case NL80211_IFTYPE_MESH_POINT:
/* mesh should be handled? */
break;
+ case NL80211_IFTYPE_OCB:
+ cfg80211_leave_ocb(rdev, dev);
+ break;
default:
break;
}