netdev - Re: pull-request: wireless-drivers-next 2015-02-07

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: <20150209203741.GG3566@tuxdriver.com>
Date:	Mon, 9 Feb 2015 15:37:42 -0500
From:	"John W. Linville" <linville@...driver.com>
To:	David Miller <davem@...emloft.net>
Cc:	kvalo@...eaurora.org, linux-wireless@...r.kernel.org,
	netdev@...r.kernel.org
Subject: Re: pull-request: wireless-drivers-next 2015-02-07

On Mon, Feb 09, 2015 at 12:13:42PM -0800, David Miller wrote:
> From: Kalle Valo <kvalo@...eaurora.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@...driver.com			might be all we have.  Be ready.
--
To unsubscribe from this list: send the line "unsubscribe netdev" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html