From 98dd697025234aedab6b8942690827d51f0ab0f7 Mon Sep 17 00:00:00 2001 From: Auke Kok Date: Tue, 27 Jun 2006 09:07:50 -0700 Subject: [PATCH] --- yaml --- r: 32179 b: refs/heads/master c: 7dfee0cb1d506897805b663dd95e9651619a4d4d h: refs/heads/master i: 32177: 784ede22a0a3bfaab634e4055b408f42849c6ceb 32175: 9f9b44b41b9464e46e680d4f0d5d1a61fb1aef82 v: v3 --- [refs] | 2 +- trunk/drivers/net/e1000/e1000_main.c | 5 +---- 2 files changed, 2 insertions(+), 5 deletions(-) diff --git a/[refs] b/[refs] index f65e9c5af065..c8eb142497c7 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 4ca213a6957318219822c024c8e4c61b3e42a7dc +refs/heads/master: 7dfee0cb1d506897805b663dd95e9651619a4d4d diff --git a/trunk/drivers/net/e1000/e1000_main.c b/trunk/drivers/net/e1000/e1000_main.c index c44ed6f4ba78..a9e55dc10c55 100644 --- a/trunk/drivers/net/e1000/e1000_main.c +++ b/trunk/drivers/net/e1000/e1000_main.c @@ -1628,9 +1628,6 @@ e1000_setup_rctl(struct e1000_adapter *adapter) E1000_RCTL_LBM_NO | E1000_RCTL_RDMTS_HALF | (adapter->hw.mc_filter_type << E1000_RCTL_MO_SHIFT); - if (adapter->hw.mac_type > e1000_82543) - rctl |= E1000_RCTL_SECRC; - if (adapter->hw.tbi_compatibility_on == 1) rctl |= E1000_RCTL_SBP; else @@ -1696,7 +1693,7 @@ e1000_setup_rctl(struct e1000_adapter *adapter) rfctl |= E1000_RFCTL_IPV6_DIS; E1000_WRITE_REG(&adapter->hw, RFCTL, rfctl); - rctl |= E1000_RCTL_DTYP_PS | E1000_RCTL_SECRC; + rctl |= E1000_RCTL_DTYP_PS; psrctl |= adapter->rx_ps_bsize0 >> E1000_PSRCTL_BSIZE0_SHIFT;