diff options
| author |   David S. Miller <davem@davemloft.net> | 2015-05-25 00:13:58 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2015-05-25 00:13:58 -0400 |
| commit | cff497c8701ba5133e3407fd41430dc6159a3541 (patch) | |
| tree | 6f4ce7a1aabf943f77ee42e031ab83e9f39186de /drivers/net/ethernet/amd/xgbe/xgbe-drv.c | |
| parent | ip: reject too-big defragmented DF-skb when forwarding (diff) | |
| parent | amd-xgbe: Add more netif_dbg output to the driver (diff) | |
| download | linux-dev-cff497c8701ba5133e3407fd41430dc6159a3541.tar.xz linux-dev-cff497c8701ba5133e3407fd41430dc6159a3541.zip | |
Merge branch 'amd-xgbe-next'
Tom Lendacky says:
====================
amd-xgbe: AMD XGBE driver updates 2015-05-22
The following patches are included in this driver update series:
- Retrieve and set an additional hardware feature setting
- Fix the initial mode/speed determination when auto-negotiation is
disabled
- Add additional netif_dbg support to the driver
This patch series is based on net-next.
====================
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/ethernet/amd/xgbe/xgbe-drv.c')
| -rw-r--r-- | drivers/net/ethernet/amd/xgbe/xgbe-drv.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/net/ethernet/amd/xgbe/xgbe-drv.c b/drivers/net/ethernet/amd/xgbe/xgbe-drv.c index e4521799ba9c..c75204909702 100644 --- a/drivers/net/ethernet/amd/xgbe/xgbe-drv.c +++ b/drivers/net/ethernet/amd/xgbe/xgbe-drv.c @@ -531,6 +531,7 @@ void xgbe_get_all_hw_features(struct xgbe_prv_data *pdata) RXFIFOSIZE); hw_feat->tx_fifo_size = XGMAC_GET_BITS(mac_hfr1, MAC_HWF1R, TXFIFOSIZE); + hw_feat->adv_ts_hi = XGMAC_GET_BITS(mac_hfr1, MAC_HWF1R, ADVTHWORD); hw_feat->dma_width = XGMAC_GET_BITS(mac_hfr1, MAC_HWF1R, ADDR64); hw_feat->dcb = XGMAC_GET_BITS(mac_hfr1, MAC_HWF1R, DCBEN); hw_feat->sph = XGMAC_GET_BITS(mac_hfr1, MAC_HWF1R, SPHEN); |