From 98e074778cfceb243e2370b597a6c3ed069fe745 Mon Sep 17 00:00:00 2001 From: Zhu Yi Date: Mon, 20 Jul 2009 16:12:57 +0800 Subject: [PATCH] --- yaml --- r: 159180 b: refs/heads/master c: 1e056665e878ce4f91dbfd594f4ebba49ea689c0 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/net/wireless/util.c | 8 ++++++-- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 2bbccc454260..2c9f85683ffe 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 971ad01169398170976951d3a9479a29d231c734 +refs/heads/master: 1e056665e878ce4f91dbfd594f4ebba49ea689c0 diff --git a/trunk/net/wireless/util.c b/trunk/net/wireless/util.c index 4bab380a1204..ba387d85dcfd 100644 --- a/trunk/net/wireless/util.c +++ b/trunk/net/wireless/util.c @@ -546,13 +546,17 @@ void cfg80211_upload_connect_keys(struct wireless_dev *wdev) if (!wdev->connect_keys->params[i].cipher) continue; if (rdev->ops->add_key(wdev->wiphy, dev, i, NULL, - &wdev->connect_keys->params[i])) + &wdev->connect_keys->params[i])) { printk(KERN_ERR "%s: failed to set key %d\n", dev->name, i); + 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)) { printk(KERN_ERR "%s: failed to set defkey %d\n", dev->name, i); + continue; + } if (wdev->connect_keys->defmgmt == i) if (rdev->ops->set_default_mgmt_key(wdev->wiphy, dev, i)) printk(KERN_ERR "%s: failed to set mgtdef %d\n",