From: "John W. Linville" <linville@tuxdriver.com>
To: David Miller <davem@davemloft.net>
Cc: kvalo@codeaurora.org, linux-wireless@vger.kernel.org,
netdev@vger.kernel.org
Subject: Re: pull-request: wireless-drivers-next 2015-02-07
Date: Mon, 9 Feb 2015 15:37:42 -0500 [thread overview]
Message-ID: <20150209203741.GG3566@tuxdriver.com> (raw)
In-Reply-To: <20150209.121342.1535841700027616341.davem@davemloft.net>
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
>
> > There's a small conflict in drivers/net/wireless/rtlwifi/pci.c, the fix
> > is to leave the two labels like this:
> >
> > schedule_work(&rtlpriv->works.lps_change_work);
> > }
> > end:
> > skb = new_skb;
> > no_new:
> > if (rtlpriv->use_new_trx_flow) {
> >
> >
>
> That can't be the correct resolution:
>
> drivers/net/wireless/rtlwifi/pci.c: In function ‘_rtl_pci_rx_interrupt’:
> drivers/net/wireless/rtlwifi/pci.c:934:1: warning: label ‘end’ defined but not used [-Wunused-label]
>
> So I've removed that label in the merge commit.
FWIW, that's the way I have it in wireless-testing as well...
John
--
John W. Linville Someday the world will need a hero, and you
linville@tuxdriver.com might be all we have. Be ready.
next prev parent reply other threads:[~2015-02-09 20:45 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-02-07 11:40 pull-request: wireless-drivers-next 2015-02-07 Kalle Valo
2015-02-09 20:13 ` David Miller
2015-02-09 20:37 ` John W. Linville [this message]
2015-02-09 20:49 ` Larry Finger
2015-02-10 13:49 ` Kalle Valo
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=20150209203741.GG3566@tuxdriver.com \
--to=linville@tuxdriver.com \
--cc=davem@davemloft.net \
--cc=kvalo@codeaurora.org \
--cc=linux-wireless@vger.kernel.org \
--cc=netdev@vger.kernel.org \
/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;
as well as URLs for NNTP newsgroup(s).