aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorOlof Johansson <olof@lixom.net>2007-09-26 17:23:31 -0400
committerDavid S. Miller <davem@sunset.davemloft.net>2007-10-10 19:53:42 -0400
commit6a290e3d5d48e8932fae068a558b3d8dff4c7acf (patch)
tree6584ab6509794dcb6956469892007711f18ec35c
parentde90351219a1f1fd3cb45cf6fcc4e9d6407fd2c9 (diff)
pasemi_mac: set interface speed correctly on XAUI ports
pasemi_mac: set interface speed correctly on XAUI ports Set interface speed for XAUI to 10G per default, not 1G. Signed-off-by: Olof Johansson <olof@lixom.net> Signed-off-by: Jeff Garzik <jeff@garzik.org>
-rw-r--r--drivers/net/pasemi_mac.c5
1 files changed, 4 insertions, 1 deletions
diff --git a/drivers/net/pasemi_mac.c b/drivers/net/pasemi_mac.c
index 912bc5d33d28..daba11062d3b 100644
--- a/drivers/net/pasemi_mac.c
+++ b/drivers/net/pasemi_mac.c
@@ -789,7 +789,10 @@ static int pasemi_mac_open(struct net_device *dev)
789 flags = PAS_MAC_CFG_PCFG_S1 | PAS_MAC_CFG_PCFG_PE | 789 flags = PAS_MAC_CFG_PCFG_S1 | PAS_MAC_CFG_PCFG_PE |
790 PAS_MAC_CFG_PCFG_PR | PAS_MAC_CFG_PCFG_CE; 790 PAS_MAC_CFG_PCFG_PR | PAS_MAC_CFG_PCFG_CE;
791 791
792 flags |= PAS_MAC_CFG_PCFG_TSR_1G | PAS_MAC_CFG_PCFG_SPD_1G; 792 if (mac->type == MAC_TYPE_GMAC)
793 flags |= PAS_MAC_CFG_PCFG_TSR_1G | PAS_MAC_CFG_PCFG_SPD_1G;
794 else
795 flags |= PAS_MAC_CFG_PCFG_TSR_10G | PAS_MAC_CFG_PCFG_SPD_10G;
793 796
794 write_iob_reg(mac, PAS_IOB_DMA_RXCH_CFG(mac->dma_rxch), 797 write_iob_reg(mac, PAS_IOB_DMA_RXCH_CFG(mac->dma_rxch),
795 PAS_IOB_DMA_RXCH_CFG_CNTTH(0)); 798 PAS_IOB_DMA_RXCH_CFG_CNTTH(0));