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@xxxxxxxxx> > --- > 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 _______________________________________________ devel mailing list devel@xxxxxxxxxxxxxxxxxxxxxx http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel