diff options
| author | David S. Miller <davem@davemloft.net> | 2008-03-27 21:01:13 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2008-03-27 21:01:13 -0400 |
| commit | ed85f2c3b2b72bd20f617ac749f5c22be8d0f66e (patch) | |
| tree | cb077293e1b36a5d6e2a138deb9663078a2d850e /net/mac80211/ieee80211_ioctl.c | |
| parent | bc09dff198e67a98a82c42000006b39f6d502031 (diff) | |
| parent | e5225b397308f9eea86327293b73dc88068e0179 (diff) | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-2.6.26
Diffstat (limited to 'net/mac80211/ieee80211_ioctl.c')
| -rw-r--r-- | net/mac80211/ieee80211_ioctl.c | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/net/mac80211/ieee80211_ioctl.c b/net/mac80211/ieee80211_ioctl.c index 5af23d318726..b047eebb6330 100644 --- a/net/mac80211/ieee80211_ioctl.c +++ b/net/mac80211/ieee80211_ioctl.c | |||
| @@ -55,9 +55,6 @@ static int ieee80211_set_encryption(struct net_device *dev, u8 *sta_addr, | |||
| 55 | key = sta->key; | 55 | key = sta->key; |
| 56 | } | 56 | } |
| 57 | 57 | ||
| 58 | if (!key) | ||
| 59 | return -ENOENT; | ||
| 60 | |||
| 61 | ieee80211_key_free(key); | 58 | ieee80211_key_free(key); |
| 62 | return 0; | 59 | return 0; |
| 63 | } else { | 60 | } else { |