[Patch v2] drivers: staging : wlan-ng : collect return status without variable

Dan Carpenter dan.carpenter at oracle.com
Sat May 11 20:47:12 UTC 2019


On Sat, May 11, 2019 at 03:18:59PM +0530, Hariprasad Kelam wrote:
> As caller rdev_set_default_key  not particular about -EFAULT.
> We can preserve the return value of prism2_domibset_uint32.
> 
> Signed-off-by: Hariprasad Kelam <hariprasad.kelam at gmail.com>
> -----
> Changes in v2:
>   - remove  masking of original return value with EFAULT
> ---
>  drivers/staging/wlan-ng/cfg80211.c | 9 +++------
>  1 file changed, 3 insertions(+), 6 deletions(-)
> 
> diff --git a/drivers/staging/wlan-ng/cfg80211.c b/drivers/staging/wlan-ng/cfg80211.c
> index 5dad5ac..4018fc5 100644
> --- a/drivers/staging/wlan-ng/cfg80211.c
> +++ b/drivers/staging/wlan-ng/cfg80211.c
> @@ -231,12 +231,9 @@ static int prism2_set_default_key(struct wiphy *wiphy, struct net_device *dev,
>  {
>  	struct wlandevice *wlandev = dev->ml_priv;
>  
> -	if (prism2_domibset_uint32(wlandev,
> -				   DIDMIB_DOT11SMT_PRIVACYTABLE_WEPDEFAULTKEYID,
> -				   key_index))
> -		return -EFAULT;
> -	else
> -		return 0;
> +	return prism2_domibset_uint32(wlandev,
> +				      DIDMIB_DOT11SMT_PRIVACYTABLE_WEPDEFAULTKEYID,
> +				      key_index);
>  }
>  

I'm sorry, this patch can only be applied on top of v1, but we need a
patch which can be applied on top of linux-next without applying v1
first.  (Merge/fold the two patches together and resend).

regards,
dan carpenter



More information about the devel mailing list