From 02d7b1de3ea3d0e85858fae0de6a296755affce7 Mon Sep 17 00:00:00 2001 From: Auke Kok Date: Tue, 8 Jul 2008 15:08:29 -0700 Subject: [PATCH] --- yaml --- r: 103499 b: refs/heads/master c: 87cb7e8cc59c89ccdcf243671c932179bb651a71 h: refs/heads/master i: 103497: d4530f0031a3e49b9e4dffe80613414a9898e306 103495: eb6f2c87fbf1aaa020eb943bdcf0f5da6172db14 v: v3 --- [refs] | 2 +- trunk/drivers/net/igb/igb_main.c | 9 +++++---- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/[refs] b/[refs] index 563f803c1f14..9e0022d7fa90 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: fe4506b6a2f9716ef62583020581ae2032573fed +refs/heads/master: 87cb7e8cc59c89ccdcf243671c932179bb651a71 diff --git a/trunk/drivers/net/igb/igb_main.c b/trunk/drivers/net/igb/igb_main.c index e8ef5410591a..ae329c02eaef 100644 --- a/trunk/drivers/net/igb/igb_main.c +++ b/trunk/drivers/net/igb/igb_main.c @@ -1664,10 +1664,12 @@ static void igb_setup_rctl(struct igb_adapter *adapter) E1000_RCTL_LBM_NO | E1000_RCTL_RDMTS_HALF | (adapter->hw.mac.mc_filter_type << E1000_RCTL_MO_SHIFT); - /* disable the stripping of CRC because it breaks - * BMC firmware connected over SMBUS - rctl |= E1000_RCTL_SECRC; + /* + * enable stripping of CRC. It's unlikely this will break BMC + * redirection as it did with e1000. Newer features require + * that the HW strips the CRC. */ + rctl |= E1000_RCTL_SECRC; rctl &= ~E1000_RCTL_SBP; @@ -3743,7 +3745,6 @@ static bool igb_clean_rx_irq_adv(struct igb_ring *rx_ring, } } send_up: - pskb_trim(skb, skb->len - 4); i++; if (i == rx_ring->count) i = 0;