aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/ethernet/intel/ixgbe/ixgbe_dcb_82599.c
diff options
context:
space:
mode:
authorDavid S. Miller <davem@davemloft.net>2014-03-13 14:58:47 -0400
committerDavid S. Miller <davem@davemloft.net>2014-03-13 14:58:47 -0400
commitca30be8057cee20e13a4f6ca3fbe13701d80380d (patch)
treeb4c6f9ebcd66282e0c1db4e550ea91cdfddb0867 /drivers/net/ethernet/intel/ixgbe/ixgbe_dcb_82599.c
parentMerge branch 'cxgb4-next' (diff)
parentMerge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next into for-davem (diff)
downloadlinux-dev-ca30be8057cee20e13a4f6ca3fbe13701d80380d.tar.xz
linux-dev-ca30be8057cee20e13a4f6ca3fbe13701d80380d.zip
Merge branch 'for-davem' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next
John W. Linville says: ==================== 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. ... I have amended this commit request to correct the build problems in staging, including a warning added to one of the staging drivers by the wireless-next tree. I also included a fix from Larry Finger to address an issue found in rtl8723be by Dan Carpenter and smatch. ==================== Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/ethernet/intel/ixgbe/ixgbe_dcb_82599.c')
0 files changed, 0 insertions, 0 deletions