diff options
| author |   David S. Miller <davem@davemloft.net> | 2013-02-02 22:55:16 -0500 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2013-02-02 22:55:16 -0500 |
| commit | daef2262a730144af851ef352b003ecadbdff005 (patch) | |
| tree | f88da6ec776ec517f2e3fdce040c060ec7663590 /drivers/net/ethernet/broadcom/bnx2x/bnx2x_link.c | |
| parent | Merge branch 'mlx4' (diff) | |
| parent | e1000e: use generic IEEE MII definitions (diff) | |
| download | linux-dev-daef2262a730144af851ef352b003ecadbdff005.tar.xz linux-dev-daef2262a730144af851ef352b003ecadbdff005.zip | |
Merge branch 'intel'
Jeff Kirsher says:
====================
This series contains updates to ixgbe and e1000e. The ixgbe patches are
a mix of fixes, cleanup and added functionality. The first fix is for
traffic classes, where if the mapping has changed reset the NIC. The other
ixgbe fix resolves an issue where the device lookup neglected to do a
pci_dev_put() to decrement the device reference count.
The ixgbe cleanup was done by Josh, where the auto-negotiation variables
were renamed/cleaned up and refactored.
The remaining patches are from Bruce to do additional cleanup on e1000e as
well as bump the driver version. Most notably is the cleanup to use the
kernel IEEE MII definitions where possible instead of the local MII
definitions.
====================
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to '')
0 files changed, 0 insertions, 0 deletions