From a3e2a6bd3e892e4c62d5fd290082b43ecff161b2 Mon Sep 17 00:00:00 2001 From: Alexander Duyck Date: Tue, 25 Nov 2008 01:04:03 -0800 Subject: [PATCH] --- yaml --- r: 122143 b: refs/heads/master c: 69d728baf620839d1a3c874eecac316729f89de4 h: refs/heads/master i: 122141: 87c4aec54d141b23b4165bdfa81044c55e01b363 122139: 05687c37df157fea448e50cc3b883eb53da82086 122135: 14d04e2ce1c693cb0b2a70fad25722430d0ca334 122127: 6390ae4945c83476d84253f67fe18cb4652dff22 122111: 5ca8caff03b2d6940d572238608bd91128b6a39a v: v3 --- [refs] | 2 +- trunk/drivers/net/igb/igb_ethtool.c | 3 ++- trunk/drivers/net/igb/igb_main.c | 4 ++-- 3 files changed, 5 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index 3cd382db260d..6754a16530cb 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 9b07f3d3157487e6467dfa4640f7fb9446165494 +refs/heads/master: 69d728baf620839d1a3c874eecac316729f89de4 diff --git a/trunk/drivers/net/igb/igb_ethtool.c b/trunk/drivers/net/igb/igb_ethtool.c index 8e9d295034ff..d5efbcc49067 100644 --- a/trunk/drivers/net/igb/igb_ethtool.c +++ b/trunk/drivers/net/igb/igb_ethtool.c @@ -1339,8 +1339,9 @@ static int igb_setup_desc_rings(struct igb_adapter *adapter) wr32(E1000_RDLEN(0), rx_ring->size); wr32(E1000_RDH(0), 0); wr32(E1000_RDT(0), 0); + rctl &= ~(E1000_RCTL_LBM_TCVR | E1000_RCTL_LBM_MAC); rctl = E1000_RCTL_EN | E1000_RCTL_BAM | E1000_RCTL_SZ_2048 | - E1000_RCTL_LBM_NO | E1000_RCTL_RDMTS_HALF | + E1000_RCTL_RDMTS_HALF | (adapter->hw.mac.mc_filter_type << E1000_RCTL_MO_SHIFT); wr32(E1000_RCTL, rctl); wr32(E1000_SRRCTL(0), 0); diff --git a/trunk/drivers/net/igb/igb_main.c b/trunk/drivers/net/igb/igb_main.c index ae65fae4333d..ab37ab03a45c 100644 --- a/trunk/drivers/net/igb/igb_main.c +++ b/trunk/drivers/net/igb/igb_main.c @@ -1779,9 +1779,9 @@ static void igb_setup_rctl(struct igb_adapter *adapter) rctl = rd32(E1000_RCTL); rctl &= ~(3 << E1000_RCTL_MO_SHIFT); + rctl &= ~(E1000_RCTL_LBM_TCVR | E1000_RCTL_LBM_MAC); - rctl |= E1000_RCTL_EN | E1000_RCTL_BAM | - E1000_RCTL_LBM_NO | E1000_RCTL_RDMTS_HALF | + rctl |= E1000_RCTL_EN | E1000_RCTL_BAM | E1000_RCTL_RDMTS_HALF | (adapter->hw.mac.mc_filter_type << E1000_RCTL_MO_SHIFT); /*