| Message ID | 1256672673.2794.7.camel@achroite |
|---|---|
| State | Accepted, archived |
| Delegated to: | David Miller |
| Headers | show |
From: Ben Hutchings <bhutchings@solarflare.com> Date: Tue, 27 Oct 2009 19:44:33 +0000 > 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> > Cc: stable@kernel.org > --- > I'm not sure whether this is serious enough to merit a stable update. > It's not a recent regression. This patch only applies to net-next-2.6, so I can't see how it could be a -stable candidate :-) So I've applied it there. -- To unsubscribe from this list: send the line "unsubscribe netdev" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
On Wed, 2009-10-28 at 02:49 -0700, David Miller wrote: > From: Ben Hutchings <bhutchings@solarflare.com> > Date: Tue, 27 Oct 2009 19:44:33 +0000 > > > 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> > > Cc: stable@kernel.org > > --- > > I'm not sure whether this is serious enough to merit a stable update. > > It's not a recent regression. > > This patch only applies to net-next-2.6, so I can't see how it could > be a -stable candidate :-) > > So I've applied it there. The register name update in net-next-2.6 changed the context for this patch. I'll send a new patch that will apply to the earlier versions. Ben.
diff --git a/drivers/net/sfc/falcon.c b/drivers/net/sfc/falcon.c index 8776432..865638b 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);
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> Cc: stable@kernel.org --- I'm not sure whether this is serious enough to merit a stable update. It's not a recent regression. Ben. drivers/net/sfc/falcon.c | 5 +++-- 1 files changed, 3 insertions(+), 2 deletions(-)