diff options
| author | Ben Hutchings | 2009-10-28 10:50:44 +0100 |
|---|---|---|
| committer | David S. Miller | 2009-10-28 10:50:44 +0100 |
| commit | 9c1bbbaf3eef357b15c0e94085d96f18c6f1bde6 (patch) | |
| tree | 2d6639d768263ddf13ec486d416df69b481ad712 /drivers/net/sfc/falcon.c | |
| parent | vxge: Configure the number of transmit descriptors per packet to MAX_SKB_FRAG... (diff) | |
| download | kernel-qcow2-linux-9c1bbbaf3eef357b15c0e94085d96f18c6f1bde6.tar.gz kernel-qcow2-linux-9c1bbbaf3eef357b15c0e94085d96f18c6f1bde6.tar.xz kernel-qcow2-linux-9c1bbbaf3eef357b15c0e94085d96f18c6f1bde6.zip | |
sfc: Really allow RX checksum offload to be disabled
We have never checked the efx_nic::rx_checksum_enabled flag everywhere
we should, and since the switch to GRO we don't check it anywhere.
It's simplest to check it in the one place where we initialise the
per-packet checksummed flag.
Signed-off-by: Ben Hutchings <bhutchings@solarflare.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/sfc/falcon.c')
| -rw-r--r-- | drivers/net/sfc/falcon.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/drivers/net/sfc/falcon.c b/drivers/net/sfc/falcon.c index 8776432f683c..865638b035bf 100644 --- a/drivers/net/sfc/falcon.c +++ b/drivers/net/sfc/falcon.c @@ -869,8 +869,9 @@ static void falcon_handle_rx_event(struct efx_channel *channel, * UDP/IPv4, then we can rely on the hardware checksum. */ checksummed = - rx_ev_hdr_type == FSE_AB_RX_EV_HDR_TYPE_IPV4_TCP || - rx_ev_hdr_type == FSE_AB_RX_EV_HDR_TYPE_IPV4_UDP; + efx->rx_checksum_enabled && + (rx_ev_hdr_type == FSE_AB_RX_EV_HDR_TYPE_IPV4_TCP || + rx_ev_hdr_type == FSE_AB_RX_EV_HDR_TYPE_IPV4_UDP); } else { falcon_handle_rx_not_ok(rx_queue, event, &rx_ev_pkt_ok, &discard); |