From 76cde67e7ee89530b5c631657ea5baf453a22e5a Mon Sep 17 00:00:00 2001 From: Olof Johansson Date: Wed, 26 Sep 2007 16:23:31 -0500 Subject: [PATCH] --- yaml --- r: 66831 b: refs/heads/master c: 6a290e3d5d48e8932fae068a558b3d8dff4c7acf h: refs/heads/master i: 66829: ad83a0711d55af50b0e6d748431fc64f895c1610 66827: 6f5e532a421a4c0d26171f31f6f657c5fc4eb821 66823: 0803bda1748e01e3ddeda7da42e789558a85f616 66815: df0a3b014cd09c31a05638722b9a887475e2ec96 v: v3 --- [refs] | 2 +- trunk/drivers/net/pasemi_mac.c | 5 ++++- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 5edc49b24327..dda9c292f8d5 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: de90351219a1f1fd3cb45cf6fcc4e9d6407fd2c9 +refs/heads/master: 6a290e3d5d48e8932fae068a558b3d8dff4c7acf diff --git a/trunk/drivers/net/pasemi_mac.c b/trunk/drivers/net/pasemi_mac.c index 912bc5d33d28..daba11062d3b 100644 --- a/trunk/drivers/net/pasemi_mac.c +++ b/trunk/drivers/net/pasemi_mac.c @@ -789,7 +789,10 @@ static int pasemi_mac_open(struct net_device *dev) flags = PAS_MAC_CFG_PCFG_S1 | PAS_MAC_CFG_PCFG_PE | PAS_MAC_CFG_PCFG_PR | PAS_MAC_CFG_PCFG_CE; - flags |= PAS_MAC_CFG_PCFG_TSR_1G | PAS_MAC_CFG_PCFG_SPD_1G; + if (mac->type == MAC_TYPE_GMAC) + flags |= PAS_MAC_CFG_PCFG_TSR_1G | PAS_MAC_CFG_PCFG_SPD_1G; + else + flags |= PAS_MAC_CFG_PCFG_TSR_10G | PAS_MAC_CFG_PCFG_SPD_10G; write_iob_reg(mac, PAS_IOB_DMA_RXCH_CFG(mac->dma_rxch), PAS_IOB_DMA_RXCH_CFG_CNTTH(0));