diff options
| author | John W. Linville <linville@tuxdriver.com> | 2010-12-22 22:27:21 +0300 |
|---|---|---|
| committer | John W. Linville <linville@tuxdriver.com> | 2010-12-22 22:27:21 +0300 |
| commit | 63e35cd9bd4c8ae085c8b9a70554595b529c4100 (patch) | |
| tree | 68e771e0035d5f3ee394a3d86885631a2610bba5 /net/wireless/wext-compat.c | |
| parent | 503b1a529a6b62b31904bab4699752c523cf76b2 (diff) | |
| parent | 3d986b25b5faa50ba6afd94f60f270b6c3061e5e (diff) | |
| download | linux-63e35cd9bd4c8ae085c8b9a70554595b529c4100.tar.xz | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next-2.6 into for-davem
Conflicts:
drivers/net/wireless/iwlwifi/iwl-1000.c
drivers/net/wireless/iwlwifi/iwl-6000.c
drivers/net/wireless/iwlwifi/iwl-core.h
Diffstat (limited to 'net/wireless/wext-compat.c')
| -rw-r--r-- | net/wireless/wext-compat.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/net/wireless/wext-compat.c b/net/wireless/wext-compat.c index 12222ee6ebf2..3e5dbd4e4cd5 100644 --- a/net/wireless/wext-compat.c +++ b/net/wireless/wext-compat.c @@ -548,8 +548,8 @@ static int __cfg80211_set_encryption(struct cfg80211_registered_device *rdev, __cfg80211_leave_ibss(rdev, wdev->netdev, true); rejoin = true; } - err = rdev->ops->set_default_key(&rdev->wiphy, - dev, idx); + err = rdev->ops->set_default_key(&rdev->wiphy, dev, + idx, true, true); } if (!err) { wdev->wext.default_key = idx; @@ -627,8 +627,8 @@ int cfg80211_wext_siwencode(struct net_device *dev, err = 0; wdev_lock(wdev); if (wdev->current_bss) - err = rdev->ops->set_default_key(&rdev->wiphy, - dev, idx); + err = rdev->ops->set_default_key(&rdev->wiphy, dev, + idx, true, true); if (!err) wdev->wext.default_key = idx; wdev_unlock(wdev); |