diff options
| author | Brice Goglin <brice@myri.com> | 2009-05-24 05:27:41 +0000 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2009-05-25 00:35:53 -0700 |
| commit | 18af3e7c4535be88f864fc4bcff9a97fb4ae3731 (patch) | |
| tree | f37769c2068180b11a5783b7c537427c299b82ad /drivers/net/myri10ge | |
| parent | 38aab07c14adbf3c7257793d764a91923341e96a (diff) | |
| download | linux-stable-18af3e7c4535be88f864fc4bcff9a97fb4ae3731.tar.gz linux-stable-18af3e7c4535be88f864fc4bcff9a97fb4ae3731.tar.bz2 linux-stable-18af3e7c4535be88f864fc4bcff9a97fb4ae3731.zip | |
myri10ge: fix the invokation of lro_flush_all
Fix the way we check whether lro_flush_all should be called
in the myri10ge driver.
Signed-off-by: Brice Goglin <brice@myri.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/myri10ge')
| -rw-r--r-- | drivers/net/myri10ge/myri10ge.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/net/myri10ge/myri10ge.c b/drivers/net/myri10ge/myri10ge.c index c9a9aca43675..d317011aa56a 100644 --- a/drivers/net/myri10ge/myri10ge.c +++ b/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 */ |