diff options
author | John W. Linville <linville@tuxdriver.com> | 2014-01-03 15:25:15 -0500 |
---|---|---|
committer | John W. Linville <linville@tuxdriver.com> | 2014-01-03 15:25:15 -0500 |
commit | 55d1cad2efe2e3567c3116f50ba10e5af1bc01fc (patch) | |
tree | 5d09fc11643739c5266250383cffbe577a562ee5 /net/wireless/mesh.c | |
parent | 39731b78b4afebb7501c05b68e2443a1b250b41c (diff) | |
parent | 32db6b54dfba38aa8fa4072b2a3fc6425139166a (diff) |
Merge branch 'for-john' of 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 | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/net/wireless/mesh.c b/net/wireless/mesh.c index 9c7a11ae793..885862447b6 100644 --- a/net/wireless/mesh.c +++ b/net/wireless/mesh.c @@ -277,6 +277,7 @@ static int __cfg80211_leave_mesh(struct cfg80211_registered_device *rdev, if (!err) { wdev->mesh_id_len = 0; wdev->channel = NULL; + rdev_set_qos_map(rdev, dev, NULL); } return err; |