On Wed, 2012-03-28 at 11:38 -0700, Kiran Divekar wrote:
> From: Amitkumar Karwar <akarwar@xxxxxxxxxxx>
>
> Return type for lbs_auth_to_authtype() is changed from "u8" to
> "int" to return negative error code correctly.
> Also an error check is added in connect handler for invalid auth
> type.
>
> Reported-by: Dan Carpenter <dan.carpenter@xxxxxxxxxx>
> Signed-off-by: Amitkumar Karwar <akarwar@xxxxxxxxxxx>
> Signed-off-by: Kiran Divekar <dkiran@xxxxxxxxxxx>
Acked-by: Dan Williams <dcbw@xxxxxxxxxx>
> ---
> drivers/net/wireless/libertas/cfg.c | 9 +++++++--
> 1 files changed, 7 insertions(+), 2 deletions(-)
>
> diff --git a/drivers/net/wireless/libertas/cfg.c b/drivers/net/wireless/libertas/cfg.c
> index 3fa1ece..2fa879b 100644
> --- a/drivers/net/wireless/libertas/cfg.c
> +++ b/drivers/net/wireless/libertas/cfg.c
> @@ -103,7 +103,7 @@ static const u32 cipher_suites[] = {
> * Convert NL80211's auth_type to the one from Libertas, see chapter 5.9.1
> * in the firmware spec
> */
> -static u8 lbs_auth_to_authtype(enum nl80211_auth_type auth_type)
> +static int lbs_auth_to_authtype(enum nl80211_auth_type auth_type)
> {
> int ret = -ENOTSUPP;
>
> @@ -1411,7 +1411,12 @@ static int lbs_cfg_connect(struct wiphy *wiphy, struct net_device *dev,
> goto done;
> }
>
> - lbs_set_authtype(priv, sme);
> + ret = lbs_set_authtype(priv, sme);
> + if (ret == -ENOTSUPP) {
> + wiphy_err(wiphy, "unsupported authtype 0x%x\n", sme->auth_type);
> + goto done;
> + }
> +
> lbs_set_radio(priv, preamble, 1);
>
> /* Do the actual association */
--
To unsubscribe from this list: send the line "unsubscribe linux-wireless" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
