diff options
author | David S. Miller <davem@davemloft.net> | 2013-04-18 19:00:59 (GMT) |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2013-04-18 19:00:59 (GMT) |
commit | c1cb0d3b569b1d21ada8666efb42dfd437617a09 (patch) | |
tree | aec20516721412a8d0b802605ac9f6e163ef1023 /drivers/net/ethernet/jme.c | |
parent | 0e280af026a5662ffd57c4e623b822df1f7f47ff (diff) | |
parent | 8c5afd6d7ba6516985ed69076927b01d2882e346 (diff) | |
download | linux-fsl-qoriq-c1cb0d3b569b1d21ada8666efb42dfd437617a09.tar.xz |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/jkirsher/net-next
Jeff Kirsher says:
====================
This series contains updates to ixgbe only.
v2- Dropped the following 2 patches from the series:
ixgbe: Support using build_skb in the case that jumbo frames are disabled
ixgbe: walk pci-e bus to find minimum width
Ben Hutchings found a bug with Alex's patch, so that patch was dropped
permanently. Jacob's "walk PCIe bus" patch is being re-worked for
a more generic solution so that other drivers can benefit.
In the remaining patches...
Alex provides a fix where we were incorrectly checking the entire frag_off
field when we only wanted the fragment offset. Alex also cleans up
the check for PAGE_SIZE, since the default configuration allocates 32K
for all buffers.
Emil provides a change to the calculation of eerd so that it is consistent
between the read and write functions by using | instead of +.
Jacob adds support for displaying PCIe Gen3 link speed, which was
previously missing from the ixgbe driver. He also provides a patch
to clean up ixgbe_get_bus_info_generic to call some conversion
functions, which are used also in another patch provided by Jacob.
Jacob modifies the driver to enable certain devices (which have an
internal switch) to read from the physical slot rather than reading
data from the internal switch.
Don provides a couple of fixes (which are more appropriate for net-next),
one of which resolves an issue where ixgbe was only turning on the laser
when the adapter was up which caused issues for those who wanted to
access the MNG firmware while the port was in a down state. The other
fix is for WoL when currently linked at 1G. Lastly Don bumps the driver
version keep the in-kernel driver up to date with the current functionality.
====================
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/ethernet/jme.c')
0 files changed, 0 insertions, 0 deletions