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

[David Miller]

From: Kalle Valo <kv...@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.

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

Pulled, thanks a lot.
N‹§²ζμrΈ›yϊθšΨb²X¬ΆΗ§vΨ^–)ήΊ{.nΗ+‰·₯Š{±Β*ή•λ,Š{ayΊΚ‡Ϊ™λ,j­’f£’·hš‹ΰzΉ�w₯’Έ
’·¦j:+v‰¨ŠwθjΨmΆŸ�Ύ«‘κηzZ+ƒωšŽŠέ’j"ϊ!Άi