From ded59d6c632ac867180c27db72092b0072f0217f Mon Sep 17 00:00:00 2001
From: Jouni Malinen <j@w1.fi>
Date: Fri, 27 Mar 2009 20:52:47 +0200
Subject: [PATCH] --- yaml --- r: 149839 b: refs/heads/master c:
 1778092e1739155acec35a3bccee2fb8a1ae4e91 h: refs/heads/master i:   149837:
 e34ad9e1ce9b8ffc190d29e6e0c36199b548fa19   149835:
 7d338dc8ab33908008ceb4adb1908559890cc06b   149831:
 b5c237a417a317d363829e6ccd3b92da4001c45b   149823:
 47690b0cbea4f0bec48762d7e790befcfb609f1c v: v3

---
 [refs]                       |  2 +-
 trunk/net/wireless/nl80211.c | 14 +++++++-------
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/[refs] b/[refs]
index f5085b64864b..13746e9385ae 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: c0ed418977edf60f1df9933e1ccd48920a28eb66
+refs/heads/master: 1778092e1739155acec35a3bccee2fb8a1ae4e91
diff --git a/trunk/net/wireless/nl80211.c b/trunk/net/wireless/nl80211.c
index 2f449ddcbc72..c04df6a6af78 100644
--- a/trunk/net/wireless/nl80211.c
+++ b/trunk/net/wireless/nl80211.c
@@ -2752,6 +2752,9 @@ static int nl80211_authenticate(struct sk_buff *skb, struct genl_info *info)
 	if (!info->attrs[NL80211_ATTR_MAC])
 		return -EINVAL;
 
+	if (!info->attrs[NL80211_ATTR_AUTH_TYPE])
+		return -EINVAL;
+
 	rtnl_lock();
 
 	err = get_drv_dev_by_info_ifindex(info->attrs, &drv, &dev);
@@ -2798,13 +2801,10 @@ static int nl80211_authenticate(struct sk_buff *skb, struct genl_info *info)
 		req.ie_len = nla_len(info->attrs[NL80211_ATTR_IE]);
 	}
 
-	if (info->attrs[NL80211_ATTR_AUTH_TYPE]) {
-		req.auth_type =
-			nla_get_u32(info->attrs[NL80211_ATTR_AUTH_TYPE]);
-		if (!nl80211_valid_auth_type(req.auth_type)) {
-			err = -EINVAL;
-			goto out;
-		}
+	req.auth_type = nla_get_u32(info->attrs[NL80211_ATTR_AUTH_TYPE]);
+	if (!nl80211_valid_auth_type(req.auth_type)) {
+		err = -EINVAL;
+		goto out;
 	}
 
 	err = drv->ops->auth(&drv->wiphy, dev, &req);