aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/wireless/libertas/wext.c
diff options
context:
space:
mode:
authorHolger Schurig <hs4233@mail.mn-solutions.de>2009-10-22 09:30:47 -0400
committerJohn W. Linville <linville@tuxdriver.com>2009-10-27 16:48:36 -0400
commit243e84e91ed810f7dca5ba1c2d1a611811948566 (patch)
treee9c4a62a7ed787f3d509e00954a48b85c6ef75c1 /drivers/net/wireless/libertas/wext.c
parentf4228b4c2e5864ee9d2051176beb2bd5a49a15cc (diff)
libertas: change IW_ESSID_MAX_SIZE -> IEEE80211_MAX_SSID_LEN
Signed-off-by: Holger Schurig <hs4233@mail.mn-solutions.de> Acked-by: Dan Williams <dcbw@redhat.com> Signed-off-by: John W. Linville <linville@tuxdriver.com>
Diffstat (limited to 'drivers/net/wireless/libertas/wext.c')
-rw-r--r--drivers/net/wireless/libertas/wext.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/drivers/net/wireless/libertas/wext.c b/drivers/net/wireless/libertas/wext.c
index 82a932aef6f..3e8be9a578e 100644
--- a/drivers/net/wireless/libertas/wext.c
+++ b/drivers/net/wireless/libertas/wext.c
@@ -1989,7 +1989,7 @@ static int lbs_set_essid(struct net_device *dev, struct iw_request_info *info,
1989{ 1989{
1990 struct lbs_private *priv = dev->ml_priv; 1990 struct lbs_private *priv = dev->ml_priv;
1991 int ret = 0; 1991 int ret = 0;
1992 u8 ssid[IW_ESSID_MAX_SIZE]; 1992 u8 ssid[IEEE80211_MAX_SSID_LEN];
1993 u8 ssid_len = 0; 1993 u8 ssid_len = 0;
1994 struct assoc_request * assoc_req; 1994 struct assoc_request * assoc_req;
1995 int in_ssid_len = dwrq->length; 1995 int in_ssid_len = dwrq->length;
@@ -2003,7 +2003,7 @@ static int lbs_set_essid(struct net_device *dev, struct iw_request_info *info,
2003 } 2003 }
2004 2004
2005 /* Check the size of the string */ 2005 /* Check the size of the string */
2006 if (in_ssid_len > IW_ESSID_MAX_SIZE) { 2006 if (in_ssid_len > IEEE80211_MAX_SSID_LEN) {
2007 ret = -E2BIG; 2007 ret = -E2BIG;
2008 goto out; 2008 goto out;
2009 } 2009 }
@@ -2034,7 +2034,7 @@ out:
2034 ret = -ENOMEM; 2034 ret = -ENOMEM;
2035 } else { 2035 } else {
2036 /* Copy the SSID to the association request */ 2036 /* Copy the SSID to the association request */
2037 memcpy(&assoc_req->ssid, &ssid, IW_ESSID_MAX_SIZE); 2037 memcpy(&assoc_req->ssid, &ssid, IEEE80211_MAX_SSID_LEN);
2038 assoc_req->ssid_len = ssid_len; 2038 assoc_req->ssid_len = ssid_len;
2039 set_bit(ASSOC_FLAG_SSID, &assoc_req->flags); 2039 set_bit(ASSOC_FLAG_SSID, &assoc_req->flags);
2040 lbs_postpone_association_work(priv); 2040 lbs_postpone_association_work(priv);
@@ -2085,7 +2085,7 @@ static int lbs_mesh_set_essid(struct net_device *dev,
2085 } 2085 }
2086 2086
2087 /* Check the size of the string */ 2087 /* Check the size of the string */
2088 if (dwrq->length > IW_ESSID_MAX_SIZE) { 2088 if (dwrq->length > IEEE80211_MAX_SSID_LEN) {
2089 ret = -E2BIG; 2089 ret = -E2BIG;
2090 goto out; 2090 goto out;
2091 } 2091 }