From 5146a20bc2424d77bcc600b7ad3c33fe373a73d8 Mon Sep 17 00:00:00 2001 From: Brice Goglin Date: Sun, 24 May 2009 05:27:41 +0000 Subject: [PATCH] --- yaml --- r: 150367 b: refs/heads/master c: 18af3e7c4535be88f864fc4bcff9a97fb4ae3731 h: refs/heads/master i: 150365: a727bf1e72ec88d77399e961f8e5df4a1daf63a0 150363: f80b0d9e399c0b7fdc694303067a308cbe8497dc 150359: b5d7140aed3d12ab8a4adef617cc298ccc4f77d3 150351: 95572375ab54915d738fffce1b8819d57a3fb71b 150335: 8973956fb948db793a75c86567acf4d9fb426a0f v: v3 --- [refs] | 2 +- trunk/drivers/net/myri10ge/myri10ge.c | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 906bd608de4e..5e745364f63b 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 38aab07c14adbf3c7257793d764a91923341e96a +refs/heads/master: 18af3e7c4535be88f864fc4bcff9a97fb4ae3731 diff --git a/trunk/drivers/net/myri10ge/myri10ge.c b/trunk/drivers/net/myri10ge/myri10ge.c index c9a9aca43675..d317011aa56a 100644 --- a/trunk/drivers/net/myri10ge/myri10ge.c +++ b/trunk/drivers/net/myri10ge/myri10ge.c @@ -1422,6 +1422,7 @@ myri10ge_clean_rx_done(struct myri10ge_slice_state *ss, int budget) { struct myri10ge_rx_done *rx_done = &ss->rx_done; struct myri10ge_priv *mgp = ss->mgp; + struct net_device *netdev = mgp->dev; unsigned long rx_bytes = 0; unsigned long rx_packets = 0; unsigned long rx_ok; @@ -1455,7 +1456,7 @@ myri10ge_clean_rx_done(struct myri10ge_slice_state *ss, int budget) ss->stats.rx_packets += rx_packets; ss->stats.rx_bytes += rx_bytes; - if (myri10ge_lro) + if (netdev->features & NETIF_F_LRO) lro_flush_all(&rx_done->lro_mgr); /* restock receive rings if needed */