On Tue, Feb 12, 2013 at 12:41:31PM -0500, John W. Linville wrote: > On Tue, Feb 12, 2013 at 12:37:50PM -0500, John W. Linville wrote: > > On Tue, Feb 12, 2013 at 05:01:31PM +0100, Johannes Berg wrote: > > > John, > > > > > > We continue work on our new driver, but I also have a WoWLAN and AP mode > > > improvement for the previous driver and a change to use threaded > > > interrupts to prepare us for working with non-PCIe devices. > > > > > > Please pull. > > > > > > Thanks, > > > johannes > > > > > > > > > > > > The following changes since commit 8457703f1e86aaf0f134402dd1e09e1f13e65222: > > > > > > ath6kl: provide 64-bit per-station byte counters (2013-02-11 15:34:58 -0500) > > > > > > are available in the git repository at: > > > > > > git://git.kernel.org/pub/scm/linux/kernel/git/iwlwifi/iwlwifi-next.git for-john > > > > > > for you to fetch changes up to 36eed56a8f7e1bd7fb5014ea0e702708e1702f30: > > > > > > iwlwifi: mvm: beautify code in rx_handlers (2013-02-12 16:52:26 +0100) > > > > Pulling now... > > Hmmm... > > CC [M] drivers/net/wireless/iwlwifi/mvm/mac80211.o > drivers/net/wireless/iwlwifi/mvm/mac80211.c: In function ‘iwl_mvm_mac_setup_register’: > drivers/net/wireless/iwlwifi/mvm/mac80211.c:116:1: error: expected expression before ‘<<’ token > drivers/net/wireless/iwlwifi/mvm/mac80211.c:120:9: error: exponent has no digits > make[3]: *** [drivers/net/wireless/iwlwifi/mvm/mac80211.o] Error 1 > make[2]: *** [drivers/net/wireless/iwlwifi/mvm] Error 2 > make[1]: *** [drivers/net/wireless/iwlwifi] Error 2 > make: *** [drivers/net/wireless/] Error 2 This appears to be from me neglecting to resolve a merge error. Sorry, I've got some distractions today... John -- John W. Linville Someday the world will need a hero, and you linville@xxxxxxxxxxxxx might be all we have. Be ready. -- To unsubscribe from this list: send the line "unsubscribe linux-wireless" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html