diff options
author | David S. Miller <davem@davemloft.net> | 2013-04-19 14:19:07 -0400 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2013-04-19 14:19:07 -0400 |
commit | c2962897c94605bc8f158a37dee8d867dda9f116 (patch) | |
tree | a81eabbd1edf494207c2412c274a2c649354a39e /drivers/net/ethernet/via | |
parent | c1cb0d3b569b1d21ada8666efb42dfd437617a09 (diff) | |
parent | ceb5f13b70cd6e7afa87ba1b13eb900a766a28e4 (diff) |
Merge branch 'intel'
Jeff Kirsher says:
====================
This series contains updates to ixgbe and igb.
The ixgbe changes contains 2 patches from the community, one which is a
fix from akepner to fix a issue where netif_running() in shutdown was
not done under rtnl_lock. The other community fix from Joe Perches
cleans up #ifdef CONFIG_DEBUG_FS which is no longer necessary. The
last ixgbe patch, from Jacob Keller, adds support for WoL on 82559
SFP+ LOM.
The remaining patches are against igb, 10 of which were previously
submitted in a pull request where changes were requested.
The following igb patches:
igb: Support for 100base-fx SFP
igb: Support to read and export SFF-8472/8079 data
are v2 based on feedback from Dan Carpenter and Ben Hutchings in
the previous pull request.
The largest set of changes are in my patch to cleanup code comments
and whitespace to align the igb driver with the networking style of
code comments. While cleaning up the code comments, fixed several
other whitespace/checkpatch.pl code formatting issues.
Other notable igb patches are EEE capable devices query the PHY to
determine what the link partner is advertising, added support for
i354 devices and added support for spoofchk config.
====================
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/ethernet/via')
0 files changed, 0 insertions, 0 deletions