diff options
author | David S. Miller <davem@davemloft.net> | 2009-07-24 02:03:51 (GMT) |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2009-07-24 02:03:51 (GMT) |
commit | 74d154189d597b91da4322996dbf4f5c3d1544ab (patch) | |
tree | 6f09861b5e2f875d2d8ea2127b16add9103221c6 /net/wireless | |
parent | 5a6338db37885af06760d40cad589316e48431e9 (diff) | |
parent | ffafa60d496f80c250f2ae0340ae94434c0b0b4d (diff) | |
download | linux-fsl-qoriq-74d154189d597b91da4322996dbf4f5c3d1544ab.tar.xz |
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
Conflicts:
drivers/net/wireless/iwmc3200wifi/netdev.c
net/wireless/scan.c
Diffstat (limited to 'net/wireless')
-rw-r--r-- | net/wireless/nl80211.c | 5 | ||||
-rw-r--r-- | net/wireless/scan.c | 3 |
2 files changed, 4 insertions, 4 deletions
diff --git a/net/wireless/nl80211.c b/net/wireless/nl80211.c index 2a04beb..4478760 100644 --- a/net/wireless/nl80211.c +++ b/net/wireless/nl80211.c @@ -1010,7 +1010,7 @@ static int nl80211_get_key(struct sk_buff *skb, struct genl_info *info) if (IS_ERR(hdr)) { err = PTR_ERR(hdr); - goto out; + goto free_msg; } cookie.msg = msg; @@ -1024,7 +1024,7 @@ static int nl80211_get_key(struct sk_buff *skb, struct genl_info *info) &cookie, get_key_callback); if (err) - goto out; + goto free_msg; if (cookie.error) goto nla_put_failure; @@ -1035,6 +1035,7 @@ static int nl80211_get_key(struct sk_buff *skb, struct genl_info *info) nla_put_failure: err = -ENOBUFS; + free_msg: nlmsg_free(msg); out: cfg80211_unlock_rdev(rdev); diff --git a/net/wireless/scan.c b/net/wireless/scan.c index 4f552c3..decc59f 100644 --- a/net/wireless/scan.c +++ b/net/wireless/scan.c @@ -48,8 +48,6 @@ void __cfg80211_scan_done(struct work_struct *wk) else nl80211_send_scan_done(wiphy_to_dev(request->wiphy), dev); - wiphy_to_dev(request->wiphy)->scan_req = NULL; - #ifdef CONFIG_WIRELESS_EXT if (!request->aborted) { memset(&wrqu, 0, sizeof(wrqu)); @@ -62,6 +60,7 @@ void __cfg80211_scan_done(struct work_struct *wk) out: cfg80211_unlock_rdev(rdev); + wiphy_to_dev(request->wiphy)->scan_req = NULL; kfree(request); } |