Merge branch 'next-spi' of git://git.secretlab.ca/git/linux-2.6

[linux.git] / net / wireless / util.c

diff --git a/net/wireless/util.c b/net/wireless/util.c
index fee020b15a4e8d5f55b8c1c31e81e09e618e5ec0..7620ae2fcf18e391c18ee6cfea6f4ec95c73b074 100644 (file)
--- a/net/wireless/util.c
+++ b/net/wireless/util.c
@@ -689,7 +689,8 @@ void cfg80211_upload_connect_keys(struct wireless_dev *wdev)
                        continue;
                }
                if (wdev->connect_keys->def == i)
-                       if (rdev->ops->set_default_key(wdev->wiphy, dev, i)) {
+                       if (rdev->ops->set_default_key(wdev->wiphy, dev,
+                                                      i, true, true)) {
                                netdev_err(dev, "failed to set defkey %d\n", i);
                                continue;
                        }
@@ -792,6 +793,7 @@ int cfg80211_change_iface(struct cfg80211_registered_device *rdev,
 
        if (ntype != otype) {
                dev->ieee80211_ptr->use_4addr = false;
+               dev->ieee80211_ptr->mesh_id_up_len = 0;
 
                switch (otype) {
                case NL80211_IFTYPE_ADHOC: