diff options
| author | David S. Miller <davem@davemloft.net> | 2008-03-28 02:01:13 +0100 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2008-03-28 02:01:13 +0100 |
| commit | ed85f2c3b2b72bd20f617ac749f5c22be8d0f66e (patch) | |
| tree | cb077293e1b36a5d6e2a138deb9663078a2d850e /net/mac80211/ieee80211_ioctl.c | |
| parent | [SCTP]: Remove sctp_add_cmd_sf wrapper bloat (diff) | |
| parent | libertas: reduce debug output (diff) | |
| download | linux-ed85f2c3b2b72bd20f617ac749f5c22be8d0f66e.tar.xz linux-ed85f2c3b2b72bd20f617ac749f5c22be8d0f66e.zip | |
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, key = sta->key; } - if (!key) - return -ENOENT; - ieee80211_key_free(key); return 0; } else { |