diff options
| author |   Iyappan Subramanian <isubramanian@apm.com> | 2016-10-31 16:00:26 -0700 |
|---|---|---|
| committer |   David S. Miller <davem@davemloft.net> | 2016-11-01 12:04:52 -0400 |
| commit | b5a4a3eb4ec7382780aa153224780b9ecdc76ceb (patch) | |
| tree | a03561ccd7328eb7788a355c818c939bc9e5c8bb /drivers/net/ethernet/apm/xgene/xgene_enet_main.c | |
| parent | Merge tag 'linux-can-fixes-for-4.9-20161031' of git://git.kernel.org/pub/scm/linux/kernel/git/mkl/linux-can (diff) | |
| download | linux-dev-b5a4a3eb4ec7382780aa153224780b9ecdc76ceb.tar.xz linux-dev-b5a4a3eb4ec7382780aa153224780b9ecdc76ceb.zip | |
drivers: net: xgene: fix: Disable coalescing on v1 hardware
Since ethernet v1 hardware has a bug related to coalescing, disabling
this feature.
Signed-off-by: Iyappan Subramanian <isubramanian@apm.com>
Signed-off-by: Toan Le <toanle@apm.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/ethernet/apm/xgene/xgene_enet_main.c')
| -rw-r--r-- | drivers/net/ethernet/apm/xgene/xgene_enet_main.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/net/ethernet/apm/xgene/xgene_enet_main.c b/drivers/net/ethernet/apm/xgene/xgene_enet_main.c index 429f18fc5503..8158d4698734 100644 --- a/drivers/net/ethernet/apm/xgene/xgene_enet_main.c +++ b/drivers/net/ethernet/apm/xgene/xgene_enet_main.c @@ -1188,7 +1188,8 @@ static int xgene_enet_create_desc_rings(struct net_device *ndev) tx_ring->dst_ring_num = xgene_enet_dst_ring_num(cp_ring); } - pdata->ring_ops->coalesce(pdata->tx_ring[0]); + if (pdata->ring_ops->coalesce) + pdata->ring_ops->coalesce(pdata->tx_ring[0]); pdata->tx_qcnt_hi = pdata->tx_ring[0]->slots - 128; return 0; |