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: <20150209.121342.1535841700027616341.davem@davemloft.net>
Date:	Mon, 09 Feb 2015 12:13:42 -0800 (PST)
From:	David Miller <davem@...emloft.net>
To:	kvalo@...eaurora.org
Cc:	linux-wireless@...r.kernel.org, netdev@...r.kernel.org
Subject: Re: pull-request: wireless-drivers-next 2015-02-07

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.

> Please let me know if there are any issues and sorry for being late.

Pulled, thanks a lot.