From da0e8864be1381e7bf3244c4d67cf491b4b2dc22 Mon Sep 17 00:00:00 2001 From: Bruce Allan Date: Thu, 17 Jun 2010 18:59:27 +0000 Subject: [PATCH] --- yaml --- r: 203119 b: refs/heads/master c: dbcb9fec5c79780152e32282297de6ddb1f6a43b h: refs/heads/master i: 203117: aa6e274deeaf9a640f49dad489145edca33d197b 203115: eb0c0a565d9e02adcc229f54eb8da1fdd81f1c2b 203111: 34fa929bd14518ee6ebdbcbcebf917608091260b 203103: 9684d6cb080e41cba8d69812d72506c2b54d2842 v: v3 --- [refs] | 2 +- trunk/drivers/net/e1000e/netdev.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index b0e08f67114f..6eca2656634a 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: f2e2b3abe4f491130cfda814a8547783b08f10c2 +refs/heads/master: dbcb9fec5c79780152e32282297de6ddb1f6a43b diff --git a/trunk/drivers/net/e1000e/netdev.c b/trunk/drivers/net/e1000e/netdev.c index aa14976c8221..71592ed2e686 100644 --- a/trunk/drivers/net/e1000e/netdev.c +++ b/trunk/drivers/net/e1000e/netdev.c @@ -2772,7 +2772,7 @@ static void e1000_setup_rctl(struct e1000_adapter *adapter) * per packet. */ pages = PAGE_USE_COUNT(adapter->netdev->mtu); - if (!(adapter->flags & FLAG_IS_ICH) && (pages <= 3) && + if (!(adapter->flags & FLAG_HAS_ERT) && (pages <= 3) && (PAGE_SIZE <= 16384) && (rctl & E1000_RCTL_LPE)) adapter->rx_ps_pages = pages; else