David Miller <[email protected]> writes: > From: Kalle Valo <[email protected]> > 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.
Sorry about that, but great that you catched my mistake. -- Kalle Valo -- To unsubscribe from this list: send the line "unsubscribe linux-wireless" in the body of a message to [email protected] More majordomo info at http://vger.kernel.org/majordomo-info.html
