From fe80c8b6b0ed711f50756e7d232a8229c793c037 Mon Sep 17 00:00:00 2001 From: Auke Kok Date: Tue, 12 Feb 2008 15:20:24 -0800 Subject: [PATCH] --- yaml --- r: 85823 b: refs/heads/master c: 5918bd88effd0233a048983570ec5803f5f753dc h: refs/heads/master i: 85821: 71ccf634eeef120467379f1579b5586bb4069d8c 85819: 5a565fbee39d809df9fecfae1be204df78ef7107 85815: 5ae6fc3782b00119d0ae99a2d09852602a2d1231 85807: 7a98e11db6e79733bcbd0235ace5552ad26416f6 85791: 602d2c1d651006f230ea5118e07930b6375a0193 85759: 71053cf2bb2735817a3aa7949de19913220c39f9 v: v3 --- [refs] | 2 +- trunk/drivers/net/e1000e/netdev.c | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index ad53b0efef17..d0c443f311be 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: fdb26629f31b898c2c4a4127c7d5c2401fb5ac60 +refs/heads/master: 5918bd88effd0233a048983570ec5803f5f753dc diff --git a/trunk/drivers/net/e1000e/netdev.c b/trunk/drivers/net/e1000e/netdev.c index b9b0d321e70b..ea4ecc3bf82e 100644 --- a/trunk/drivers/net/e1000e/netdev.c +++ b/trunk/drivers/net/e1000e/netdev.c @@ -1690,6 +1690,9 @@ static void e1000_setup_rctl(struct e1000_adapter *adapter) else rctl |= E1000_RCTL_LPE; + /* Enable hardware CRC frame stripping */ + rctl |= E1000_RCTL_SECRC; + /* Setup buffer sizes */ rctl &= ~E1000_RCTL_SZ_4096; rctl |= E1000_RCTL_BSEX; @@ -1755,9 +1758,6 @@ static void e1000_setup_rctl(struct e1000_adapter *adapter) /* Enable Packet split descriptors */ rctl |= E1000_RCTL_DTYP_PS; - - /* Enable hardware CRC frame stripping */ - rctl |= E1000_RCTL_SECRC; psrctl |= adapter->rx_ps_bsize0 >> E1000_PSRCTL_BSIZE0_SHIFT;