[PATCH] libertas: remove double definition of libertas_ret_802_11_enable_rsn()

Dan Williams dcbw at redhat.com
Fri Jul 6 09:52:24 EDT 2007


On Fri, 2007-07-06 at 09:35 +0200, Holger Schurig wrote:
> Libertas won't compile without this patch.

Huh?  I only see one definition, and it compiles for me...  Bad merge
maybe?

Dan

> Signed-off-by: Holger Schurig <hs4233 at mail.mn-solutions.de>
> ---
>  drivers/net/wireless/libertas/cmdresp.c |   18 ------------------
>  1 files changed, 0 insertions(+), 18 deletions(-)
> 
> diff --git a/drivers/net/wireless/libertas/cmdresp.c b/drivers/net/wireless/libertas/cmdresp.c
> index f5bee2e..53671e9 100644
> --- a/drivers/net/wireless/libertas/cmdresp.c
> +++ b/drivers/net/wireless/libertas/cmdresp.c
> @@ -531,24 +531,6 @@ static int libertas_ret_802_11_enable_rsn(wlan_private * priv,
>  	return 0;
>  }
>  
> -static int libertas_ret_802_11_enable_rsn(wlan_private * priv,
> -                                          struct cmd_ds_command *resp)
> -{
> -	struct cmd_ds_802_11_enable_rsn *enable_rsn = &resp->params.enbrsn;
> -	wlan_adapter *adapter = priv->adapter;
> -	u32 * pdata_buf = adapter->cur_cmd->pdata_buf;
> -
> -	lbs_deb_enter(LBS_DEB_CMD);
> -
> -	if (enable_rsn->action == cpu_to_le16(cmd_act_get)) {
> -		if (pdata_buf)
> -			*pdata_buf = (u32) le16_to_cpu(enable_rsn->enable);
> -	}
> -
> -	lbs_deb_enter(LBS_DEB_CMD);
> -	return 0;
> -}
> -
>  static inline int handle_cmd_response(u16 respcmd,
>  				      struct cmd_ds_command *resp,
>  				      wlan_private *priv)




More information about the libertas-dev mailing list