Message ID | 20140310190101.GB25703@tuxdriver.com |
---|---|
State | Accepted, archived |
Delegated to: | David Miller |
Headers | show |
From: "John W. Linville" <linville@tuxdriver.com> Date: Mon, 10 Mar 2014 15:01:02 -0400 > For the mac80211 bits, Johannes says: > > "This time, I have a number of small fixes and improvements, and those > are fairly straight-forward. More interesting changes come from Luca > with some preparations for the CSA work, mostly around interface/channel > combinations checking. One other possibly interesting change is a small > one by myself to add NAPI support back to mac80211, which can help > improve TCP behaviour through GRO." > > For the Bluetooth bits, Gustavo says: > > "This is our first pull request for 3.15, the main feature here is the addition of > the privacy feature for low energy devices. Other than that we have a bunch of small > improvements, fixes, and clean ups all over the tree." > > And... > > "Another pull request to 3.15. Here we have the second part of the LE private > feature, the LE auto-connect feature and improvements to the power off > procedures. The rest are small improvements, clean up, and fixes." > > For the iwlwifi bits, Emmanuel says: > > "I have here a whole bunch of various things. Trivial cleanups, > debugfs handlers and new stuff for the new generation of devices > along with new capabilities for monitor mode. We also have support > for power save for dual interface mode, but that is not supported by > the firmware currently available." > > And for the Atheros bits, Kalle says: > > "For ath10k Alexander did some cleanup to PCI error cases and switched > ath10k to use pci_enable_msi_range(). Michal implemented AP CSA support > and sta_rc_update() operation. I enabled firmware "STA quick kickout" > functionality for faster detection of disappeared clients. > > Also there are lots of small fixes to everywhere from various people." > > I pulled the wireless tree to avoid some merge conflicts, and I > reverted the staging patch that I had mistakenly merged previously. > Along with that, mwifiex, brcmfmac, wil6210, ath9k, and a few other > drivers get their usual round of updates. Also notable is the addition > of yet another driver in the rtlwifi family. > > Please let me know if there are problems! Pulled, thanks a lot John. -- To unsubscribe from this list: send the line "unsubscribe netdev" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
From: David Miller <davem@davemloft.net> Date: Tue, 11 Mar 2014 22:50:23 -0400 (EDT) > Pulled, thanks a lot John. Actually, I have to fix something up. Regardless of whatever the situation is, reverting the build fix to drivers/staging/rtl8821ae/rc.c is not correct. I do not see what the big deal is. If the wireless tree makes a change to a structure, it absolutely is correct to keep the wireless staging drivers working, and above all _building_ when such a change is made. So the staging tree might have to do a merge of some sort, big deal. I'm reverting the revert in my merge commit. Please do not introduce build errors like this in the future, thank you. -- To unsubscribe from this list: send the line "unsubscribe netdev" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
From: David Miller <davem@davemloft.net> Date: Tue, 11 Mar 2014 23:47:12 -0400 (EDT) > From: David Miller <davem@davemloft.net> > Date: Tue, 11 Mar 2014 22:50:23 -0400 (EDT) > >> Pulled, thanks a lot John. > > Actually, I have to fix something up. > > Regardless of whatever the situation is, reverting the build fix > to drivers/staging/rtl8821ae/rc.c is not correct. And next another staging driver stops building: drivers/staging/wlan-ng/cfg80211.c: In function ‘prism2_scan’: drivers/staging/wlan-ng/cfg80211.c:419:10: error: implicit declaration of function ‘ieee80211_dsss_chan_to_freq’ [-Werror=implicit-function-declaration] ieee80211_dsss_chan_to_freq(msg2.dschannel.data)), We cannot have drivers, even staging driver, stop building due to wireless tree pulls. Please do not do this. I'm going to undo the pull of wireless-next, and ask you to fix all of this stuff up. Thanks.