diff options
| author | David S. Miller <davem@davemloft.net> | 2011-04-06 12:27:34 -0700 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2011-04-06 12:27:34 -0700 |
| commit | 4c844d97d269a7ec4a6ba7d530aa876ac64dfb76 (patch) | |
| tree | 67198ffbe0d8652f9a26548a7435f7514912a8cc /drivers/net/sfc/rx.c | |
| parent | 66ee33bfda6237b009b6fb0e48690e31800ff334 (diff) | |
| parent | c5e129ac2fc72c119b85db79a629de66332f136d (diff) | |
Merge branch 'for-davem' of git://git.kernel.org/pub/scm/linux/kernel/git/bwh/sfc-next-2.6
Diffstat (limited to 'drivers/net/sfc/rx.c')
| -rw-r--r-- | drivers/net/sfc/rx.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/drivers/net/sfc/rx.c b/drivers/net/sfc/rx.c index c0fdb59030fb..b7dc891b4461 100644 --- a/drivers/net/sfc/rx.c +++ b/drivers/net/sfc/rx.c @@ -605,6 +605,9 @@ void __efx_rx_packet(struct efx_channel *channel, skb_record_rx_queue(skb, channel->channel); } + if (unlikely(!(efx->net_dev->features & NETIF_F_RXCSUM))) + checksummed = false; + if (likely(checksummed || rx_buf->is_page)) { efx_rx_packet_gro(channel, rx_buf, eh, checksummed); return; |