On Tue, 2013-02-12 at 12:41 -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
I think you didn't resolve the merge conflict:
hw->flags = IEEE80211_HW_SIGNAL_DBM |
IEEE80211_HW_SPECTRUM_MGMT |
IEEE80211_HW_REPORTS_TX_ACK_STATUS |
IEEE80211_HW_QUEUE_CONTROL |
IEEE80211_HW_WANT_MONITOR_VIF |
<<<<<<< HEAD
IEEE80211_HW_NEED_DTIM_BEFORE_ASSOC |
=======
IEEE80211_HW_SCAN_WHILE_IDLE |
>>>>>>> iwlwifi-next/for-john
IEEE80211_HW_SUPPORTS_PS |
IEEE80211_HW_SUPPORTS_DYNAMIC_PS |
IEEE80211_HW_AMPDU_AGGREGATION;
My mac80211-next tree removed HW_SCAN_WHILE_IDLE, iwlwifi-next removes
NEED_DTIM_BEFORE_ASSOC.
Sorry about that!
johannes
--
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
