public inbox for linux-kernel@vger.kernel.org
 help / color / mirror / Atom feed
From: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
To: Maksymilian Piechota <maksymilianpiechota@gmail.com>
Cc: devel@driverdev.osuosl.org, linux-kernel@vger.kernel.org
Subject: Re: [PATCH v7 1/2] staging: wlan-ng: move else if statement to a single line
Date: Thu, 16 Feb 2017 10:27:24 -0800	[thread overview]
Message-ID: <20170216182724.GA30686@kroah.com> (raw)
In-Reply-To: <7cc81509110c581229367b07e049a959413e9bb2.1487170789.git.maksymilianpiechota@gmail.com>

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@gmail.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

  reply	other threads:[~2017-02-16 18:27 UTC|newest]

Thread overview: 6+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2017-02-15 15:08 [PATCH v7 0/2] staging: wlan-ng: align else if statement to coding standard Maksymilian Piechota
2017-02-15 15:11 ` [PATCH v7 1/2] staging: wlan-ng: move else if statement to a single line Maksymilian Piechota
2017-02-16 18:27   ` Greg Kroah-Hartman [this message]
2017-02-17 14:33     ` Maksymilian Piechota
2017-02-24 16:33       ` Greg Kroah-Hartman
2017-02-15 15:14 ` [PATCH v7 2/2] staging: wlan-ng: move logical continuation at the end of line Maksymilian Piechota

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20170216182724.GA30686@kroah.com \
    --to=gregkh@linuxfoundation.org \
    --cc=devel@driverdev.osuosl.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=maksymilianpiechota@gmail.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox