linux-kernel - Re: [PATCH v7 1/2] staging: wlan-ng: move else if statement to a single line

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]

Message-ID: <20170216182724.GA30686@kroah.com>
Date:   Thu, 16 Feb 2017 10:27:24 -0800
From:   Greg Kroah-Hartman <gregkh@...uxfoundation.org>
To:     Maksymilian Piechota <maksymilianpiechota@...il.com>
Cc:     devel@...verdev.osuosl.org, linux-kernel@...r.kernel.org
Subject: Re: [PATCH v7 1/2] staging: wlan-ng: move else if statement to a
 single line

On Wed, Feb 15, 2017 at 10:11:00AM -0500, Maksymilian Piechota wrote:
> move else if statement to a single line
> 
> Signed-off-by: Maksymilian Piechota <maksymilianpiechota@...il.com>
> ---
>  drivers/staging/wlan-ng/prism2mgmt.c | 3 +--
>  1 file changed, 1 insertion(+), 2 deletions(-)
> 
> diff --git a/drivers/staging/wlan-ng/prism2mgmt.c b/drivers/staging/wlan-ng/prism2mgmt.c
> index 16fb2d3..a45ff00 100644
> --- a/drivers/staging/wlan-ng/prism2mgmt.c
> +++ b/drivers/staging/wlan-ng/prism2mgmt.c
> @@ -1307,8 +1307,7 @@ int prism2mgmt_wlansniff(struct wlandevice *wlandev, void *msgp)
>  		    && (msg->prismheader.data == P80211ENUM_truth_true)) {
>  			hw->sniffhdr = 0;
>  			wlandev->netdev->type = ARPHRD_IEEE80211_PRISM;
> -		} else
> -		    if ((msg->wlanheader.status ==
> +		} else if ((msg->wlanheader.status ==
>  			 P80211ENUM_msgitem_status_data_ok)
>  			&& (msg->wlanheader.data == P80211ENUM_truth_true)) {
>  			hw->sniffhdr = 1;

This patch does not apply to my tree at all :(

Please rebase and resend the series.

thanks,

greg k-h