Merge branch 'amd-xgbe'

Browse source

Tom Lendacky says:

====================
amd-xgbe: AMD XGBE driver update 2014-08-05

The following series of patches includes fixes/updates to the driver.

- Use dma_set_mask_and_coherent to set the DMA mask
- Move the phy connect/disconnect logic to allow for module unloading

Changes in V2:
- Check the return value of the dma_set_mask_and_coherent call
====================

Signed-off-by: David S. Miller <davem@davemloft.net>

...

This commit is contained in:

David S. Miller 2014-08-05 16:47:07 -07:00

parent c2a198569a 88131a812b

commit 0ca58d6242

3 changed files with 126 additions and 101 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download patch file Download diff file Expand all files Collapse all files

122

drivers/net/ethernet/amd/xgbe/xgbe-drv.c

View file

7

drivers/net/ethernet/amd/xgbe/xgbe-main.c

View file

98

drivers/net/ethernet/amd/xgbe/xgbe-mdio.c

View file