Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history 
yaml
---
r: 203119
b: refs/heads/master
c: dbcb9fe
h: refs/heads/master
i:
  203117: aa6e274
  203115: eb0c0a5
  203111: 34fa929
  203103: 9684d6c
v: v3
  • Loading branch information
Bruce Allan authored and David S. Miller committed Jun 23, 2010
1 parent 4dec123 commit da0e886
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 2 deletions.
2 changes: 1 addition & 1 deletion [refs]
View file
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: f2e2b3abe4f491130cfda814a8547783b08f10c2
refs/heads/master: dbcb9fec5c79780152e32282297de6ddb1f6a43b
2 changes: 1 addition & 1 deletion trunk/drivers/net/e1000e/netdev.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down

0 comments on commit da0e886

Please sign in to comment.