From mboxrd@z Thu Jan  1 00:00:00 1970
From: "John W. Linville" <linville@tuxdriver.com>
Subject: Re: pull-request: wireless-drivers-next 2015-02-07
Date: Mon, 9 Feb 2015 15:37:42 -0500
Message-ID: <20150209203741.GG3566@tuxdriver.com>
References: <87a90qosos.fsf@kamboji.qca.qualcomm.com>
 <20150209.121342.1535841700027616341.davem@davemloft.net>
Mime-Version: 1.0
Content-Type: text/plain; charset=utf-8
Content-Transfer-Encoding: QUOTED-PRINTABLE
Cc: kvalo@codeaurora.org, linux-wireless@vger.kernel.org,
	netdev@vger.kernel.org
To: David Miller <davem@davemloft.net>
Return-path: <netdev-owner@vger.kernel.org>
Received: from charlotte.tuxdriver.com ([70.61.120.58]:49591 "EHLO
	smtp.tuxdriver.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org
	with ESMTP id S1751552AbbBIUpM (ORCPT
	<rfc822;netdev@vger.kernel.org>); Mon, 9 Feb 2015 15:45:12 -0500
Content-Disposition: inline
In-Reply-To: <20150209.121342.1535841700027616341.davem@davemloft.net>
Sender: netdev-owner@vger.kernel.org
List-ID: <netdev.vger.kernel.org>

On Mon, Feb 09, 2015 at 12:13:42PM -0800, David Miller wrote:
> From: Kalle Valo <kvalo@codeaurora.org>
> Date: Sat, 07 Feb 2015 13:40:51 +0200
>=20
> > There's a small conflict in drivers/net/wireless/rtlwifi/pci.c, the=
 fix
> > is to leave the two labels like this:
> >=20
> > 			schedule_work(&rtlpriv->works.lps_change_work);
> > 		}
> > end:
> > 		skb =3D new_skb;
> > no_new:
> > 		if (rtlpriv->use_new_trx_flow) {
> >=20
> >=20
>=20
> That can't be the correct resolution:
>=20
> drivers/net/wireless/rtlwifi/pci.c: In function =E2=80=98_rtl_pci_rx_=
interrupt=E2=80=99:
> drivers/net/wireless/rtlwifi/pci.c:934:1: warning: label =E2=80=98end=
=E2=80=99 defined but not used [-Wunused-label]
>=20
> So I've removed that label in the merge commit.

=46WIW, that's the way I have it in wireless-testing as well...

John
--=20
John W. Linville		Someday the world will need a hero, and you
linville@tuxdriver.com			might be all we have.  Be ready.