From 73ad41c3b5cfa4eb97204e5423bef1918ca2a3c7 Mon Sep 17 00:00:00 2001 From: Rob Herring Date: Mon, 9 Jul 2012 14:16:10 +0000 Subject: [PATCH] --- yaml --- r: 315103 b: refs/heads/master c: f62a23a7cb601fb30c4a8b8a5ba1c6bb7f5148b3 h: refs/heads/master i: 315101: e911cd51bbca4fe5077c3566c38040d05f8933ed 315099: 66504a937408ede317de9c4748ebcea3a6583d55 315095: 2406b2bba78a7a1f80cf45a82368a3bff1980a44 315087: 298a03ce4da7963a72bb7b5fcfa4a4e57a2574c0 315071: 7e6ea40f2cbcc8731a3ee77a04d41c8026204226 v: v3 --- [refs] | 2 +- trunk/drivers/net/ethernet/calxeda/xgmac.c | 5 +++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index c10323d07501..0b7806220aef 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: e36ce6eb2ba35b0b7335aef12731a96af9531055 +refs/heads/master: f62a23a7cb601fb30c4a8b8a5ba1c6bb7f5148b3 diff --git a/trunk/drivers/net/ethernet/calxeda/xgmac.c b/trunk/drivers/net/ethernet/calxeda/xgmac.c index abb8f40ec221..2b4b4f529ab4 100644 --- a/trunk/drivers/net/ethernet/calxeda/xgmac.c +++ b/trunk/drivers/net/ethernet/calxeda/xgmac.c @@ -264,7 +264,7 @@ #define XGMAC_OMR_FEF 0x00000080 /* Forward Error Frames */ #define XGMAC_OMR_DT 0x00000040 /* Drop TCP/IP csum Errors */ #define XGMAC_OMR_RSF 0x00000020 /* RX FIFO Store and Forward */ -#define XGMAC_OMR_RTC 0x00000010 /* RX Threshhold Ctrl */ +#define XGMAC_OMR_RTC_256 0x00000018 /* RX Threshhold Ctrl */ #define XGMAC_OMR_RTC_MASK 0x00000018 /* RX Threshhold Ctrl MASK */ /* XGMAC HW Features Register */ @@ -982,7 +982,8 @@ static int xgmac_hw_init(struct net_device *dev) writel(value, ioaddr + XGMAC_DMA_CONTROL); /* Set the HW DMA mode and the COE */ - writel(XGMAC_OMR_TSF | XGMAC_OMR_RSF | XGMAC_OMR_RFD | XGMAC_OMR_RFA, + writel(XGMAC_OMR_TSF | XGMAC_OMR_RFD | XGMAC_OMR_RFA | + XGMAC_OMR_RTC_256, ioaddr + XGMAC_OMR); /* Reset the MMC counters */