diff options
author | 2014-09-19 17:35:30 -0400 | |
---|---|---|
committer | 2014-09-19 17:35:30 -0400 | |
commit | 6c62f606b0db9f5ee47fbc20a5fc8ddcc803841a (patch) | |
tree | 4b1fffc27a7482a8a1e5c105e21ddc110adb7a14 /tools/perf/scripts/python/call-graph-from-postgresql.py | |
parent | Merge branch 'mlx4-next' (diff) | |
parent | ixgbe: remove IXGBE_FLAG_MSI(X)_CAPABLE flags (diff) | |
download | linux-dev-6c62f606b0db9f5ee47fbc20a5fc8ddcc803841a.tar.xz linux-dev-6c62f606b0db9f5ee47fbc20a5fc8ddcc803841a.zip |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/jkirsher/net-next
Jeff Kirsher says:
====================
Intel Wired LAN Driver Updates 2014-09-18
This series contains updates to ixgbe and ixgbevf.
Ethan Zhao cleans up ixgbe and ixgbevf by removing bd_number from the
adapter struct because it is not longer useful.
Mark fixes ixgbe where if a hardware transmit timestamp is requested,
an uninitialized workqueue entry may be scheduled. Added a check for
a PTP clock to avoid that.
Jacob provides a number of cleanups for ixgbe. Since we may call
ixgbe_acquire_msix_vectors() prior to registering our netdevice, we
should not use the netdevice specific printk and use e_dev_warn()
instead. Similar to how ixgbevf handles acquiring MSI-X vectors, we
can return an error code instead of relying on the flag being set.
This makes it more clear that we have failed to setup MSI-X mode and
will make it easier to consolidate MSI-X related code into a single
function. In the case of disabling DCB, it is not an error since we
still can function, we just have to let the user know. So use
e_dev_warn() instead of e_err(). Added warnings for other features
that are disabled when we are without MSI-X support. Cleanup flags
that are no longer used or needed.
====================
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'tools/perf/scripts/python/call-graph-from-postgresql.py')
0 files changed, 0 insertions, 0 deletions